Skip to content

Commit

Permalink
Merge pull request #189 from EasyAbp/abp-8.2
Browse files Browse the repository at this point in the history
Upgrade to ABP 8.2.1
  • Loading branch information
gdlcf88 authored Jul 30, 2024
2 parents e1927da + 029a72d commit 3259b48
Show file tree
Hide file tree
Showing 10 changed files with 707 additions and 2,579 deletions.
4 changes: 2 additions & 2 deletions dotnet/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>

<AbpVersion>8.1.3</AbpVersion>
<AbpLeptonXThemeVersion>3.1.*-*</AbpLeptonXThemeVersion>
<AbpVersion>8.2.1</AbpVersion>
<AbpLeptonXThemeVersion>3.2.0</AbpLeptonXThemeVersion>
<BlazoriseVersion>1.5.2</BlazoriseVersion>

</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/common.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>2.12.1</Version>
<Version>2.13.0</Version>
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
<AbpProjectType>app</AbpProjectType>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.AbpHelper.Gui</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
Expand All @@ -22,7 +22,7 @@
</ItemGroup>

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

</Project>

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"version": "2.12.1",
"version": "2.13.0",
"name": "easyabp-abphelper-gui",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.1.3",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.1.3"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0"
}
}
2,778 changes: 213 additions & 2,565 deletions dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/yarn.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyAbp.AbpHelper.Gui</RootNamespace>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions electron/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion electron/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "abphelper-gui",
"productName": "AbpHelper",
"version": "2.12.1",
"version": "2.13.0",
"license": "Apache-2.0",
"description": "AbpHelper is a tool that helps you with developing Abp vNext applications.",
"repository": "https://github.com/EasyAbp/AbpHelper.GUI",
Expand Down

0 comments on commit 3259b48

Please sign in to comment.