Fix 0.10.2 break changes (#111)

ElderJames · web-flow · commit 0ccdf92a7b60 · 2022-01-17T14:22:06.000+08:00
* fix breaking changes

* fix login styles

* fix missing _Host.cshtml

* Add .net 6 sdk
diff --git a/.github/workflows/azure-static-web-apps-brave-coast-0edcf6600.yml b/.github/workflows/azure-static-web-apps-brave-coast-0edcf6600.yml
@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/setup-dotnet@v1
         with:
-            dotnet-version: 5.0.100
+            dotnet-version: 6.0.101
 
       - uses: actions/setup-node@v1
         with:
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -23,7 +23,7 @@ jobs:
             - name: Setup .NET Core
               uses: actions/setup-dotnet@v1
               with:
-                  dotnet-version: 5.0.100
+                  dotnet-version: 6.0.101
 
             - uses: actions/setup-node@v1
               with:
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 6.0.101
 
       - uses: actions/setup-node@v1
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 6.0.101
 
       - uses: actions/setup-node@v1
         with:
diff --git a/.template.config/template.json b/.template.config/template.json
@@ -208,7 +208,9 @@
                 {
                     "condition": "(full)",
                     "exclude": [
-                       "Pages/**/*"
+                       "Pages/Welcome.razor",
+                       "Pages/Welcome.razor.less",
+                       "Pages/Welcome.razor.css",
                     ]
                 },
                 {
diff --git a/.template.config/templates/hosted/src/Client/AntDesign.Pro.Template.Client.csproj b/.template.config/templates/hosted/src/Client/AntDesign.Pro.Template.Client.csproj
@@ -1,16 +1,16 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.2.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.1.10" />
+    <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="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
   <!--#if (UseNodeJS) -->
diff --git a/.template.config/templates/hosted/src/Server/AntDesign.Pro.Template.Server.csproj b/.template.config/templates/hosted/src/Server/AntDesign.Pro.Template.Server.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/.template.config/templates/server/AntDesign.Pro.Template.csproj b/.template.config/templates/server/AntDesign.Pro.Template.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.2.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.1.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.1.10" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
   
   <!--#if (UseNodeJS) -->
diff --git a/.template.config/templates/server/Pages/_Host.cshtml b/.template.config/templates/server/Pages/_Host.cshtml
@@ -15,6 +15,7 @@
     <link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet" />
     <link href="_content/AntDesign.ProLayout/css/ant-design-pro-layout-blazor.css" rel="stylesheet" />
     <link href="./css/site.css" rel="stylesheet" />
+    <link href="AntDesign.Pro.Template.styles.css" rel="stylesheet" />
 </head>
 <body>
     <app>
diff --git a/.template.config/templates/wasm/AntDesign.Pro.Template.csproj b/.template.config/templates/wasm/AntDesign.Pro.Template.csproj
@@ -1,17 +1,17 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.2.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.1.10" />
+    <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="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
   <!--#if (UseNodeJS) -->
diff --git a/src/AntDesign.Pro/AntDesign.Pro.csproj b/src/AntDesign.Pro/AntDesign.Pro.csproj
@@ -1,18 +1,18 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <RazorLangVersion>3.0</RazorLangVersion>
     <AssemblyName>AntDesign.Pro.Template</AssemblyName>
     <RootNamespace>AntDesign.Pro.Template</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.2.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.1.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.1.10" />
+    <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="System.Net.Http.Json" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor b/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor
@@ -9,7 +9,7 @@
                       Options="DefaultOptions" />
     </SpaceItem>
     <SpaceItem>
-        <AntDesign.Tooltip Title="@("Help")" Placement="@PlacementType.Bottom">
+        <AntDesign.Tooltip Title="@("Help")" Placement="@Placement.Bottom">
             <Unbound>
                 <span @ref="@context.Current" class="action">
                     <Icon Type="question-circle" Theme="outline" />
diff --git a/src/AntDesign.Pro/Pages/Account/Center/Components/Applications/Applications.razor b/src/AntDesign.Pro/Pages/Account/Center/Components/Applications/Applications.razor
@@ -4,7 +4,7 @@
          Class="filterCardList"
          Grid="_listGridType"
          DataSource="List">
-    <ListItem NoFlex Grid="_listGridType">
+    <ListItem NoFlex>
         <Card Bordered
               Hoverable
               BodyStyle="padding-bottom: 20px;"
diff --git a/src/AntDesign.Pro/Pages/Account/Center/Components/Projects/Projects.razor b/src/AntDesign.Pro/Pages/Account/Center/Components/Projects/Projects.razor
@@ -5,7 +5,7 @@
     Class="coverCardList"
     Grid="_listGridType"
     DataSource="List">
-    <ListItem NoFlex Grid="_listGridType">
+    <ListItem NoFlex">
         <Card Class="card" Hoverable Bordered>
             <Cover>
                 <img alt="@context.Title" src="@context.Cover"/>
diff --git a/src/AntDesign.Pro/Pages/List/CardList/CardList.razor b/src/AntDesign.Pro/Pages/List/CardList/CardList.razor
@@ -43,7 +43,7 @@
                      DataSource="_data"
                      ItemLayout="ListItemLayout.Horizontal"
                      Grid="_listGridType">
-                <ListItem NoFlex Grid="_listGridType">
+                <ListItem NoFlex>
                     @if (string.IsNullOrEmpty(context.Id)) {
                         <Button Type="dashed" class="newButton">
                             <Icon Type="plus" Theme="outline" /> Add Product
diff --git a/src/AntDesign.Pro/Pages/List/Search/Applications/Applications.razor b/src/AntDesign.Pro/Pages/List/Search/Applications/Applications.razor
@@ -61,7 +61,7 @@
     <AntList TItem="ListItemDataType"
              Grid="_listGridType"
              DataSource="_fakeList">
-        <ListItem NoFlex Grid="_listGridType">
+        <ListItem NoFlex>
             <Card Hoverable
                   BodyStyle="padding-bottom: 20px;"
                   Actions="Actions">
diff --git a/src/AntDesign.Pro/Pages/List/Search/Applications/Components/TagSelect/TagSelect.razor b/src/AntDesign.Pro/Pages/List/Search/Applications/Components/TagSelect/TagSelect.razor
@@ -4,7 +4,7 @@
 <div class="@ClassMapper.Class" style="@Style">
     @if (!HideCheckAll)
     {
-        <Tag Checkable Checked="_checkedAll" CheckedChange="HandleCheckedChange">@SelectAllText</Tag>
+        <Tag Checkable Checked="_checkedAll" CheckedChanged="HandleCheckedChange">@SelectAllText</Tag>
     }
     
     <CascadingValue Value="this">
diff --git a/src/AntDesign.Pro/Pages/List/Search/Applications/Components/TagSelect/TagSelectOption.razor b/src/AntDesign.Pro/Pages/List/Search/Applications/Components/TagSelect/TagSelectOption.razor
@@ -1,4 +1,4 @@
 @namespace AntDesign.Pro.Template.Pages.List
 @inherits AntDomComponentBase
 
-<Tag Checkable Checked="@Checked" CheckedChange="HandleCheckedChange">@ChildContent</Tag>
+<Tag Checkable Checked="@Checked" CheckedChanged="HandleCheckedChange">@ChildContent</Tag>
diff --git a/src/AntDesign.Pro/Pages/List/Search/Projects/Projects.razor b/src/AntDesign.Pro/Pages/List/Search/Projects/Projects.razor
@@ -61,7 +61,7 @@
         <AntList TItem="ListItemDataType"
                  Grid="_listGridType"
                  DataSource="_fakeList">
-            <ListItem NoFlex Grid="_listGridType">
+            <ListItem NoFlex>
                 <Card Class="card" Hoverable Bordered>
                     <Cover>
                         <img alt="@context.Title" src="@context.Cover" />
diff --git a/src/AntDesign.Pro/Pages/Profile/Advanced/Advanced.razor b/src/AntDesign.Pro/Pages/Profile/Advanced/Advanced.razor
@@ -15,7 +15,7 @@
         <ButtonGroup>
             <Button>Operation 1</Button>
             <Button>Operation 2</Button>
-            <Dropdown Placement="@PlacementType.BottomRight">
+            <Dropdown Placement="@Placement.BottomRight">
                 <Overlay>
                     <Menu>
                         <MenuItem Key="1">Option One</MenuItem>
diff --git a/src/AntDesign.Pro/Pages/User/Login/Login.razor b/src/AntDesign.Pro/Pages/User/Login/Login.razor
@@ -49,9 +49,9 @@
             <Button Type="primary" HtmlType="submit" Class="submit" Size="large" Block>Log in </Button>
             <div class="other">
                 Other Login Methods
-                <Icon Type="alipay-circle" />
-                <Icon Type="taobao-circle" />
-                <Icon Type="weibo-circle" />
+                <Icon Class="icon" Type="alipay-circle" />
+                <Icon Class="icon" Type="taobao-circle" />
+                <Icon Class="icon" Type="weibo-circle" />
                 <a class="register" href="/user/register">Register Account</a>
             </div>
         </Form>
diff --git a/src/AntDesign.Pro/Pages/User/Login/Login.razor.less b/src/AntDesign.Pro/Pages/User/Login/Login.razor.less
@@ -1,7 +1,7 @@
 ﻿@import '~antd/es/style/themes/default.less';
 
 /*此处为了解决样式冲突, 在pro样式的基础上包了一层main, 原始样式从.login开始*/
-.main__b__0 {
+.main__b__0 ::deep {
   width: 368px;
   margin: 0 auto;
   @media screen and (max-width: @screen-sm) {
@@ -10,7 +10,7 @@
 
   .login {
     :global {
-      .ant-tabs .ant-tabs-bar {
+      .ant-tabs .ant-tabs-nav {
         margin-bottom: 24px;
         text-align: center;
         border-bottom: 0;

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,9 @@`
`208`	`208`	`{`
`209`	`209`	`"condition": "(full)",`
`210`	`210`	`"exclude": [`
`211`		`- "Pages/*/"`
	`211`	`+ "Pages/Welcome.razor",`
	`212`	`+ "Pages/Welcome.razor.less",`
	`213`	`+ "Pages/Welcome.razor.css",`
`212`	`214`	`]`
`213`	`215`	`},`
`214`	`216`	`{`