Skip to content

Commit

Permalink
Merge pull request #101 from EasyAbp/abp8
Browse files Browse the repository at this point in the history 
Upgrade to ABP 8.0.0
  • Loading branch information
@gdlcf88
gdlcf88 committed Dec 27, 2023
2 parents 2683c72 + 7325a46 commit f2d7d63
Show file tree
Hide file tree
Showing 86 changed files with 4,595 additions and 324 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: NuGet/setup-nuget@v1
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: read common.props
id: commonProps
Expand Down
6 changes: 3 additions & 3 deletions Directory.Build.props
View file
@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>

<AbpVersion>7.4.0</AbpVersion>
<EasyAbpAbpTagHelperPlusModuleVersion>1.7.0</EasyAbpAbpTagHelperPlusModuleVersion>
<EasyAbpAbpWeChatModuleVersion>2.8.0</EasyAbpAbpWeChatModuleVersion>
<AbpVersion>8.0.0</AbpVersion>
<EasyAbpAbpTagHelperPlusModuleVersion>1.8.0</EasyAbpAbpTagHelperPlusModuleVersion>
<EasyAbpAbpWeChatModuleVersion>2.9.0</EasyAbpAbpWeChatModuleVersion>

</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions common.props
View file
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>2.5.0</Version>
<Version>2.6.0</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>
Expand All @@ -19,8 +19,8 @@
</ItemGroup>

<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>
Expand Down
4 changes: 0 additions & 4 deletions docs/MiniPrograms/README.md
View file
Expand Up @@ -8,10 +8,6 @@

Abp 小程序管理模块，提供小程序登录、用户个人信息记录、小程序微信服务器等功能，自动适应微信开放平台规则，与微信第三方平台模块轻松衔接。

## Online Demo

We have launched an online demo for this module: [https://wechat.samples.easyabp.io](https://wechat.samples.easyabp.io)

## Installation

1. Install the following NuGet packages. ([see how](https://github.com/EasyAbp/EasyAbpGuide/blob/master/docs/How-To.md#add-nuget-packages))
Expand Down
2 changes: 1 addition & 1 deletion ...Common.Application.Contracts/EasyAbp.WeChatManagement.Common.Application.Contracts.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...bp.WeChatManagement.Common.Application/EasyAbp.WeChatManagement.Common.Application.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace />
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...eChatManagement.Common.Domain.Shared/EasyAbp.WeChatManagement.Common.Domain.Shared.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
Expand All @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion .../src/EasyAbp.WeChatManagement.Common.Domain/EasyAbp.WeChatManagement.Common.Domain.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...ent.Common.EntityFrameworkCore/EasyAbp.WeChatManagement.Common.EntityFrameworkCore.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...hatManagement.Common.HttpApi.Client/EasyAbp.WeChatManagement.Common.HttpApi.Client.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...rc/EasyAbp.WeChatManagement.Common.HttpApi/EasyAbp.WeChatManagement.Common.HttpApi.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...rc/EasyAbp.WeChatManagement.Common.MongoDB/EasyAbp.WeChatManagement.Common.MongoDB.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...Common/src/EasyAbp.WeChatManagement.Common.Web/EasyAbp.WeChatManagement.Common.Web.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<IsPackable>true</IsPackable>
<OutputType>Library</OutputType>
Expand All @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...agement.Common.Application.Tests/EasyAbp.WeChatManagement.Common.Application.Tests.csproj
View file
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.WeChatManagement.Common</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\EasyAbp.WeChatManagement.Common.Application\EasyAbp.WeChatManagement.Common.Application.csproj" />
<ProjectReference Include="..\EasyAbp.WeChatManagement.Common.Domain.Tests\EasyAbp.WeChatManagement.Common.Domain.Tests.csproj" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ....WeChatManagement.Common.Domain.Tests/EasyAbp.WeChatManagement.Common.Domain.Tests.csproj
View file
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.WeChatManagement.Common</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<ProjectReference Include="..\EasyAbp.WeChatManagement.Common.EntityFrameworkCore.Tests\EasyAbp.WeChatManagement.Common.EntityFrameworkCore.Tests.csproj" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions ...ntityFrameworkCore.Tests/EasyAbp.WeChatManagement.Common.EntityFrameworkCore.Tests.csproj
View file
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.WeChatManagement.Common</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.WeChatManagement.Common.EntityFrameworkCore\EasyAbp.WeChatManagement.Common.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EasyAbp.WeChatManagement.Common.TestBase\EasyAbp.WeChatManagement.Common.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="$(AbpVersion)" />
Expand Down
4 changes: 2 additions & 2 deletions ...lient.ConsoleTestApp/EasyAbp.WeChatManagement.Common.HttpApi.Client.ConsoleTestApp.csproj
View file
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.WeChatManagement.Common</RootNamespace>
</PropertyGroup>

Expand All @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...eChatManagement.Common.MongoDB.Tests/EasyAbp.WeChatManagement.Common.MongoDB.Tests.csproj
View file
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.WeChatManagement.Common</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="EphemeralMongo.Core" Version="1.1.0" />
<PackageReference Include="EphemeralMongo6.runtime.linux-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
<PackageReference Include="EphemeralMongo6.runtime.osx-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
Expand Down
14 changes: 7 additions & 7 deletions .../EasyAbp.WeChatManagement.Common.TestBase/EasyAbp.WeChatManagement.Common.TestBase.csproj
View file
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.WeChatManagement.Common</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="NSubstitute" Version="4.3.0" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion ....Application.Contracts/EasyAbp.WeChatManagement.MiniPrograms.Application.Contracts.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...agement.MiniPrograms.Application/EasyAbp.WeChatManagement.MiniPrograms.Application.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...agement.MiniPrograms.Domain.Ids4/EasyAbp.WeChatManagement.MiniPrograms.Domain.Ids4.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...Programs.Domain.OpenIddict/EasyAbp.WeChatManagement.MiniPrograms.Domain.OpenIddict.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace />
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...ent.MiniPrograms.Domain.Shared/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
Expand All @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ....WeChatManagement.MiniPrograms.Domain/EasyAbp.WeChatManagement.MiniPrograms.Domain.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...rams.EntityFrameworkCore/EasyAbp.WeChatManagement.MiniPrograms.EntityFrameworkCore.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...t.MiniPrograms.HttpApi.Client/EasyAbp.WeChatManagement.MiniPrograms.HttpApi.Client.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...eChatManagement.MiniPrograms.HttpApi/EasyAbp.WeChatManagement.MiniPrograms.HttpApi.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...eChatManagement.MiniPrograms.MongoDB/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...asyAbp.WeChatManagement.MiniPrograms.Web/EasyAbp.WeChatManagement.MiniPrograms.Web.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<IsPackable>true</IsPackable>
<OutputType>Library</OutputType>
Expand All @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...Programs.Application.Tests/EasyAbp.WeChatManagement.MiniPrograms.Application.Tests.csproj
View file
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.WeChatManagement.MiniPrograms</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\EasyAbp.WeChatManagement.MiniPrograms.Application\EasyAbp.WeChatManagement.MiniPrograms.Application.csproj" />
<ProjectReference Include="..\EasyAbp.WeChatManagement.MiniPrograms.Domain.Tests\EasyAbp.WeChatManagement.MiniPrograms.Domain.Tests.csproj" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>

</Project>

0 comments on commit f2d7d63

Please sign in to comment.