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

Upgrade to ABP 8.0.0 #69

Merged
merged 1 commit into from
Dec 27, 2023
Merged

Upgrade to ABP 8.0.0 #69

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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
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
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>

<AbpVersion>7.4.0</AbpVersion>
<EasyAbpAbpWeChatModuleVersion>2.8.0</EasyAbpAbpWeChatModuleVersion>
<AbpVersion>8.0.0</AbpVersion>
<EasyAbpAbpWeChatModuleVersion>2.9.0</EasyAbpAbpWeChatModuleVersion>

</PropertyGroup>
</Project>
128 changes: 0 additions & 128 deletions azure-pipelines.yml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>2.9.1</Version>
<Version>2.10.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/Prepayment/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@

Prepayment implementation of the EasyAbp.PaymentService module.

## Online Demo

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

## Installation

> Should also install the [PaymentService module](/docs/README.md#getting-started) since this module depends on it.
Expand Down
4 changes: 0 additions & 4 deletions docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@

An abp application module that provides payment service.

## Online Demo

We have launched an online demo for this module: [https://pay.samples.easyabp.io](https://pay.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
4 changes: 0 additions & 4 deletions docs/WeChatPay/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@

WeChatPay implementation of the EasyAbp.PaymentService module.

## Online Demo

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

## Installation

> Should also install the [PaymentService module](/docs/README.md#getting-started) since this module depends on it.
Expand Down
2 changes: 1 addition & 1 deletion ...ment.Application.Contracts/EasyAbp.PaymentService.Prepayment.Application.Contracts.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>
<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 ...aymentService.Prepayment.Application/EasyAbp.PaymentService.Prepayment.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>
<RootNamespace />
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...ntService.Prepayment.Domain.Shared/EasyAbp.PaymentService.Prepayment.Domain.Shared.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>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
Expand All @@ -14,7 +14,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
2 changes: 1 addition & 1 deletion .../EasyAbp.PaymentService.Prepayment.Domain/EasyAbp.PaymentService.Prepayment.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>
<TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...epayment.EntityFrameworkCore/EasyAbp.PaymentService.Prepayment.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>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...Service.Prepayment.HttpApi.Client/EasyAbp.PaymentService.Prepayment.HttpApi.Client.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>
<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 ...asyAbp.PaymentService.Prepayment.HttpApi/EasyAbp.PaymentService.Prepayment.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>
<RootNamespace />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...asyAbp.PaymentService.Prepayment.MongoDB/EasyAbp.PaymentService.Prepayment.MongoDB.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>
<TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace />
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...nt/src/EasyAbp.PaymentService.Prepayment.Web/EasyAbp.PaymentService.Prepayment.Web.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>
<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 ...e.Prepayment.Application.Tests/EasyAbp.PaymentService.Prepayment.Application.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.PaymentService.Prepayment</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\EasyAbp.PaymentService\src\EasyAbp.PaymentService.Application\EasyAbp.PaymentService.Application.csproj" />
<ProjectReference Include="..\..\src\EasyAbp.PaymentService.Prepayment.Application\EasyAbp.PaymentService.Prepayment.Application.csproj" />
<ProjectReference Include="..\EasyAbp.PaymentService.Prepayment.Domain.Tests\EasyAbp.PaymentService.Prepayment.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>
Loading