Skip to content

Commit

Permalink
update AntDesign 0.13.0 and .NET 7 (#143)
Browse files Browse the repository at this point in the history
  • Loading branch information
ElderJames authored Nov 23, 2022
1 parent 2763aab commit 6426156
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.101
dotnet-version: 7.0.100

- uses: actions/setup-node@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.101
dotnet-version: 7.0.100

- uses: actions/setup-node@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.101
dotnet-version: 7.0.100

- uses: actions/setup-node@v1
with:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ jobs:
with:
dotnet-version: 6.0.101

- uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.100

- uses: actions/setup-node@v1
with:
node-version: "10.x"
Expand Down
10 changes: 5 additions & 5 deletions src/AntDesign.Pro/AntDesign.Pro.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net6</TargetFramework>
<TargetFramework>net7</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
<AssemblyName>AntDesign.Pro.Template</AssemblyName>
<RootNamespace>AntDesign.Pro.Template</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AntDesign.Charts" Version="0.2.3" />
<PackageReference Include="AntDesign.ProLayout" Version="0.12.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
<PackageReference Include="AntDesign.ProLayout" Version="0.13.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/AntDesign.Pro/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<div style="display: flex; justify-content: center; align-items: center;">
<img src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" width="32"
style="margin-right: 8px;" />
Ant Design Blazor
Ant Design Blazor <div class="loading-progress-text"></div>
</div>
</div>
</div>
Expand Down

0 comments on commit 6426156

Please sign in to comment.