master #2
| @ -55,6 +55,15 @@ | ||||
|     <PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Account.Application" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Account.HttpApi" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -1,8 +1,3 @@ | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; | ||||
| using System; | ||||
| using System.IO; | ||||
| using System.Linq; | ||||
| using Localization.Resources.AbpUi; | ||||
| using Medallion.Threading; | ||||
| using Medallion.Threading.Redis; | ||||
| @ -11,15 +6,14 @@ using Microsoft.AspNetCore.Cors; | ||||
| using Microsoft.AspNetCore.DataProtection; | ||||
| using Microsoft.Extensions.DependencyInjection; | ||||
| using Microsoft.Extensions.Hosting; | ||||
| using KonSoft.EntityFrameworkCore; | ||||
| using KonSoft.Localization; | ||||
| using KonSoft.MultiTenancy; | ||||
| using StackExchange.Redis; | ||||
| using System; | ||||
| using System.IO; | ||||
| using System.Linq; | ||||
| using Volo.Abp; | ||||
| using Volo.Abp.Account; | ||||
| using Volo.Abp.Account.Localization; | ||||
| using Volo.Abp.Account.Web; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Bundling; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling; | ||||
| @ -36,9 +30,7 @@ using Volo.Abp.Modularity; | ||||
| using Volo.Abp.OpenIddict; | ||||
| using Volo.Abp.Security.Claims; | ||||
| using Volo.Abp.UI.Navigation.Urls; | ||||
| using Volo.Abp.UI; | ||||
| using Volo.Abp.VirtualFileSystem; | ||||
| using Volo.Abp.Account.Localization; | ||||
|  | ||||
| namespace KonSoft; | ||||
|  | ||||
| @ -50,7 +42,6 @@ namespace KonSoft; | ||||
|     typeof(AbpAccountApplicationModule), | ||||
|     typeof(AbpAccountHttpApiModule), | ||||
|     typeof(AbpAspNetCoreMvcUiBasicThemeModule), | ||||
|     typeof(KonSoftEntityFrameworkCoreModule), | ||||
|     typeof(AbpAspNetCoreSerilogModule) | ||||
|     )] | ||||
| public class KonSoftAuthServerModule : AbpModule | ||||
| @ -112,26 +103,14 @@ public class KonSoftAuthServerModule : AbpModule | ||||
|  | ||||
|         Configure<AbpAuditingOptions>(options => | ||||
|         { | ||||
|                 //options.IsEnabledForGetRequests = true; | ||||
|                 options.IsEnabledForGetRequests = true; | ||||
|                 options.ApplicationName = "AuthServer"; | ||||
|         }); | ||||
|  | ||||
|         if (hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             Configure<AbpVirtualFileSystemOptions>(options => | ||||
|             { | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<KonSoftDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}KonSoft.Domain.Shared")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<KonSoftDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}KonSoft.Domain")); | ||||
|             }); | ||||
|         } | ||||
|  | ||||
|         Configure<AppUrlOptions>(options => | ||||
|         { | ||||
|             options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; | ||||
|             options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ?? Array.Empty<string>()); | ||||
|  | ||||
|             options.Applications["Angular"].RootUrl = configuration["App:ClientUrl"]; | ||||
|             options.Applications["Angular"].Urls[AccountUrlNames.PasswordReset] = "account/reset-password"; | ||||
|             options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ?? []); | ||||
|         }); | ||||
|  | ||||
|         Configure<AbpBackgroundJobOptions>(options => | ||||
| @ -166,7 +145,7 @@ public class KonSoftAuthServerModule : AbpModule | ||||
|                         configuration["App:CorsOrigins"]? | ||||
|                             .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                             .Select(o => o.RemovePostFix("/")) | ||||
|                             .ToArray() ?? Array.Empty<string>() | ||||
|                             .ToArray() ?? [] | ||||
|                     ) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|  | ||||
| @ -6,10 +6,10 @@ namespace KonSoft.BackgroundJobs.Controllers | ||||
|     [Route("[controller]")] | ||||
|     public class WeatherForecastController : ControllerBase | ||||
|     { | ||||
|         private static readonly string[] Summaries = new[] | ||||
|         { | ||||
|         private static readonly string[] Summaries = | ||||
|         [ | ||||
|             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" | ||||
|         }; | ||||
|         ]; | ||||
|  | ||||
|         private readonly ILogger<WeatherForecastController> _logger; | ||||
|  | ||||
|  | ||||
| @ -6,10 +6,10 @@ namespace KonSoft.BackgroundWorker.Controllers | ||||
|     [Route("[controller]")] | ||||
|     public class WeatherForecastController : ControllerBase | ||||
|     { | ||||
|         private static readonly string[] Summaries = new[] | ||||
|         { | ||||
|         private static readonly string[] Summaries = | ||||
|         [ | ||||
|             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" | ||||
|         }; | ||||
|         ]; | ||||
|  | ||||
|         private readonly ILogger<WeatherForecastController> _logger; | ||||
|  | ||||
|  | ||||
| @ -6,10 +6,10 @@ namespace KonSoft.InternalGateway.Controllers | ||||
|     [Route("[controller]")] | ||||
|     public class WeatherForecastController : ControllerBase | ||||
|     { | ||||
|         private static readonly string[] Summaries = new[] | ||||
|         { | ||||
|         private static readonly string[] Summaries = | ||||
|         [ | ||||
|             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" | ||||
|         }; | ||||
|         ]; | ||||
|  | ||||
|         private readonly ILogger<WeatherForecastController> _logger; | ||||
|  | ||||
|  | ||||
| @ -6,10 +6,10 @@ namespace KonSoft.PublicGateway.Controllers | ||||
|     [Route("[controller]")] | ||||
|     public class WeatherForecastController : ControllerBase | ||||
|     { | ||||
|         private static readonly string[] Summaries = new[] | ||||
|         { | ||||
|         private static readonly string[] Summaries = | ||||
|         [ | ||||
|             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" | ||||
|         }; | ||||
|         ]; | ||||
|  | ||||
|         private readonly ILogger<WeatherForecastController> _logger; | ||||
|  | ||||
|  | ||||
| @ -166,7 +166,7 @@ public class AdminHttpApiHostModule : AbpModule | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? Array.Empty<string>()) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|  | ||||
| @ -30,4 +30,10 @@ | ||||
|     <None Remove="Logs\**" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.EntityFrameworkCore\KonSoft.Admin.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.HttpApi\KonSoft.Admin.HttpApi.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -166,7 +166,7 @@ public class DispatchHttpApiHostModule : AbpModule | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? Array.Empty<string>()) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|  | ||||
| @ -30,4 +30,10 @@ | ||||
|     <None Remove="Logs\**" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\modules\dispatch\src\KonSoft.Dispatch.Application\KonSoft.Dispatch.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\dispatch\src\KonSoft.Dispatch.EntityFrameworkCore\KonSoft.Dispatch.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\dispatch\src\KonSoft.Dispatch.HttpApi\KonSoft.Dispatch.HttpApi.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -30,4 +30,10 @@ | ||||
|     <None Remove="Logs\**" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\modules\payment\src\KonSoft.Payment.Application\KonSoft.Payment.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\payment\src\KonSoft.Payment.EntityFrameworkCore\KonSoft.Payment.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\payment\src\KonSoft.Payment.HttpApi\KonSoft.Payment.HttpApi.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -166,7 +166,7 @@ public class PaymentHttpApiHostModule : AbpModule | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? Array.Empty<string>()) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|  | ||||
| @ -30,4 +30,10 @@ | ||||
|     <None Remove="Logs\**" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\modules\report\src\KonSoft.Report.Application\KonSoft.Report.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\report\src\KonSoft.Report.EntityFrameworkCore\KonSoft.Report.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\report\src\KonSoft.Report.HttpApi\KonSoft.Report.HttpApi.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -166,7 +166,7 @@ public class ReportHttpApiHostModule : AbpModule | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? Array.Empty<string>()) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|  | ||||
| @ -30,4 +30,10 @@ | ||||
|     <None Remove="Logs\**" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\modules\tenant-management\src\KonSoft.TenantManagement.Application\KonSoft.TenantManagement.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\tenant-management\src\KonSoft.TenantManagement.EntityFrameworkCore\KonSoft.TenantManagement.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\tenant-management\src\KonSoft.TenantManagement.HttpApi\KonSoft.TenantManagement.HttpApi.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -166,7 +166,7 @@ public class TenantManagementHttpApiHostModule : AbpModule | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? Array.Empty<string>()) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|  | ||||
| @ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep | ||||
|                 consentType: OpenIddictConstants.ConsentTypes.Implicit, | ||||
|                 displayName: "Swagger Application", | ||||
|                 secret: null, | ||||
|                 grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, }, | ||||
|                 grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode], | ||||
|                 scopes: commonScopes, | ||||
|                 redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html", | ||||
|                 clientUri: swaggerRootUrl | ||||
|  | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Admin.Domain.Tests\KonSoft.Admin.Domain.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Admin.Domain\KonSoft.Admin.Domain.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Admin.TestBase\KonSoft.Admin.TestBase.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -14,4 +14,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Admin.EntityFrameworkCore\KonSoft.Admin.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Admin.Application.Tests\KonSoft.Admin.Application.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -29,4 +29,8 @@ | ||||
|     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Admin.HttpApi.Client\KonSoft.Admin.HttpApi.Client.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep | ||||
|                 consentType: OpenIddictConstants.ConsentTypes.Implicit, | ||||
|                 displayName: "Swagger Application", | ||||
|                 secret: null, | ||||
|                 grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, }, | ||||
|                 grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode], | ||||
|                 scopes: commonScopes, | ||||
|                 redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html", | ||||
|                 clientUri: swaggerRootUrl | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||
|  | ||||
|   <PropertyGroup> | ||||
|     <TargetFramework>net8.0</TargetFramework> | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Dispatch.Application\KonSoft.Dispatch.Application.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Dispatch.Domain.Tests\KonSoft.Dispatch.Domain.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Dispatch.Domain\KonSoft.Dispatch.Domain.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Dispatch.TestBase\KonSoft.Dispatch.TestBase.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -14,4 +14,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Dispatch.EntityFrameworkCore\KonSoft.Dispatch.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Dispatch.Application.Tests\KonSoft.Dispatch.Application.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -29,4 +29,8 @@ | ||||
|     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Dispatch.HttpApi.Client\KonSoft.Dispatch.HttpApi.Client.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep | ||||
|                 consentType: OpenIddictConstants.ConsentTypes.Implicit, | ||||
|                 displayName: "Swagger Application", | ||||
|                 secret: null, | ||||
|                 grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, }, | ||||
|                 grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode], | ||||
|                 scopes: commonScopes, | ||||
|                 redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html", | ||||
|                 clientUri: swaggerRootUrl | ||||
|  | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Payment.Application\KonSoft.Payment.Application.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Payment.Domain.Tests\KonSoft.Payment.Domain.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||
|  | ||||
|   <PropertyGroup> | ||||
|     <TargetFramework>net8.0</TargetFramework> | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Payment.Domain\KonSoft.Payment.Domain.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Payment.TestBase\KonSoft.Payment.TestBase.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -14,4 +14,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Payment.EntityFrameworkCore\KonSoft.Payment.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Payment.Application.Tests\KonSoft.Payment.Application.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -29,4 +29,8 @@ | ||||
|     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Payment.HttpApi.Client\KonSoft.Payment.HttpApi.Client.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -16,4 +16,8 @@ | ||||
|     <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.Report.Domain.Shared\KonSoft.Report.Domain.Shared.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -15,4 +15,9 @@ | ||||
|     <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.Report.Application.Contracts\KonSoft.Report.Application.Contracts.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Report.Domain\KonSoft.Report.Domain.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -19,4 +19,8 @@ | ||||
|     <PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.Report.Domain.Shared\KonSoft.Report.Domain.Shared.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep | ||||
|                 consentType: OpenIddictConstants.ConsentTypes.Implicit, | ||||
|                 displayName: "Swagger Application", | ||||
|                 secret: null, | ||||
|                 grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, }, | ||||
|                 grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode], | ||||
|                 scopes: commonScopes, | ||||
|                 redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html", | ||||
|                 clientUri: swaggerRootUrl | ||||
|  | ||||
| @ -25,4 +25,8 @@ | ||||
|     </PackageReference> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.Report.Domain\KonSoft.Report.Domain.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -20,4 +20,8 @@ | ||||
|     <Content Remove="**\*generate-proxy.json" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.Report.Application.Contracts\KonSoft.Report.Application.Contracts.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -15,4 +15,8 @@ | ||||
|     <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.Report.Application.Contracts\KonSoft.Report.Application.Contracts.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Report.Application\KonSoft.Report.Application.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Report.Domain.Tests\KonSoft.Report.Domain.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||
|  | ||||
|   <PropertyGroup> | ||||
|     <TargetFramework>net8.0</TargetFramework> | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Report.Domain\KonSoft.Report.Domain.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Report.TestBase\KonSoft.Report.TestBase.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -14,4 +14,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Report.EntityFrameworkCore\KonSoft.Report.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Report.Application.Tests\KonSoft.Report.Application.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -29,4 +29,8 @@ | ||||
|     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.Report.HttpApi.Client\KonSoft.Report.HttpApi.Client.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -16,4 +16,8 @@ | ||||
|     <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.Domain.Shared\KonSoft.TenantManagement.Domain.Shared.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -15,4 +15,9 @@ | ||||
|     <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.Application.Contracts\KonSoft.TenantManagement.Application.Contracts.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.Domain\KonSoft.TenantManagement.Domain.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -19,4 +19,8 @@ | ||||
|     <PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.Domain.Shared\KonSoft.TenantManagement.Domain.Shared.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep | ||||
|                 consentType: OpenIddictConstants.ConsentTypes.Implicit, | ||||
|                 displayName: "Swagger Application", | ||||
|                 secret: null, | ||||
|                 grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, }, | ||||
|                 grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode], | ||||
|                 scopes: commonScopes, | ||||
|                 redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html", | ||||
|                 clientUri: swaggerRootUrl | ||||
|  | ||||
| @ -25,4 +25,8 @@ | ||||
|     </PackageReference> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.Domain\KonSoft.TenantManagement.Domain.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -20,4 +20,8 @@ | ||||
|     <Content Remove="**\*generate-proxy.json" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.Application.Contracts\KonSoft.TenantManagement.Application.Contracts.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -15,4 +15,8 @@ | ||||
|     <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.Application.Contracts\KonSoft.TenantManagement.Application.Contracts.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.TenantManagement.Application\KonSoft.TenantManagement.Application.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.Domain.Tests\KonSoft.TenantManagement.Domain.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -10,4 +10,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.TenantManagement.Domain\KonSoft.TenantManagement.Domain.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.TestBase\KonSoft.TenantManagement.TestBase.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -14,4 +14,9 @@ | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.TenantManagement.EntityFrameworkCore\KonSoft.TenantManagement.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.TenantManagement.Application.Tests\KonSoft.TenantManagement.Application.Tests.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -29,4 +29,8 @@ | ||||
|     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\src\KonSoft.TenantManagement.HttpApi.Client\KonSoft.TenantManagement.HttpApi.Client.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
		Reference in New Issue
	
	Block a user