Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to abp 8.0 #4

Merged
merged 1 commit into from
Feb 21, 2024
Merged

Bump to abp 8.0 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,9 +490,12 @@ roslynator_compiler_diagnostic_fixes.enabled = true
tab_width = 4

#
dotnet_diagnostic.ide0011.severity = silent
dotnet_diagnostic.CA1848.severity = silent
dotnet_diagnostic.CA1305.severity = silent
dotnet_diagnostic.CA2016.severity = warning
dotnet_diagnostic.RCS1141.severity = silent
dotnet_diagnostic.RCS1251.severity = silent

[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
indent_style = space
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-pack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
dotnet-version: |
7.0.x
8.0.x

- name: Install Dotnet Tool
run: |
Expand Down
2 changes: 1 addition & 1 deletion host/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>1.0.0</Version>
<AbpVersion>7.3.3</AbpVersion>
<AbpVersion>8.0.0</AbpVersion>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AbpProjectType>app</AbpProjectType>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion host/src/Sample.Application/Sample.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Sample</RootNamespace>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions host/src/Sample.DbMigrator/Sample.DbMigrator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand All @@ -13,7 +13,7 @@
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion host/src/Sample.Domain.Shared/Sample.Domain.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion host/src/Sample.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ private async Task CreateApplicationAsync(
var application = new AbpApplicationDescriptor
{
ClientId = name,
Type = type,
ClientType = type,
ClientSecret = secret,
ConsentType = consentType,
DisplayName = displayName,
Expand Down
2 changes: 1 addition & 1 deletion host/src/Sample.Domain/Sample.Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Sample</RootNamespace>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Sample</RootNamespace>
</PropertyGroup>
Expand All @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Sample</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
Expand Down
2 changes: 1 addition & 1 deletion host/src/Sample.HttpApi/Sample.HttpApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Sample</RootNamespace>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions modules/account/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<Product>Passingwind.Abp.Account</Product>
<Description>an abp module that provider account service, such as login, 2fa, account link, impersonation, settings. </Description>
<PackageTags>abp-module</PackageTags>
<Version>0.2.0</Version>
<PackageVersion>0.2.10</PackageVersion>
<Version>1.0.0</Version>
<PackageVersion>1.0.0</PackageVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ccount/src/Passingwind.Abp.Account.Application/Passingwind.Abp.Account.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.Account</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ccount.AspNetCore.IdentityClient/Passingwind.Abp.Account.AspNetCore.IdentityClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.Account</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../account/src/Passingwind.Abp.Account.AspNetCore/Passingwind.Abp.Account.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.Account</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...nt/src/Passingwind.Abp.Account.Domain.Shared/Passingwind.Abp.Account.Domain.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion modules/account/src/Passingwind.Abp.Account.HttpApi/Passingwind.Abp.Account.HttpApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.Account</RootNamespace>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions modules/api-keys/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<Product>Passingwind.Abp.ApiKey</Product>
<Description>an abp module that provider api key authentication and key management.</Description>
<PackageTags>abp-module, apikey</PackageTags>
<Version>0.2.0</Version>
<PackageVersion>0.2.2</PackageVersion>
<Version>1.0.0</Version>
<PackageVersion>1.0.0</PackageVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...api-keys/src/Passingwind.Abp.ApiKey.Application/Passingwind.Abp.ApiKey.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...s/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...keys/src/Passingwind.Abp.ApiKey.Domain.Shared/Passingwind.Abp.ApiKey.Domain.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...singwind.Abp.ApiKey.EntityFrameworkCore/Passingwind.Abp.ApiKey.EntityFrameworkCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
</PropertyGroup>
Expand Down
6 changes: 1 addition & 5 deletions modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi.Client/ApiKeyHttpApiClientModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
ApiKeyRemoteServiceConsts.RemoteServiceName
);

Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<ApiKeyHttpApiClientModule>();
});

Configure<AbpVirtualFileSystemOptions>(options => options.FileSets.AddEmbedded<ApiKeyHttpApiClientModule>());
}
}
2 changes: 1 addition & 1 deletion modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/Passingwind.Abp.ApiKey.HttpApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
</PropertyGroup>
Expand Down
14 changes: 7 additions & 7 deletions modules/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,38 @@
</PropertyGroup>

<PropertyGroup>
<AbpVersion>7.3.3</AbpVersion>
<AbpVersion>8.0.0</AbpVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Release'">
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
<PackageReference Include="Fody" Version="6.5.3">
<PackageReference Include="ConfigureAwait.Fody" Version="3.3.2" PrivateAssets="All" />
<PackageReference Include="Fody" Version="6.8.0">
<PrivateAssets>All</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="4.5.0">
<PackageReference Include="Roslynator.Analyzers" Version="4.11.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.5.0">
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.11.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.5.0">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.11.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions modules/dictionary-management/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<Product>Passingwind.Abp.DictionaryManagement</Product>
<Description>an abp module that provider dynamic dictionary management service</Description>
<PackageTags>abp-module</PackageTags>
<Version>0.2.0</Version>
<PackageVersion>0.2.1</PackageVersion>
<Version>1.0.0</Version>
<PackageVersion>1.0.0</PackageVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ....DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.DictionaryManagement</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...tionaryManagement.Domain.Shared/Passingwind.Abp.DictionaryManagement.Domain.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ement.EntityFrameworkCore/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.DictionaryManagement</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...wind.Abp.DictionaryManagement.HttpApi/Passingwind.Abp.DictionaryManagement.HttpApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.DictionaryManagement</RootNamespace>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions modules/dynamic-permission-management/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<Product>Passingwind.Abp.DynamicPermissionManagement</Product>
<Description>an abp module that provider dynamic permission management service</Description>
<PackageTags>abp-module</PackageTags>
<Version>0.2.0</Version>
<PackageVersion>0.2.1</PackageVersion>
<Version>1.0.0</Version>
<PackageVersion>1.0.0</PackageVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...sionManagement.Application/Passingwind.Abp.DynamicPermissionManagement.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.DynamicPermissionManagement</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...Management.Domain.Shared/Passingwind.Abp.DynamicPermissionManagement.Domain.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...ntityFrameworkCore/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.DynamicPermissionManagement</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...icPermissionManagement.HttpApi/Passingwind.Abp.DynamicPermissionManagement.HttpApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.DynamicPermissionManagement</RootNamespace>
</PropertyGroup>
Expand Down
Loading
Loading