Browse Source

Upgrade to ABP version 9.0.0

pull/273/head
liangshiwei 2 years ago
parent
commit
8e9bb78187
  1. 20
      apps/angular/package.json
  2. 2
      apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.local
  3. 36
      apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj
  4. 11
      apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
  5. 4
      apps/public-web/src/EShopOnAbp.PublicWeb/package.json
  6. 150
      apps/public-web/src/EShopOnAbp.PublicWeb/yarn.lock
  7. 2
      aspire/AppHost/Program.cs
  8. 6
      aspire/AppHost/eShopOnAbp.AppHost.csproj
  9. 16
      aspire/ServiceDefaults/eShopOnAbp.ServiceDefaults.csproj
  10. 2
      gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.local
  11. 2
      gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbp.WebPublicGateway.csproj
  12. 2
      gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs
  13. 2
      gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.local
  14. 2
      gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbp.WebGateway.csproj
  15. 2
      gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs
  16. 2
      global.json
  17. 4
      services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
  18. 8
      services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
  19. 8
      services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
  20. 8
      services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
  21. 14
      services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
  22. 604
      services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/Migrations/20241203075909_UpdateToAbp9_0_0.Designer.cs
  23. 62
      services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/Migrations/20241203075909_UpdateToAbp9_0_0.cs
  24. 10
      services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/Migrations/AdministrationServiceDbContextModelSnapshot.cs
  25. 4
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
  26. 2
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs
  27. 2
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.local
  28. 6
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
  29. 6
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
  30. 2
      services/administration/test/EShopOnAbp.AdministrationService.Application.Tests/EShopOnAbp.AdministrationService.Application.Tests.csproj
  31. 2
      services/administration/test/EShopOnAbp.AdministrationService.Domain.Tests/EShopOnAbp.AdministrationService.Domain.Tests.csproj
  32. 4
      services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
  33. 8
      services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj
  34. 6
      services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj
  35. 2
      services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs
  36. 2
      services/basket/src/EShopOnAbp.BasketService/Dockerfile.local
  37. 22
      services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj
  38. 4
      services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj
  39. 4
      services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj
  40. 4
      services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj
  41. 6
      services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj
  42. 2
      services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj
  43. 2
      services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs
  44. 2
      services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.local
  45. 2
      services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj
  46. 4
      services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj
  47. 4
      services/catalog/src/EShopOnAbp.CatalogService.MongoDB/EShopOnAbp.CatalogService.MongoDB.csproj
  48. 2
      services/catalog/test/EShopOnAbp.CatalogService.Application.Tests/EShopOnAbp.CatalogService.Application.Tests.csproj
  49. 2
      services/catalog/test/EShopOnAbp.CatalogService.Domain.Tests/EShopOnAbp.CatalogService.Domain.Tests.csproj
  50. 6
      services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj
  51. 2
      services/catalog/test/EShopOnAbp.CatalogService.MongoDB.Tests/EShopOnAbp.CatalogService.MongoDB.Tests.csproj
  52. 10
      services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj
  53. 6
      services/cmskit/src/EShopOnAbp.CmskitService.Application.Contracts/EShopOnAbp.CmskitService.Application.Contracts.csproj
  54. 8
      services/cmskit/src/EShopOnAbp.CmskitService.Application/EShopOnAbp.CmskitService.Application.csproj
  55. 6
      services/cmskit/src/EShopOnAbp.CmskitService.Domain.Shared/EShopOnAbp.CmskitService.Domain.Shared.csproj
  56. 4
      services/cmskit/src/EShopOnAbp.CmskitService.Domain/EShopOnAbp.CmskitService.Domain.csproj
  57. 8
      services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/EShopOnAbp.CmskitService.EntityFrameworkCore.csproj
  58. 208
      services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/Migrations/20241203080028_UpdateToAbp9_0_0.Designer.cs
  59. 22
      services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/Migrations/20241203080028_UpdateToAbp9_0_0.cs
  60. 2
      services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/Migrations/CmskitServiceDbContextModelSnapshot.cs
  61. 4
      services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/EShopOnAbp.CmskitService.HttpApi.Client.csproj
  62. 2
      services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/CmskitServiceHttpApiHostModule.cs
  63. 2
      services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.local
  64. 6
      services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj
  65. 6
      services/cmskit/src/EShopOnAbp.CmskitService.HttpApi/EShopOnAbp.CmskitService.HttpApi.csproj
  66. 2
      services/cmskit/test/EShopOnAbp.CmskitService.Application.Tests/EShopOnAbp.CmskitService.Application.Tests.csproj
  67. 2
      services/cmskit/test/EShopOnAbp.CmskitService.Domain.Tests/EShopOnAbp.CmskitService.Domain.Tests.csproj
  68. 4
      services/cmskit/test/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests.csproj
  69. 8
      services/cmskit/test/EShopOnAbp.CmskitService.TestBase/EShopOnAbp.CmskitService.TestBase.csproj
  70. 2
      services/identity/src/EShopOnAbp.IdentityService.Application.Contracts/EShopOnAbp.IdentityService.Application.Contracts.csproj
  71. 6
      services/identity/src/EShopOnAbp.IdentityService.Application/EShopOnAbp.IdentityService.Application.csproj
  72. 4
      services/identity/src/EShopOnAbp.IdentityService.Domain.Shared/EShopOnAbp.IdentityService.Domain.Shared.csproj
  73. 4
      services/identity/src/EShopOnAbp.IdentityService.Domain/EShopOnAbp.IdentityService.Domain.csproj
  74. 8
      services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/EShopOnAbp.IdentityService.EntityFrameworkCore.csproj
  75. 853
      services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/Migrations/20241203075822_UpdateToAbp9_0_0.Designer.cs
  76. 50
      services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/Migrations/20241203075822_UpdateToAbp9_0_0.cs
  77. 10
      services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/Migrations/IdentityServiceDbContextModelSnapshot.cs
  78. 2
      services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/EShopOnAbp.IdentityService.HttpApi.Client.csproj
  79. 2
      services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.local
  80. 4
      services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj
  81. 2
      services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/IdentityServiceHttpApiHostModule.cs
  82. 4
      services/identity/src/EShopOnAbp.IdentityService.HttpApi/EShopOnAbp.IdentityService.HttpApi.csproj
  83. 2
      services/identity/test/EShopOnAbp.IdentityService.Application.Tests/EShopOnAbp.IdentityService.Application.Tests.csproj
  84. 2
      services/identity/test/EShopOnAbp.IdentityService.Domain.Tests/EShopOnAbp.IdentityService.Domain.Tests.csproj
  85. 4
      services/identity/test/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests.csproj
  86. 8
      services/identity/test/EShopOnAbp.IdentityService.TestBase/EShopOnAbp.IdentityService.TestBase.csproj
  87. 4
      services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj
  88. 6
      services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj
  89. 4
      services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj
  90. 2
      services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj
  91. 6
      services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj
  92. 2
      services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj
  93. 2
      services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.local
  94. 6
      services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj
  95. 2
      services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/OrderingServiceHttpApiHostModule.cs
  96. 4
      services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj
  97. 2
      services/ordering/test/EShopOnAbp.OrderingService.Application.Tests/EShopOnAbp.OrderingService.Application.Tests.csproj
  98. 2
      services/ordering/test/EShopOnAbp.OrderingService.Domain.Tests/EShopOnAbp.OrderingService.Domain.Tests.csproj
  99. 4
      services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj
  100. 4
      services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj

20
apps/angular/package.json

@ -12,16 +12,16 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "^8.3.1",
"@abp/ng.components": "^8.3.1",
"@abp/ng.core": "^8.3.1",
"@abp/ng.identity": "^8.3.1",
"@abp/ng.oauth": "^8.3.1",
"@abp/ng.setting-management": "^8.3.1",
"@abp/ng.tenant-management": "^8.3.1",
"@abp/ng.theme.basic": "^8.3.1",
"@abp/ng.account": "^9.0.0",
"@abp/ng.components": "^9.0.0",
"@abp/ng.core": "^9.0.0",
"@abp/ng.identity": "^9.0.0",
"@abp/ng.oauth": "^9.0.0",
"@abp/ng.setting-management": "^9.0.0",
"@abp/ng.tenant-management": "^9.0.0",
"@abp/ng.theme.basic": "^9.0.0",
"@abp/ng.theme.lepton-x": "~3.3.1",
"@abp/ng.theme.shared": "^8.3.1",
"@abp/ng.theme.shared": "^9.0.0",
"@angular/animations": "~18.1.0",
"@angular/common": "~18.1.0",
"@angular/compiler": "~18.1.0",
@ -36,7 +36,7 @@
"zone.js": "~0.14.2"
},
"devDependencies": {
"@abp/ng.schematics": "^8.3.1",
"@abp/ng.schematics": "^9.0.0",
"@angular-devkit/build-angular": "~18.1.0",
"@angular/cli": "~18.1.0",
"@angular/compiler-cli": "~18.1.0",

2
apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.local

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.PublicWeb.dll"]

36
apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj

@ -1,30 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.1" />
<PackageReference Include="Volo.CmsKit.Public.Web" Version="8.3.1" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.0" />
<PackageReference Include="Volo.CmsKit.Public.Web" Version="9.0.0" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.3.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.0.0" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

11
apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs

@ -194,7 +194,7 @@ public class EShopOnAbpPublicWebModule : AbpModule
RoleClaimType = ClaimTypes.Role,
ValidateIssuer = true
};
options.Events.OnAuthorizationCodeReceived = async (authContext) =>
{
var userLoggedInEto = CreateUserLoggedInEto(authContext.Principal, authContext.HttpContext);
@ -233,9 +233,9 @@ public class EShopOnAbpPublicWebModule : AbpModule
await previousOnRedirectToIdentityProvider(ctx);
}
};
var previousOnRedirectToIdentityProviderForSignOut =
options.Events.OnRedirectToIdentityProviderForSignOut;
options.Events.OnRedirectToIdentityProviderForSignOut = async ctx =>
var previousOnRedirectToIdentityProviderForSignOut = options.Events.OnRedirectToIdentityProviderForSignOut;
options.Events.OnRedirectToIdentityProviderForSignOut = async (ctx) =>
{
// Intercept the redirection for signout so the browser navigates to the right URL in your host
ctx.ProtocolMessage.IssuerAddress = configuration["AuthServer:Authority"].EnsureEndsWith('/') +
@ -245,6 +245,7 @@ public class EShopOnAbpPublicWebModule : AbpModule
{
await previousOnRedirectToIdentityProviderForSignOut(ctx);
}
};
});
}
@ -312,7 +313,7 @@ public class EShopOnAbpPublicWebModule : AbpModule
});
app.UseCorrelationId();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthentication();
app.UseAbpSerilogEnrichers();

4
apps/public-web/src/EShopOnAbp.PublicWeb/package.json

@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.3.1",
"@abp/signalr": "^8.3.1",
"@abp/cms-kit": "^8.3.1"
"@abp/signalr": "^9.0.0",
"@abp/cms-kit": "^9.0.0"
}
}

150
apps/public-web/src/EShopOnAbp.PublicWeb/yarn.lock

@ -65,48 +65,48 @@
"@abp/core" "~7.2.3"
bootstrap "^5.1.3"
"@abp/clipboard@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.3.1.tgz#f1b63562eeaf5488ed61b06472af134bb29be64b"
"@abp/clipboard@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-9.0.0.tgz#f1b63562eeaf5488ed61b06472af134bb29be64b"
integrity sha512-5mvPu2ZQ6kwEF2s/r1fOcXlaj73+1E2XZbwZ12q0CSs0uSCNqc68ur3l3DdpFAszNj7A410sq4rUMkUvZwPsHw==
dependencies:
"@abp/core" "~8.3.1"
"@abp/core" "~9.0.0"
clipboard "^2.0.11"
"@abp/cms-kit.admin@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-8.3.1.tgz#60ab5b42e36a9e9d650f79276bcdec642e19440f"
"@abp/cms-kit.admin@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-9.0.0.tgz#60ab5b42e36a9e9d650f79276bcdec642e19440f"
integrity sha512-OS8cfT4o9NMdyJRjWI8DZ8f6FE26fFUnmpgNVNS1MLnIzgdO1uKMJBPxXCSqUeyfnOOTU7EagD4LmyKCY8FQfg==
dependencies:
"@abp/codemirror" "~8.3.1"
"@abp/jstree" "~8.3.1"
"@abp/markdown-it" "~8.3.1"
"@abp/slugify" "~8.3.1"
"@abp/tui-editor" "~8.3.1"
"@abp/uppy" "~8.3.1"
"@abp/codemirror" "~9.0.0"
"@abp/jstree" "~9.0.0"
"@abp/markdown-it" "~9.0.0"
"@abp/slugify" "~9.0.0"
"@abp/tui-editor" "~9.0.0"
"@abp/uppy" "~9.0.0"
"@abp/cms-kit.public@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-8.3.1.tgz#157f25d76ed0ebb27b082818480705f0623e2f49"
"@abp/cms-kit.public@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-9.0.0.tgz#157f25d76ed0ebb27b082818480705f0623e2f49"
integrity sha512-YS8K+JceaYgJKdXXM3z1S3uute/OBLvREss8Ni3Xccq05/T8le8/9tVvBWb4hLX1toevpfM1KCxqwse9K8bulg==
dependencies:
"@abp/highlight.js" "~8.3.1"
"@abp/star-rating-svg" "~8.3.1"
"@abp/highlight.js" "~9.0.0"
"@abp/star-rating-svg" "~9.0.0"
"@abp/cms-kit@^8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-8.3.1.tgz#13bf087578c0c1c69e83507f218dd554bc06c060"
"@abp/cms-kit@^9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-9.0.0.tgz#13bf087578c0c1c69e83507f218dd554bc06c060"
integrity sha512-dT3nypD+4ZEiyv1/EsS7pH2Uk2tkDTTz/bkWackec4Doir4iw4zpFQbq4ZnS2fJZy0YUcBn862Bjil1bDMOZAQ==
dependencies:
"@abp/cms-kit.admin" "~8.3.1"
"@abp/cms-kit.public" "~8.3.1"
"@abp/cms-kit.admin" "~9.0.0"
"@abp/cms-kit.public" "~9.0.0"
"@abp/codemirror@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-8.3.1.tgz#a366f86a8051a88d8ed8b64a2f2262184d03c159"
"@abp/codemirror@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-9.0.0.tgz#a366f86a8051a88d8ed8b64a2f2262184d03c159"
integrity sha512-YUd0un/pW4gwVkbWxhmLIdpSOrc/3D+VX8AoEOlpxi4crtnXk626pQtsAhjTf/B7TGR9kTxxrwDnVczQR3boIw==
dependencies:
"@abp/core" "~8.3.1"
"@abp/core" "~9.0.0"
codemirror "^6.0.1"
"@abp/core@~7.2.3":
@ -116,12 +116,12 @@
dependencies:
"@abp/utils" "~7.2.3"
"@abp/core@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.3.1.tgz#1f2d5f5c55fcf0aafb1e4522e4d2a1f4d1ba679c"
"@abp/core@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-9.0.0.tgz#1f2d5f5c55fcf0aafb1e4522e4d2a1f4d1ba679c"
integrity sha512-FtMhlHosvcSnEOYJiTgjbZ59+KB4NfhTPAk2l+X7MWIxGP+OLKFlTwd/OZBLtZ1c6r1Vzgaa7jnXJQvpQawqWQ==
dependencies:
"@abp/utils" "~8.3.1"
"@abp/utils" "~9.0.0"
"@abp/datatables.net-bs5@~7.2.3":
version "7.2.3"
@ -147,12 +147,12 @@
"@abp/core" "~7.2.3"
"@fortawesome/fontawesome-free" "^5.15.4"
"@abp/highlight.js@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-8.3.1.tgz#f5a9c19acdd4c79f7f9208b265ee6da5c4736c4e"
"@abp/highlight.js@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-9.0.0.tgz#f5a9c19acdd4c79f7f9208b265ee6da5c4736c4e"
integrity sha512-NsCOHd84+d2eDwG+soVLUYm93htNkIChbzMlBB7UoW2V5OoqX09EisbnNFItsMIIA5OBOC1czoq4eWQAOHvEKQ==
dependencies:
"@abp/core" "~8.3.1"
"@abp/core" "~9.0.0"
"@highlightjs/cdn-assets" "~11.9.0"
"@abp/jquery-form@~7.2.3":
@ -187,20 +187,20 @@
"@abp/core" "~7.2.3"
jquery "~3.6.0"
"@abp/jquery@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.3.1.tgz#e515f25498821df1a53d6329c6bc3d44abe58c2d"
"@abp/jquery@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-9.0.0.tgz#e515f25498821df1a53d6329c6bc3d44abe58c2d"
integrity sha512-o3Jj1oz68mR5kW/xdpW26rK6zPJzSCzU/QnJjEVYExXGISp4GS355eJVsOlJ/dJNhiRnBcYfApx8Zm+9eltOIw==
dependencies:
"@abp/core" "~8.3.1"
"@abp/core" "~9.0.0"
jquery "~3.7.1"
"@abp/jstree@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-8.3.1.tgz#b643f601a482261fdbe339ab9d503a95d0054190"
"@abp/jstree@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-9.0.0.tgz#b643f601a482261fdbe339ab9d503a95d0054190"
integrity sha512-xx0RFD+uZdHBIVa76zgTvZdzQEpH3gjy/FoTL9DUxJDrl3yazg+jtpVbww81D6UtUBJ+YNdjUk4TZrL9c11VDw==
dependencies:
"@abp/jquery" "~8.3.1"
"@abp/jquery" "~9.0.0"
jstree "^3.3.16"
"@abp/lodash@~7.2.3":
@ -227,12 +227,12 @@
"@abp/core" "~7.2.3"
malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/markdown-it@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-8.3.1.tgz#b00001fd2691730b4070ac691c1d0adc0150a61c"
"@abp/markdown-it@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-9.0.0.tgz#b00001fd2691730b4070ac691c1d0adc0150a61c"
integrity sha512-+EUF0sohNstzqcV4OYJvu3T7Duk1tOiVeS6Fp6jYFFpysMs3K5JIzFXyCIqDIVuOxIpQ0AhQEuSx6IpXl9MHzw==
dependencies:
"@abp/core" "~8.3.1"
"@abp/core" "~9.0.0"
markdown-it "^14.1.0"
"@abp/moment@~7.2.3":
@ -242,13 +242,13 @@
dependencies:
moment "^2.9.0"
"@abp/prismjs@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.3.1.tgz#e8bb9072439c0aee6bf16b351dcaea850ae13a73"
"@abp/prismjs@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-9.0.0.tgz#e8bb9072439c0aee6bf16b351dcaea850ae13a73"
integrity sha512-WQPC4Iyr1fweoimey1xp1rZXzEsciFZloYn9rH9Hu7Bivkag2kpgx86jAGWNzMf9jo3XWo1wQHLKEtpC4kqImQ==
dependencies:
"@abp/clipboard" "~8.3.1"
"@abp/core" "~8.3.1"
"@abp/clipboard" "~9.0.0"
"@abp/core" "~9.0.0"
prismjs "^1.29.0"
"@abp/select2@~7.2.3":
@ -259,27 +259,27 @@
"@abp/core" "~7.2.3"
select2 "^4.0.13"
"@abp/signalr@^8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/signalr/-/signalr-8.3.1.tgz#1b26875cf46cf6ff9464eef15f13b53272776a07"
"@abp/signalr@^9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/signalr/-/signalr-9.0.0.tgz#1b26875cf46cf6ff9464eef15f13b53272776a07"
integrity sha512-Zb5vZ8hBDGwFGeNfdjqj1iMcOWgmVxURcTbMJg0z8V1LmFARFwmhg5/bqn2BrvIHwXAL4GGsqRfbM76QmXNhBQ==
dependencies:
"@abp/core" "~8.3.1"
"@abp/core" "~9.0.0"
"@microsoft/signalr" "~8.0.0"
"@abp/slugify@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-8.3.1.tgz#52c07f81962983cefd8566eec86e2ffefc4a4148"
"@abp/slugify@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-9.0.0.tgz#52c07f81962983cefd8566eec86e2ffefc4a4148"
integrity sha512-0uPmmOfqL54tFQVrGcxhRcY2XFJHBkCOGzfqO6xqvxxQFOl2o/tIvNdQECnEYFiIGBL3wK9cJZfntDdopT737w==
dependencies:
slugify "^1.6.6"
"@abp/star-rating-svg@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-8.3.1.tgz#82bf1c93a461f45be986e96417c7e8c1d321b7bc"
"@abp/star-rating-svg@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-9.0.0.tgz#82bf1c93a461f45be986e96417c7e8c1d321b7bc"
integrity sha512-RD/A1aYTb+/8d+Z/g7SsHsoZV6FIQ7Lz1Q3gHpE2R95DyLNxm3PEde/xRHCq9mE1dpO7sQtGL81uQwTyyUOIYg==
dependencies:
"@abp/jquery" "~8.3.1"
"@abp/jquery" "~9.0.0"
star-rating-svg "^3.5.0"
"@abp/sweetalert2@~7.2.3":
@ -306,20 +306,20 @@
"@abp/jquery" "~7.2.3"
toastr "^2.1.4"
"@abp/tui-editor@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-8.3.1.tgz#af6a842ead42226d2d1aa9b15c01d3d895606779"
"@abp/tui-editor@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-9.0.0.tgz#af6a842ead42226d2d1aa9b15c01d3d895606779"
integrity sha512-RwzyTd6XC26VHcediUfDOXRsv0dpxOm6wLW+eIK6BYz4T2DFd7ZfON24IA2grIpctWfeC1VGL9LLWx17XiCrdA==
dependencies:
"@abp/jquery" "~8.3.1"
"@abp/prismjs" "~8.3.1"
"@abp/jquery" "~9.0.0"
"@abp/prismjs" "~9.0.0"
"@abp/uppy@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-8.3.1.tgz#095ac49ae65e6d2e6abb76870013546509af60dc"
"@abp/uppy@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-9.0.0.tgz#095ac49ae65e6d2e6abb76870013546509af60dc"
integrity sha512-Od/acopdRmHmblqCpJy3boekW3x6VCZw1QAEaBs+D9/nOO9IqU7UPd2Bi0vzEyvQgFJMTF6t8BEk1qUI2V6NXQ==
dependencies:
"@abp/core" "~8.3.1"
"@abp/core" "~9.0.0"
uppy "^3.27.0"
"@abp/utils@~7.2.3":
@ -329,9 +329,9 @@
dependencies:
just-compare "^1.3.0"
"@abp/utils@~8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.3.1.tgz#a0eeefbda6616940beef8376ae56b3809d3dad50"
"@abp/utils@~9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-9.0.0.tgz#a0eeefbda6616940beef8376ae56b3809d3dad50"
integrity sha512-kLUll2bGNGb780Z8Bp/U9XfOYDtU1j5h6Fkqr4AqegioS7GqltI5fkpPc0oLeti05C9rJV4ca13Ip+SQ4BY6vw==
dependencies:
just-compare "^2.3.0"

2
aspire/AppHost/Program.cs

@ -10,7 +10,7 @@ var profile = "http";
var administrationService =
builder.AddProject<Projects.EShopOnAbp_AdministrationService_HttpApi_Host>("administrationService", profile);
var identityService = builder.AddProject<Projects.EShopOnAbp_IdentityService_HttpApi_Host>("identityService", profile);
var catalogService = builder.AddProject<Projects.EShopOnAbp_CatalogService_HttpApi_Host>("catalogService", null)
var catalogService = builder.AddProject<Projects.EShopOnAbp_CatalogService_HttpApi_Host>("catalogService")
.WithHttpEndpoint(name: "http", port: 5054, isProxied: false)
.WithEndpoint(
endpointName: "grpc",

6
aspire/AppHost/eShopOnAbp.AppHost.csproj

@ -1,8 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
@ -10,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="8.0.0" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

16
aspire/ServiceDefaults/eShopOnAbp.ServiceDefaults.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
@ -10,13 +10,13 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.5.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
</ItemGroup>
</Project>

2
gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.local

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.WebPublicGateway.dll"]

2
gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbp.WebPublicGateway.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs

@ -44,7 +44,7 @@ public class EShopOnAbpWebPublicGatewayModule : AbpModule
}
app.UseCorrelationId();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthorization();
app.UseSwaggerUIWithYarp(context);

2
gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.local

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.WebGateway.dll"]

2
gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbp.WebGateway.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs

@ -70,7 +70,7 @@ public class EShopOnAbpWebGatewayModule : AbpModule
app.UseCorrelationId();
app.UseCors();
app.UseAbpRequestLocalization();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthorization();
app.UseSwaggerUIWithYarp(context);

2
global.json

@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "9.0.0",
"rollForward": "latestFeature"
}
}

4
services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj

@ -14,8 +14,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="8.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="8.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="9.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="9.0.0" />
</ItemGroup>

8
services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup>
@ -11,9 +11,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="8.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="9.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="9.0.0" />
</ItemGroup>
</Project>

8
services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj

@ -7,13 +7,13 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="8.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="8.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="9.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

8
services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj

@ -10,10 +10,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain" Version="8.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="8.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="8.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain" Version="9.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="9.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="9.0.0" />
</ItemGroup>
</Project>

14
services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj

@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="8.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="8.3.1" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="9.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="9.0.0" />
</ItemGroup>
</Project>

604
services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/Migrations/20241203075909_UpdateToAbp9_0_0.Designer.cs

@ -0,0 +1,604 @@
// <auto-generated />
using System;
using EShopOnAbp.AdministrationService.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Volo.Abp.EntityFrameworkCore;
#nullable disable
namespace EShopOnAbp.AdministrationService.Migrations
{
[DbContext(typeof(AdministrationServiceDbContext))]
[Migration("20241203075909_UpdateToAbp9_0_0")]
partial class UpdateToAbp9_0_0
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ApplicationName")
.HasMaxLength(96)
.HasColumnType("character varying(96)")
.HasColumnName("ApplicationName");
b.Property<string>("BrowserInfo")
.HasMaxLength(512)
.HasColumnType("character varying(512)")
.HasColumnName("BrowserInfo");
b.Property<string>("ClientId")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("ClientId");
b.Property<string>("ClientIpAddress")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("ClientIpAddress");
b.Property<string>("ClientName")
.HasMaxLength(128)
.HasColumnType("character varying(128)")
.HasColumnName("ClientName");
b.Property<string>("Comments")
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("Comments");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<string>("CorrelationId")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("CorrelationId");
b.Property<string>("Exceptions")
.HasColumnType("text");
b.Property<int>("ExecutionDuration")
.HasColumnType("integer")
.HasColumnName("ExecutionDuration");
b.Property<DateTime>("ExecutionTime")
.HasColumnType("timestamp without time zone");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("HttpMethod")
.HasMaxLength(16)
.HasColumnType("character varying(16)")
.HasColumnName("HttpMethod");
b.Property<int?>("HttpStatusCode")
.HasColumnType("integer")
.HasColumnName("HttpStatusCode");
b.Property<Guid?>("ImpersonatorTenantId")
.HasColumnType("uuid")
.HasColumnName("ImpersonatorTenantId");
b.Property<string>("ImpersonatorTenantName")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("ImpersonatorTenantName");
b.Property<Guid?>("ImpersonatorUserId")
.HasColumnType("uuid")
.HasColumnName("ImpersonatorUserId");
b.Property<string>("ImpersonatorUserName")
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("ImpersonatorUserName");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<string>("TenantName")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("TenantName");
b.Property<string>("Url")
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("Url");
b.Property<Guid?>("UserId")
.HasColumnType("uuid")
.HasColumnName("UserId");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("UserName");
b.HasKey("Id");
b.HasIndex("TenantId", "ExecutionTime");
b.HasIndex("TenantId", "UserId", "ExecutionTime");
b.ToTable("AbpAuditLogs", (string)null);
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<Guid>("AuditLogId")
.HasColumnType("uuid")
.HasColumnName("AuditLogId");
b.Property<int>("ExecutionDuration")
.HasColumnType("integer")
.HasColumnName("ExecutionDuration");
b.Property<DateTime>("ExecutionTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("ExecutionTime");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("MethodName")
.HasMaxLength(128)
.HasColumnType("character varying(128)")
.HasColumnName("MethodName");
b.Property<string>("Parameters")
.HasMaxLength(2000)
.HasColumnType("character varying(2000)")
.HasColumnName("Parameters");
b.Property<string>("ServiceName")
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("ServiceName");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("AuditLogId");
b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
b.ToTable("AbpAuditLogActions", (string)null);
});
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<Guid>("AuditLogId")
.HasColumnType("uuid")
.HasColumnName("AuditLogId");
b.Property<DateTime>("ChangeTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("ChangeTime");
b.Property<byte>("ChangeType")
.HasColumnType("smallint")
.HasColumnName("ChangeType");
b.Property<string>("EntityId")
.HasMaxLength(128)
.HasColumnType("character varying(128)")
.HasColumnName("EntityId");
b.Property<Guid?>("EntityTenantId")
.HasColumnType("uuid");
b.Property<string>("EntityTypeFullName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)")
.HasColumnName("EntityTypeFullName");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("AuditLogId");
b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
b.ToTable("AbpEntityChanges", (string)null);
});
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<Guid>("EntityChangeId")
.HasColumnType("uuid");
b.Property<string>("NewValue")
.HasMaxLength(512)
.HasColumnType("character varying(512)")
.HasColumnName("NewValue");
b.Property<string>("OriginalValue")
.HasMaxLength(512)
.HasColumnType("character varying(512)")
.HasColumnName("OriginalValue");
b.Property<string>("PropertyName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)")
.HasColumnName("PropertyName");
b.Property<string>("PropertyTypeFullName")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("PropertyTypeFullName");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("EntityChangeId");
b.ToTable("AbpEntityPropertyChanges", (string)null);
});
modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<Guid>("ContainerId")
.HasColumnType("uuid");
b.Property<byte[]>("Content")
.HasMaxLength(2147483647)
.HasColumnType("bytea");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("ContainerId");
b.HasIndex("TenantId", "ContainerId", "Name");
b.ToTable("AbpBlobs", (string)null);
});
modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("TenantId", "Name");
b.ToTable("AbpBlobContainers", (string)null);
});
modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionDefinitionRecord", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("GroupName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<bool>("IsEnabled")
.HasColumnType("boolean");
b.Property<byte>("MultiTenancySide")
.HasColumnType("smallint");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<string>("ParentName")
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<string>("Providers")
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<string>("StateCheckers")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.HasKey("Id");
b.HasIndex("GroupName");
b.HasIndex("Name")
.IsUnique();
b.ToTable("AbpPermissions", (string)null);
});
modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<string>("ProviderKey")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ProviderName")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey")
.IsUnique();
b.ToTable("AbpPermissionGrants", (string)null);
});
modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGroupDefinitionRecord", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.HasKey("Id");
b.HasIndex("Name")
.IsUnique();
b.ToTable("AbpPermissionGroups", (string)null);
});
modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<string>("ProviderKey")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ProviderName")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("Value")
.IsRequired()
.HasMaxLength(2048)
.HasColumnType("character varying(2048)");
b.HasKey("Id");
b.HasIndex("Name", "ProviderName", "ProviderKey")
.IsUnique();
b.ToTable("AbpSettings", (string)null);
});
modelBuilder.Entity("Volo.Abp.SettingManagement.SettingDefinitionRecord", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("DefaultValue")
.HasMaxLength(2048)
.HasColumnType("character varying(2048)");
b.Property<string>("Description")
.HasMaxLength(512)
.HasColumnType("character varying(512)");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsEncrypted")
.HasColumnType("boolean");
b.Property<bool>("IsInherited")
.HasColumnType("boolean");
b.Property<bool>("IsVisibleToClients")
.HasColumnType("boolean");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<string>("Providers")
.HasMaxLength(1024)
.HasColumnType("character varying(1024)");
b.HasKey("Id");
b.HasIndex("Name")
.IsUnique();
b.ToTable("AbpSettingDefinitions", (string)null);
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
{
b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
.WithMany("Actions")
.HasForeignKey("AuditLogId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
{
b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
.WithMany("EntityChanges")
.HasForeignKey("AuditLogId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
{
b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
.WithMany("PropertyChanges")
.HasForeignKey("EntityChangeId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
{
b.HasOne("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", null)
.WithMany()
.HasForeignKey("ContainerId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
{
b.Navigation("Actions");
b.Navigation("EntityChanges");
});
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
{
b.Navigation("PropertyChanges");
});
#pragma warning restore 612, 618
}
}
}

62
services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/Migrations/20241203075909_UpdateToAbp9_0_0.cs

@ -0,0 +1,62 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace EShopOnAbp.AdministrationService.Migrations
{
/// <inheritdoc />
public partial class UpdateToAbp9_0_0 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Providers",
table: "AbpSettingDefinitions",
type: "character varying(1024)",
maxLength: 1024,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(128)",
oldMaxLength: 128,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "DefaultValue",
table: "AbpSettingDefinitions",
type: "character varying(2048)",
maxLength: 2048,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(256)",
oldMaxLength: 256,
oldNullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Providers",
table: "AbpSettingDefinitions",
type: "character varying(128)",
maxLength: 128,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(1024)",
oldMaxLength: 1024,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "DefaultValue",
table: "AbpSettingDefinitions",
type: "character varying(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(2048)",
oldMaxLength: 2048,
oldNullable: true);
}
}
}

10
services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/Migrations/AdministrationServiceDbContextModelSnapshot.cs

@ -19,7 +19,7 @@ namespace EShopOnAbp.AdministrationService.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("ProductVersion", "8.0.0")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@ -506,8 +506,8 @@ namespace EShopOnAbp.AdministrationService.Migrations
.HasColumnType("uuid");
b.Property<string>("DefaultValue")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
.HasMaxLength(2048)
.HasColumnType("character varying(2048)");
b.Property<string>("Description")
.HasMaxLength(512)
@ -537,8 +537,8 @@ namespace EShopOnAbp.AdministrationService.Migrations
.HasColumnType("character varying(128)");
b.Property<string>("Providers")
.HasMaxLength(128)
.HasColumnType("character varying(128)");
.HasMaxLength(1024)
.HasColumnType("character varying(1024)");
b.HasKey("Id");

4
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj

@ -10,8 +10,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="9.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="9.0.0" />
</ItemGroup>
</Project>

2
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs

@ -86,7 +86,7 @@ public class AdministrationServiceHttpApiHostModule : AbpModule
app.UseCorrelationId();
app.UseCors();
app.UseAbpRequestLocalization();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthentication();
app.UseAbpClaimsMap();

2
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.local

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.AdministrationService.HttpApi.Host.dll"]

6
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj

@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

6
services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup>
@ -10,8 +10,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="8.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="8.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="9.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="9.0.0" />
</ItemGroup>
</Project>

2
services/administration/test/EShopOnAbp.AdministrationService.Application.Tests/EShopOnAbp.AdministrationService.Application.Tests.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup>

2
services/administration/test/EShopOnAbp.AdministrationService.Domain.Tests/EShopOnAbp.AdministrationService.Domain.Tests.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup>

4
services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.EntityFrameworkCore\EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopOnAbp.AdministrationService.TestBase\EShopOnAbp.AdministrationService.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

8
services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.1" />
<PackageReference Include="Volo.Abp.TestBase" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="9.0.0" />
<ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" />
</ItemGroup>

6
services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj

@ -8,9 +8,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Validation" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Validation" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

2
services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs

@ -89,7 +89,7 @@ public class BasketServiceModule : AbpModule
app.UseCorrelationId();
app.UseCors();
app.UseAbpRequestLocalization();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthentication();
app.UseAbpClaimsMap();

2
services/basket/src/EShopOnAbp.BasketService/Dockerfile.local

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.BasketService.dll"]

22
services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
@ -12,16 +12,16 @@
<PackageReference Include="Google.Protobuf" Version="3.26.1" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.62.0" />
<PackageReference Include="Grpc.Tools" Version="2.62.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="8.0.1" />
<PackageReference Include="Volo.Abp.Http.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Caching" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="8.3.1" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Http.Client" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Caching" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

4
services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj

@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="9.0.0" />
</ItemGroup>
</Project>

4
services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
</PropertyGroup>
@ -11,7 +11,7 @@
<PackageReference Include="Google.Protobuf" Version="3.19.3" />
<PackageReference Include="Grpc.Core" Version="2.42.0" />
<PackageReference Include="Grpc.Tools" Version="2.42.0" PrivateAssets="All" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

4
services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj

@ -9,11 +9,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Validation" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

6
services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
</PropertyGroup>
@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="9.0.0" />
</ItemGroup>
</Project>

2
services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Http.Client" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

2
services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs

@ -95,7 +95,7 @@ public class CatalogServiceHttpApiHostModule : AbpModule
app.UseCorrelationId();
app.UseCors();
app.UseAbpRequestLocalization();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthentication();
app.UseAbpClaimsMap();

2
services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.local

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.CatalogService.HttpApi.Host.dll"]

2
services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>EShopOnAbp.CatalogService-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>

4
services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
</PropertyGroup>
@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.0.0" />
</ItemGroup>
</Project>

4
services/catalog/src/EShopOnAbp.CatalogService.MongoDB/EShopOnAbp.CatalogService.MongoDB.csproj

@ -3,12 +3,12 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.MongoDB" Version="8.3.1" />
<PackageReference Include="Volo.Abp.MongoDB" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.CatalogService.Domain\EShopOnAbp.CatalogService.Domain.csproj" />
</ItemGroup>

2
services/catalog/test/EShopOnAbp.CatalogService.Application.Tests/EShopOnAbp.CatalogService.Application.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
</PropertyGroup>

2
services/catalog/test/EShopOnAbp.CatalogService.Domain.Tests/EShopOnAbp.CatalogService.Domain.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
</PropertyGroup>

6
services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
@ -19,13 +19,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="9.0.0" />
<ProjectReference Include="..\..\src\EShopOnAbp.CatalogService.HttpApi.Client\EShopOnAbp.CatalogService.HttpApi.Client.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.0" />
</ItemGroup>
</Project>

2
services/catalog/test/EShopOnAbp.CatalogService.MongoDB.Tests/EShopOnAbp.CatalogService.MongoDB.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
</PropertyGroup>

10
services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj

@ -3,15 +3,15 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Abstractions" Version="8.3.1" />
<PackageReference Include="Volo.Abp.TestBase" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="9.0.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Abstractions" Version="9.0.0" />
<ProjectReference Include="..\..\src\EShopOnAbp.CatalogService.Domain\EShopOnAbp.CatalogService.Domain.csproj" />
</ItemGroup>

6
services/cmskit/src/EShopOnAbp.CmskitService.Application.Contracts/EShopOnAbp.CmskitService.Application.Contracts.csproj

@ -8,9 +8,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.1" />
<PackageReference Include="Volo.CmsKit.Application.Contracts" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="9.0.0" />
<PackageReference Include="Volo.CmsKit.Application.Contracts" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.CmskitService.Domain.Shared\EShopOnAbp.CmskitService.Domain.Shared.csproj" />
</ItemGroup>

8
services/cmskit/src/EShopOnAbp.CmskitService.Application/EShopOnAbp.CmskitService.Application.csproj

@ -3,14 +3,14 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CmskitService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.1" />
<PackageReference Include="Volo.CmsKit.Application" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.0" />
<PackageReference Include="Volo.CmsKit.Application" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.CmskitService.Application.Contracts\EShopOnAbp.CmskitService.Application.Contracts.csproj" />
<ProjectReference Include="..\EShopOnAbp.CmskitService.Domain\EShopOnAbp.CmskitService.Domain.csproj" />
</ItemGroup>

6
services/cmskit/src/EShopOnAbp.CmskitService.Domain.Shared/EShopOnAbp.CmskitService.Domain.Shared.csproj

@ -9,12 +9,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
<PackageReference Include="Volo.CmsKit.Domain.Shared" Version="8.3.1" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
<PackageReference Include="Volo.CmsKit.Domain.Shared" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Validation" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

4
services/cmskit/src/EShopOnAbp.CmskitService.Domain/EShopOnAbp.CmskitService.Domain.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.3.1" />
<PackageReference Include="Volo.CmsKit.Domain" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="9.0.0" />
<PackageReference Include="Volo.CmsKit.Domain" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.CmskitService.Domain.Shared\EShopOnAbp.CmskitService.Domain.Shared.csproj" />
</ItemGroup>

8
services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/EShopOnAbp.CmskitService.EntityFrameworkCore.csproj

@ -3,19 +3,19 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CmskitService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Volo.CmsKit.EntityFrameworkCore" Version="8.3.1" />
<PackageReference Include="Volo.CmsKit.EntityFrameworkCore" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

208
services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/Migrations/20241203080028_UpdateToAbp9_0_0.Designer.cs

@ -0,0 +1,208 @@
// <auto-generated />
using System;
using EShopOnAbp.CmskitService.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Volo.Abp.EntityFrameworkCore;
#nullable disable
namespace EShopOnAbp.CmskitService.Migrations
{
[DbContext(typeof(CmskitServiceDbContext))]
[Migration("20241203080028_UpdateToAbp9_0_0")]
partial class UpdateToAbp9_0_0
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("CreationTime");
b.Property<Guid>("CreatorId")
.HasColumnType("uuid")
.HasColumnName("CreatorId");
b.Property<string>("EntityId")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("EntityType")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("IdempotencyToken")
.HasMaxLength(32)
.HasColumnType("character varying(32)");
b.Property<bool?>("IsApproved")
.HasColumnType("boolean");
b.Property<Guid?>("RepliedCommentId")
.HasColumnType("uuid");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<string>("Text")
.IsRequired()
.HasMaxLength(512)
.HasColumnType("character varying(512)");
b.Property<string>("Url")
.HasMaxLength(512)
.HasColumnType("character varying(512)");
b.HasKey("Id");
b.HasIndex("TenantId", "RepliedCommentId");
b.HasIndex("TenantId", "EntityType", "EntityId");
b.ToTable("CmsComments", (string)null);
});
modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("CreationTime");
b.Property<Guid>("CreatorId")
.HasColumnType("uuid")
.HasColumnName("CreatorId");
b.Property<string>("EntityId")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("EntityType")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<short>("StarCount")
.HasColumnType("smallint");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid");
b.HasKey("Id");
b.HasIndex("TenantId", "EntityType", "EntityId", "CreatorId");
b.ToTable("CmsRatings", (string)null);
});
modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<string>("Email")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("Email");
b.Property<bool>("EmailConfirmed")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("EmailConfirmed");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsActive")
.HasColumnType("boolean")
.HasColumnName("IsActive");
b.Property<string>("Name")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("Name");
b.Property<string>("PhoneNumber")
.HasMaxLength(16)
.HasColumnType("character varying(16)")
.HasColumnName("PhoneNumber");
b.Property<bool>("PhoneNumberConfirmed")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("PhoneNumberConfirmed");
b.Property<string>("Surname")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("Surname");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<string>("UserName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("UserName");
b.HasKey("Id");
b.HasIndex("TenantId", "Email");
b.HasIndex("TenantId", "UserName");
b.ToTable("CmsUsers", (string)null);
});
#pragma warning restore 612, 618
}
}
}

22
services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/Migrations/20241203080028_UpdateToAbp9_0_0.cs

@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace EShopOnAbp.CmskitService.Migrations
{
/// <inheritdoc />
public partial class UpdateToAbp9_0_0 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

2
services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/Migrations/CmskitServiceDbContextModelSnapshot.cs

@ -19,7 +19,7 @@ namespace EShopOnAbp.CmskitService.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("ProductVersion", "8.0.5")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);

4
services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/EShopOnAbp.CmskitService.HttpApi.Client.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="8.3.1" />
<PackageReference Include="Volo.CmsKit.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Http.Client" Version="9.0.0" />
<PackageReference Include="Volo.CmsKit.HttpApi.Client" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.CmskitService.Application.Contracts\EShopOnAbp.CmskitService.Application.Contracts.csproj" />
</ItemGroup>

2
services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/CmskitServiceHttpApiHostModule.cs

@ -105,7 +105,7 @@ public class CmskitServiceHttpApiHostModule : AbpModule
app.UseCorrelationId();
app.UseCors();
app.UseAbpRequestLocalization();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthentication();
app.UseAbpClaimsMap();

2
services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.local

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.CmskitService.HttpApi.Host.dll"]

6
services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CmskitService</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
@ -25,7 +25,7 @@
<ProjectReference Include="..\EShopOnAbp.CmskitService.Application\EShopOnAbp.CmskitService.Application.csproj" />
<ProjectReference Include="..\EShopOnAbp.CmskitService.EntityFrameworkCore\EShopOnAbp.CmskitService.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopOnAbp.CmskitService.HttpApi\EShopOnAbp.CmskitService.HttpApi.csproj" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

6
services/cmskit/src/EShopOnAbp.CmskitService.HttpApi/EShopOnAbp.CmskitService.HttpApi.csproj

@ -3,13 +3,13 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CmskitService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.1" />
<PackageReference Include="Volo.CmsKit.HttpApi" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.0.0" />
<PackageReference Include="Volo.CmsKit.HttpApi" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.CmskitService.Application.Contracts\EShopOnAbp.CmskitService.Application.Contracts.csproj" />
</ItemGroup>

2
services/cmskit/test/EShopOnAbp.CmskitService.Application.Tests/EShopOnAbp.CmskitService.Application.Tests.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CmskitService</RootNamespace>
</PropertyGroup>

2
services/cmskit/test/EShopOnAbp.CmskitService.Domain.Tests/EShopOnAbp.CmskitService.Domain.Tests.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CmskitService</RootNamespace>
</PropertyGroup>

4
services/cmskit/test/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests.csproj

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CmskitService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.0" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.CmskitService.TestBase\EShopOnAbp.CmskitService.TestBase.csproj" />
</ItemGroup>

8
services/cmskit/test/EShopOnAbp.CmskitService.TestBase/EShopOnAbp.CmskitService.TestBase.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.CmskitService</RootNamespace>
</PropertyGroup>
@ -12,9 +12,9 @@
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.1" />
<PackageReference Include="Volo.Abp.TestBase" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="9.0.0" />
<PackageReference Include="Volo.Abp.TestBase" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

2
services/identity/src/EShopOnAbp.IdentityService.Application.Contracts/EShopOnAbp.IdentityService.Application.Contracts.csproj

@ -10,7 +10,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="9.0.0" />
</ItemGroup>
</Project>

6
services/identity/src/EShopOnAbp.IdentityService.Application/EShopOnAbp.IdentityService.Application.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.IdentityService</RootNamespace>
</PropertyGroup>
@ -11,8 +11,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="8.3.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="9.0.0" />
<PackageReference Include="Keycloak.Net.Core" Version="1.0.20" />
</ItemGroup>

4
services/identity/src/EShopOnAbp.IdentityService.Domain.Shared/EShopOnAbp.IdentityService.Domain.Shared.csproj

@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

4
services/identity/src/EShopOnAbp.IdentityService.Domain/EShopOnAbp.IdentityService.Domain.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.IdentityService</RootNamespace>
</PropertyGroup>
@ -10,7 +10,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="9.0.0" />
</ItemGroup>
</Project>

8
services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/EShopOnAbp.IdentityService.EntityFrameworkCore.csproj

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.IdentityService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
@ -16,8 +16,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="9.0.0" />
</ItemGroup>
</Project>

853
services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/Migrations/20241203075822_UpdateToAbp9_0_0.Designer.cs

@ -0,0 +1,853 @@
// <auto-generated />
using System;
using EShopOnAbp.IdentityService.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Volo.Abp.EntityFrameworkCore;
#nullable disable
namespace EShopOnAbp.IdentityService.Migrations
{
[DbContext(typeof(IdentityServiceDbContext))]
[Migration("20241203075822_UpdateToAbp9_0_0")]
partial class UpdateToAbp9_0_0
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<string>("Description")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsStatic")
.HasColumnType("boolean");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("Regex")
.HasMaxLength(512)
.HasColumnType("character varying(512)");
b.Property<string>("RegexDescription")
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<bool>("Required")
.HasColumnType("boolean");
b.Property<int>("ValueType")
.HasColumnType("integer");
b.HasKey("Id");
b.ToTable("AbpClaimTypes", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<Guid?>("SourceTenantId")
.HasColumnType("uuid");
b.Property<Guid>("SourceUserId")
.HasColumnType("uuid");
b.Property<Guid?>("TargetTenantId")
.HasColumnType("uuid");
b.Property<Guid>("TargetUserId")
.HasColumnType("uuid");
b.HasKey("Id");
b.HasIndex("SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId")
.IsUnique();
b.ToTable("AbpLinkUsers", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<int>("EntityVersion")
.HasColumnType("integer");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsDefault")
.HasColumnType("boolean")
.HasColumnName("IsDefault");
b.Property<bool>("IsPublic")
.HasColumnType("boolean")
.HasColumnName("IsPublic");
b.Property<bool>("IsStatic")
.HasColumnType("boolean")
.HasColumnName("IsStatic");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("NormalizedName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("NormalizedName");
b.ToTable("AbpRoles", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ClaimType")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("ClaimValue")
.HasMaxLength(1024)
.HasColumnType("character varying(1024)");
b.Property<Guid>("RoleId")
.HasColumnType("uuid");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AbpRoleClaims", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("Action")
.HasMaxLength(96)
.HasColumnType("character varying(96)");
b.Property<string>("ApplicationName")
.HasMaxLength(96)
.HasColumnType("character varying(96)");
b.Property<string>("BrowserInfo")
.HasMaxLength(512)
.HasColumnType("character varying(512)");
b.Property<string>("ClientId")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ClientIpAddress")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<string>("CorrelationId")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("Identity")
.HasMaxLength(96)
.HasColumnType("character varying(96)");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<string>("TenantName")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<Guid?>("UserId")
.HasColumnType("uuid");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.HasKey("Id");
b.HasIndex("TenantId", "Action");
b.HasIndex("TenantId", "ApplicationName");
b.HasIndex("TenantId", "Identity");
b.HasIndex("TenantId", "UserId");
b.ToTable("AbpSecurityLogs", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentitySession", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ClientId")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("Device")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("DeviceInfo")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("IpAddresses")
.HasMaxLength(2048)
.HasColumnType("character varying(2048)");
b.Property<DateTime?>("LastAccessed")
.HasColumnType("timestamp without time zone");
b.Property<string>("SessionId")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<DateTime>("SignedIn")
.HasColumnType("timestamp without time zone");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<Guid>("UserId")
.HasColumnType("uuid");
b.HasKey("Id");
b.HasIndex("Device");
b.HasIndex("SessionId");
b.HasIndex("TenantId", "UserId");
b.ToTable("AbpSessions", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<int>("AccessFailedCount")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(0)
.HasColumnName("AccessFailedCount");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uuid")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uuid")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("DeletionTime");
b.Property<string>("Email")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("Email");
b.Property<bool>("EmailConfirmed")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("EmailConfirmed");
b.Property<int>("EntityVersion")
.HasColumnType("integer");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsActive")
.HasColumnType("boolean")
.HasColumnName("IsActive");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<bool>("IsExternal")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("IsExternal");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uuid")
.HasColumnName("LastModifierId");
b.Property<DateTimeOffset?>("LastPasswordChangeTime")
.HasColumnType("timestamp with time zone");
b.Property<bool>("LockoutEnabled")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("LockoutEnabled");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("timestamp with time zone");
b.Property<string>("Name")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("Name");
b.Property<string>("NormalizedEmail")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("NormalizedEmail");
b.Property<string>("NormalizedUserName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("NormalizedUserName");
b.Property<string>("PasswordHash")
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("PasswordHash");
b.Property<string>("PhoneNumber")
.HasMaxLength(16)
.HasColumnType("character varying(16)")
.HasColumnName("PhoneNumber");
b.Property<bool>("PhoneNumberConfirmed")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("PhoneNumberConfirmed");
b.Property<string>("SecurityStamp")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("SecurityStamp");
b.Property<bool>("ShouldChangePasswordOnNextLogin")
.HasColumnType("boolean");
b.Property<string>("Surname")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("Surname");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<bool>("TwoFactorEnabled")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("TwoFactorEnabled");
b.Property<string>("UserName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("UserName");
b.HasKey("Id");
b.HasIndex("Email");
b.HasIndex("NormalizedEmail");
b.HasIndex("NormalizedUserName");
b.HasIndex("UserName");
b.ToTable("AbpUsers", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ClaimType")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("ClaimValue")
.HasMaxLength(1024)
.HasColumnType("character varying(1024)");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<Guid>("UserId")
.HasColumnType("uuid");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AbpUserClaims", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserDelegation", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<DateTime>("EndTime")
.HasColumnType("timestamp without time zone");
b.Property<Guid>("SourceUserId")
.HasColumnType("uuid");
b.Property<DateTime>("StartTime")
.HasColumnType("timestamp without time zone");
b.Property<Guid>("TargetUserId")
.HasColumnType("uuid");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.ToTable("AbpUserDelegations", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
{
b.Property<Guid>("UserId")
.HasColumnType("uuid");
b.Property<string>("LoginProvider")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ProviderDisplayName")
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<string>("ProviderKey")
.IsRequired()
.HasMaxLength(196)
.HasColumnType("character varying(196)");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("UserId", "LoginProvider");
b.HasIndex("LoginProvider", "ProviderKey");
b.ToTable("AbpUserLogins", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
{
b.Property<Guid>("OrganizationUnitId")
.HasColumnType("uuid");
b.Property<Guid>("UserId")
.HasColumnType("uuid");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uuid")
.HasColumnName("CreatorId");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("OrganizationUnitId", "UserId");
b.HasIndex("UserId", "OrganizationUnitId");
b.ToTable("AbpUserOrganizationUnits", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
{
b.Property<Guid>("UserId")
.HasColumnType("uuid");
b.Property<Guid>("RoleId")
.HasColumnType("uuid");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId", "UserId");
b.ToTable("AbpUserRoles", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
{
b.Property<Guid>("UserId")
.HasColumnType("uuid");
b.Property<string>("LoginProvider")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("Name")
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<string>("Value")
.HasColumnType("text");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AbpUserTokens", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("Code")
.IsRequired()
.HasMaxLength(95)
.HasColumnType("character varying(95)")
.HasColumnName("Code");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uuid")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uuid")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("DeletionTime");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)")
.HasColumnName("DisplayName");
b.Property<int>("EntityVersion")
.HasColumnType("integer");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uuid")
.HasColumnName("LastModifierId");
b.Property<Guid?>("ParentId")
.HasColumnType("uuid");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("Code");
b.HasIndex("ParentId");
b.ToTable("AbpOrganizationUnits", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
{
b.Property<Guid>("OrganizationUnitId")
.HasColumnType("uuid");
b.Property<Guid>("RoleId")
.HasColumnType("uuid");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uuid")
.HasColumnName("CreatorId");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("OrganizationUnitId", "RoleId");
b.HasIndex("RoleId", "OrganizationUnitId");
b.ToTable("AbpOrganizationUnitRoles", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
{
b.HasOne("Volo.Abp.Identity.IdentityRole", null)
.WithMany("Claims")
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
{
b.HasOne("Volo.Abp.Identity.IdentityUser", null)
.WithMany("Claims")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
{
b.HasOne("Volo.Abp.Identity.IdentityUser", null)
.WithMany("Logins")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
{
b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
.WithMany()
.HasForeignKey("OrganizationUnitId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Volo.Abp.Identity.IdentityUser", null)
.WithMany("OrganizationUnits")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
{
b.HasOne("Volo.Abp.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Volo.Abp.Identity.IdentityUser", null)
.WithMany("Roles")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
{
b.HasOne("Volo.Abp.Identity.IdentityUser", null)
.WithMany("Tokens")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
{
b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
.WithMany()
.HasForeignKey("ParentId");
});
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
{
b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
.WithMany("Roles")
.HasForeignKey("OrganizationUnitId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Volo.Abp.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
{
b.Navigation("Claims");
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
{
b.Navigation("Claims");
b.Navigation("Logins");
b.Navigation("OrganizationUnits");
b.Navigation("Roles");
b.Navigation("Tokens");
});
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
{
b.Navigation("Roles");
});
#pragma warning restore 612, 618
}
}
}

50
services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/Migrations/20241203075822_UpdateToAbp9_0_0.cs

@ -0,0 +1,50 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace EShopOnAbp.IdentityService.Migrations
{
/// <inheritdoc />
public partial class UpdateToAbp9_0_0 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "IpAddresses",
table: "AbpSessions",
type: "character varying(2048)",
maxLength: 2048,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(256)",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AddColumn<string>(
name: "ExtraProperties",
table: "AbpSessions",
type: "text",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ExtraProperties",
table: "AbpSessions");
migrationBuilder.AlterColumn<string>(
name: "IpAddresses",
table: "AbpSessions",
type: "character varying(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(2048)",
oldMaxLength: 2048,
oldNullable: true);
}
}
}

10
services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/Migrations/IdentityServiceDbContextModelSnapshot.cs

@ -19,7 +19,7 @@ namespace EShopOnAbp.IdentityService.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("ProductVersion", "8.0.5")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@ -272,9 +272,13 @@ namespace EShopOnAbp.IdentityService.Migrations
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("IpAddresses")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
.HasMaxLength(2048)
.HasColumnType("character varying(2048)");
b.Property<DateTime?>("LastAccessed")
.HasColumnType("timestamp without time zone");

2
services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/EShopOnAbp.IdentityService.HttpApi.Client.csproj

@ -10,7 +10,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="9.0.0" />
</ItemGroup>
</Project>

2
services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.local

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.IdentityService.HttpApi.Host.dll"]

4
services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.IdentityService</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Keycloak.Net.Core" Version="1.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

2
services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/IdentityServiceHttpApiHostModule.cs

@ -84,7 +84,7 @@ public class IdentityServiceHttpApiHostModule : AbpModule
app.UseCorrelationId();
app.UseCors();
app.UseAbpRequestLocalization();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthentication();
app.UseAbpClaimsMap();

4
services/identity/src/EShopOnAbp.IdentityService.HttpApi/EShopOnAbp.IdentityService.HttpApi.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.IdentityService</RootNamespace>
</PropertyGroup>
@ -10,7 +10,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="9.0.0" />
</ItemGroup>
</Project>

2
services/identity/test/EShopOnAbp.IdentityService.Application.Tests/EShopOnAbp.IdentityService.Application.Tests.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.IdentityService</RootNamespace>
</PropertyGroup>

2
services/identity/test/EShopOnAbp.IdentityService.Domain.Tests/EShopOnAbp.IdentityService.Domain.Tests.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.IdentityService</RootNamespace>
</PropertyGroup>

4
services/identity/test/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests/EShopOnAbp.IdentityService.EntityFrameworkCore.Tests.csproj

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.IdentityService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\EShopOnAbp.IdentityService.EntityFrameworkCore\EShopOnAbp.IdentityService.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopOnAbp.IdentityService.TestBase\EShopOnAbp.IdentityService.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

8
services/identity/test/EShopOnAbp.IdentityService.TestBase/EShopOnAbp.IdentityService.TestBase.csproj

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.IdentityService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.1" />
<PackageReference Include="Volo.Abp.TestBase" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="9.0.0" />
<ProjectReference Include="..\..\src\EShopOnAbp.IdentityService.Domain\EShopOnAbp.IdentityService.Domain.csproj" />
</ItemGroup>

4
services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Domain.Shared\EShopOnAbp.OrderingService.Domain.Shared.csproj" />
</ItemGroup>

6
services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj

@ -3,13 +3,13 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.OrderingService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Application.Contracts\EShopOnAbp.OrderingService.Application.Contracts.csproj" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Domain\EShopOnAbp.OrderingService.Domain.csproj" />
</ItemGroup>

4
services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj

@ -9,11 +9,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Validation" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

2
services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Domain.Shared\EShopOnAbp.OrderingService.Domain.Shared.csproj" />
</ItemGroup>

6
services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj

@ -3,17 +3,17 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.OrderingService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\EShopOnAbp.OrderingService.Domain\EShopOnAbp.OrderingService.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
</PackageReference>

2
services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Http.Client" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Application.Contracts\EShopOnAbp.OrderingService.Application.Contracts.csproj" />
</ItemGroup>

2
services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.local

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.OrderingService.HttpApi.Host.dll"]

6
services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj

@ -3,15 +3,15 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.OrderingService</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>EShopOnAbp.OrderingService-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

2
services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/OrderingServiceHttpApiHostModule.cs

@ -82,7 +82,7 @@ public class OrderingServiceHttpApiHostModule : AbpModule
app.UseCorrelationId();
app.UseCors();
app.UseAbpRequestLocalization();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthentication();
app.UseAbpClaimsMap();

4
services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj

@ -3,12 +3,12 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.OrderingService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.0.0" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.Application.Contracts\EShopOnAbp.OrderingService.Application.Contracts.csproj" />
</ItemGroup>

2
services/ordering/test/EShopOnAbp.OrderingService.Application.Tests/EShopOnAbp.OrderingService.Application.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.OrderingService</RootNamespace>
</PropertyGroup>

2
services/ordering/test/EShopOnAbp.OrderingService.Domain.Tests/EShopOnAbp.OrderingService.Domain.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.OrderingService</RootNamespace>
</PropertyGroup>

4
services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.OrderingService</RootNamespace>
</PropertyGroup>
@ -12,7 +12,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.0" />
<ProjectReference Include="..\..\src\EShopOnAbp.OrderingService.EntityFrameworkCore\EShopOnAbp.OrderingService.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopOnAbp.OrderingService.TestBase\EShopOnAbp.OrderingService.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="9.0.0" />
</ItemGroup>
</Project>

4
services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj

@ -2,12 +2,12 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>EShopOnAbp.OrderingService</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="9.0.0" />
<ProjectReference Include="..\..\src\EShopOnAbp.OrderingService.HttpApi.Client\EShopOnAbp.OrderingService.HttpApi.Client.csproj" />
</ItemGroup>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save