Skip to content

Commit ae46c98

Browse files
ElderJamesElderJames
authored
Update AntDesign 1.1.2 and .NET 9 (#204)
* Update AntDesign 1.1.2 and .NET 9 * update action * fix build * fix build
1 parent 2e89a99 commit ae46c98

File tree

42 files changed

+154
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+154
-152
lines changed

‎.github/workflows/azure-static-web-apps-brave-coast-0edcf6600.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ jobs:
1515
with:
1616
persist-credentials: false
1717

18-
- uses: actions/setup-dotnet@v1
18+
- name: Setup .NET SDKs
19+
uses: actions/setup-dotnet@v4
1920
with:
20-
dotnet-version: 8.0.100
21+
dotnet-version: |
22+
9.0.x
2123
2224
- uses: actions/setup-node@v1
2325
with:

‎.github/workflows/gh-pages.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ jobs:
2020
with:
2121
persist-credentials: false
2222

23-
- name: Setup .NET Core
24-
uses: actions/setup-dotnet@v1
23+
- name: Setup .NET SDKs
24+
uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: 8.0.100
26+
dotnet-version: |
27+
9.0.x
2728
2829
- uses: actions/setup-node@v1
2930
with:

‎.github/workflows/pr-checks.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v1
1414

15-
- name: Setup .NET Core
16-
uses: actions/setup-dotnet@v1
15+
- name: Setup .NET SDKs
16+
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 8.0.100
18+
dotnet-version: |
19+
9.0.x
1920
2021
- uses: actions/setup-node@v1
2122
with:

‎.template.config/templates/assets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "AntDesign.Pro.Template",
3-
"version": "1.0.0",
3+
"version": "1.1.2",
44
"description": "An out-of-box UI solution for enterprise applications as a Blazor boilerplate.",
55
"scripts": {
66
"start": "dotnet watch -p ./ run",

‎.template.config/templates/server/AntDesign.Pro.Template.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<PackageReference Include="AntDesign.Charts" Version="0.4.0" />
11-
<PackageReference Include="AntDesign.Extensions.Localization" Version="1.0.0" />
12-
<PackageReference Include="AntDesign.ProLayout" Version="1.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
14-
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
11+
<PackageReference Include="AntDesign.Extensions.Localization" Version="1.1.2" />
12+
<PackageReference Include="AntDesign.ProLayout" Version="1.1.2" />
13+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
14+
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
1515
</ItemGroup>
1616

1717
<!--#if (UseNodeJS) -->

‎.template.config/templates/server/Pages/Welcome.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Card>
55
<Alert
66
Message="AntDesign.Templates have been published to nuget, you can download and use them directly."
7-
Type="success"
7+
Type="@AlertType.Success"
88
ShowIcon="true"
99
Banner
1010
Style="margin: -12px; margin-bottom: 24px"/>

‎.template.config/templates/wasm/AntDesign.Pro.Template.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<RazorLangVersion>3.0</RazorLangVersion>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="AntDesign.Charts" Version="0.4.0" />
12-
<PackageReference Include="AntDesign.Extensions.Localization" Version="1.0.0" />
13-
<PackageReference Include="AntDesign.ProLayout" Version="1.0.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
16-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
18-
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
12+
<PackageReference Include="AntDesign.Extensions.Localization" Version="1.1.2" />
13+
<PackageReference Include="AntDesign.ProLayout" Version="1.1.2" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
16+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
18+
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
1919
</ItemGroup>
2020

2121
<!--#if (UseNodeJS) -->

‎.template.config/templates/wasm/Pages/Welcome.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Card>
55
<Alert
66
Message="AntDesign.Templates have been published to nuget, you can download and use them directly."
7-
Type="success"
7+
Type="@AlertType.Success"
88
ShowIcon="true"
99
Banner
1010
Style="margin: -12px; margin-bottom: 24px"/>

‎.template.config/templates/webapp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "AntDesign.Pro.Template",
3-
"version": "1.0.0",
3+
"version": "1.1.2",
44
"description": "An out-of-box UI solution for enterprise applications as a Blazor boilerplate.",
55
"scripts": {
66
"start": "dotnet watch -p ./src/AntDesign.Pro.Template run",

‎.template.config/templates/webapp/src/AntDesign.Pro.Template.Client/AntDesign.Pro.Template.Client.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
@@ -10,13 +10,13 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="AntDesign.Charts" Version="0.4.0" />
13-
<PackageReference Include="AntDesign.Extensions.Localization" Version="1.0.0" />
14-
<PackageReference Include="AntDesign.ProLayout" Version="1.0.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
17-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
19-
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
13+
<PackageReference Include="AntDesign.Extensions.Localization" Version="1.1.2" />
14+
<PackageReference Include="AntDesign.ProLayout" Version="1.1.2" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
17+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
19+
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
2020
</ItemGroup>
2121

2222
<!--#if (UseNodeJS) -->

‎.template.config/templates/webapp/src/AntDesign.Pro.Template/AntDesign.Pro.Template.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<ProjectReference Include="..\AntDesign.Pro.Template.Client\AntDesign.Pro.Template.Client.csproj" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.5" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "AntDesign.Pro",
3-
"version": "1.0.0",
3+
"version": "1.1.2",
44
"description": "An out-of-box UI solution for enterprise applications as a Blazor boilerplate.",
55
"scripts": {
66
"start": "dotnet watch -p ./src/AntDesign.Pro run",

‎src/AntDesign.Pro/AntDesign.Pro.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net8</TargetFramework>
4+
<TargetFramework>net9</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AssemblyName>AntDesign.Pro.Template</AssemblyName>
@@ -12,13 +12,13 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="AntDesign.Charts" Version="0.5.1" />
15-
<PackageReference Include="AntDesign.Extensions.Localization" Version="1.0.0" />
16-
<PackageReference Include="AntDesign.ProLayout" Version="1.0.0" />
17-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
18-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
19-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
21-
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
15+
<PackageReference Include="AntDesign.Extensions.Localization" Version="1.1.2" />
16+
<PackageReference Include="AntDesign.ProLayout" Version="1.1.2" />
17+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
19+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
21+
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
2222
</ItemGroup>
2323

2424
<PropertyGroup Condition=" '$(SolutionDir)'==''">

‎src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AntDesign.Tooltip Title="@("Help")" Placement="@Placement.Bottom">
1313
<Unbound>
1414
<span @ref="@context.Current" class="action">
15-
<Icon Type="question-circle" Theme="outline" />
15+
<Icon Type="question-circle" Theme="IconThemeType.Outline" />
1616
</span>
1717
</Unbound>
1818
</AntDesign.Tooltip>

‎src/AntDesign.Pro/Layouts/BasicLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Icon Class="action" Type="@(collapsed?"menu-unfold":"menu-fold")" OnClick="Toggle" />
1313
</SpaceItem>
1414
<SpaceItem>
15-
<Icon Class="action" Type="reload" Theme="outline" OnClick="Reload" />
15+
<Icon Class="action" Type="reload" Theme="@IconThemeType.Outline" OnClick="Reload" />
1616
</SpaceItem>
1717
</Space>
1818
</HeaderContentRender>

‎src/AntDesign.Pro/Pages/Account/Center/Components/Applications/Applications.razor

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Actions="Actions">
1212
<CardMeta>
1313
<AvatarTemplate>
14-
<Avatar Size="small" Src="@context.Avatar" />
14+
<Avatar Size="@AvatarSize.Small" Src="@context.Avatar" />
1515
</AvatarTemplate>
1616
<TitleTemplate>@context.Title</TitleTemplate>
1717
</CardMeta>
@@ -35,15 +35,15 @@
3535
{
3636

3737
private static readonly RenderFragment Download =@<AntDesign.Tooltip Title="@("下载")">
38-
<Icon Type="download" Theme="outline" />
38+
<Icon Type="download" Theme="@IconThemeType.Outline" />
3939
</AntDesign.Tooltip>;
4040

4141
private static readonly IList<RenderFragment> Actions = new List<RenderFragment>
4242
{
4343
Download,
44-
@<AntDesign.Tooltip Title="@("Edit")"><Icon Type="edit" Theme="outline" /></AntDesign.Tooltip>,
45-
@<AntDesign.Tooltip Title="@("Share")"><Icon Type="share-alt" Theme="outline" /></AntDesign.Tooltip>,
46-
@<Dropdown><Icon Type="ellipsis" Theme="outline" /></Dropdown>
44+
@<AntDesign.Tooltip Title="@("Edit")"><Icon Type="edit" Theme="@IconThemeType.Outline" /></AntDesign.Tooltip>,
45+
@<AntDesign.Tooltip Title="@("Share")"><Icon Type="share-alt" Theme="@IconThemeType.Outline" /></AntDesign.Tooltip>,
46+
@<Dropdown><Icon Type="ellipsis" Theme="@IconThemeType.Outline" /></Dropdown>
4747
};
4848

4949
private static RenderFragment FormatWan(int val) {

‎src/AntDesign.Pro/Pages/Account/Center/Components/ArticleListContent/ArticleListContent.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="listContent">
55
<div class="description">@Data.Content</div>
66
<div class="extra">
7-
<Avatar Src="@Data.Avatar" Size="small" />
7+
<Avatar Src="@Data.Avatar" Size="@AvatarSize.Small" />
88
<a href="@Data.Href">@Data.Owner</a> Posted on <a href="@Data.Href">@Data.Href</a>
99
<em>@Data.UpdatedAt.ToString("yyyy-MM-dd HH:mm:ss")</em>
1010
</div>

‎src/AntDesign.Pro/Pages/Account/Center/Components/Articles/Articles.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<AntList
44
TItem="ListItemDataType"
5-
Size="large"
5+
Size="ListSize.Large"
66
Class="articleList"
77
DataSource="List">
88
<ListItem NoFlex>

‎src/AntDesign.Pro/Pages/Account/Center/Index.razor

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
<div class="detail">
1515
<p>
16-
<Icon Type="contacts" Theme="outline" Style="margin-right:8px;" />
16+
<Icon Type="contacts" Theme="@IconThemeType.Outline" Style="margin-right:8px;" />
1717
@_currentUser.Title
1818
</p>
1919
<p>
20-
<Icon Type="cluster" Theme="outline" Style="margin-right:8px;" />
20+
<Icon Type="cluster" Theme="@IconThemeType.Outline" Style="margin-right:8px;" />
2121
@_currentUser.Group
2222
</p>
2323
<p>
24-
<Icon Type="home" Theme="outline" Style="margin-right:8px;" />
24+
<Icon Type="home" Theme="@IconThemeType.Outline" Style="margin-right:8px;" />
2525
<!--todo: add userinfo-->
2626
@_currentUser.Geographic.Province.Label
2727
@_currentUser.Geographic.City.Label
@@ -32,20 +32,20 @@
3232

3333
<div class="tags">
3434
<div class="tagsTitle">Tags</div>
35-
@foreach (var tag in _currentUser.Tags) {
35+
@foreach (var tag in _currentUser.Tags)
36+
{
3637
<Tag>@tag.Label</Tag>
3738
}
3839

39-
@if (_inputVisible) {
40-
<AntDesign.Input Type="text"
41-
Size="small"
42-
Style="width: 78px"
43-
@bind-Value="InputValue"
44-
OnBlur="HandleInputConfirm" />
40+
@if (_inputVisible)
41+
{
42+
<AntDesign.Input Type="InputType.Text" Size="InputSize.Small" Style="width: 78px"
43+
@bind-Value="InputValue" OnBlur="HandleInputConfirm" />
4544
}
46-
else {
45+
else
46+
{
4747
<Tag OnClick="ShowInput" Style="border-style: dashed">
48-
<Icon Type="plus" Theme="outline" />
48+
<Icon Type="plus" Theme="@IconThemeType.Outline" />
4949
</Tag>
5050
}
5151
</div>
@@ -60,28 +60,26 @@
6060
</AntDesign.Col>
6161
<AntDesign.Col Lg="17" Md="24">
6262
<Card Class="tabsCard">
63-
<CardTabs>
64-
<Tabs DefaultActiveKey="1">
65-
<TabPane Key="1">
66-
<TabTemplate>Articles (@_fakeList.Count)</TabTemplate>
67-
<ChildContent>
68-
<Articles List="_fakeList" />
69-
</ChildContent>
70-
</TabPane>
71-
<TabPane Key="2">
72-
<TabTemplate>Applications (@_fakeList.Count)</TabTemplate>
73-
<ChildContent>
74-
<Applications List="_fakeList" />
75-
</ChildContent>
76-
</TabPane>
77-
<TabPane Key="3">
78-
<TabTemplate>Projects (@_fakeList.Count)</TabTemplate>
79-
<ChildContent>
80-
<Projects List="_fakeList" />
81-
</ChildContent>
82-
</TabPane>
83-
</Tabs>
84-
</CardTabs>
63+
<Tabs DefaultActiveKey="1">
64+
<TabPane Key="1">
65+
<TabTemplate>Articles (@_fakeList.Count)</TabTemplate>
66+
<ChildContent>
67+
<Articles List="_fakeList" />
68+
</ChildContent>
69+
</TabPane>
70+
<TabPane Key="2">
71+
<TabTemplate>Applications (@_fakeList.Count)</TabTemplate>
72+
<ChildContent>
73+
<Applications List="_fakeList" />
74+
</ChildContent>
75+
</TabPane>
76+
<TabPane Key="3">
77+
<TabTemplate>Projects (@_fakeList.Count)</TabTemplate>
78+
<ChildContent>
79+
<Projects List="_fakeList" />
80+
</ChildContent>
81+
</TabPane>
82+
</Tabs>
8583
</Card>
8684
</AntDesign.Col>
8785
</Row>

‎src/AntDesign.Pro/Pages/Account/Settings/Components/BaseView.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="baseView">
44
<div class="left" style="min-width: 310px;">
55
<Form
6-
Layout="vertical"
6+
Layout="@FormLayout.Vertical"
77
OnFinish="HandleFinish"
88
Model="@_currentUser">
99
<FormItem Label="Email">
@@ -36,7 +36,7 @@
3636
<PhoneView />
3737
</FormItem>
3838
<FormItem>
39-
<Button HtmlType="submit" Type="primary">
39+
<Button HtmlType="submit" Type="@ButtonType.Primary">
4040
Update Information
4141
</Button>
4242
</FormItem>

0 commit comments

Comments
 (0)