feat(FontAweseom): upgrade to 6.4.2 (#2098)

* chore: 更新工具链配置

* chore: 移除 MAUI 工程

* chore: 更新到 6.4.2

* chore: 增加 scss 工具链

* chore: bump version 7.5.0

* refactor: 更改配置文件名

* chore: 更新打包工具链配置文件名

* chore: bump version 7.4.0

* chore: 关闭预览版 sdk 提示

* chore: 更新依赖
This commit is contained in:
Argo Zhang 2023-09-08 10:22:09 +08:00 committed by GitHub
parent a7e7aa64be
commit 79233ee59a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 43 additions and 35 deletions

View File

@ -130,10 +130,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.DataAccess.
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.DataAccess.PetaPoco", "src\Extensions\DataServices\BootstrapBlazor.DataAccess.PetaPoco\BootstrapBlazor.DataAccess.PetaPoco.csproj", "{8F189E6D-EC14-479F-8411-B5D967229D78}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.DataAccess.PetaPoco", "src\Extensions\DataServices\BootstrapBlazor.DataAccess.PetaPoco\BootstrapBlazor.DataAccess.PetaPoco.csproj", "{8F189E6D-EC14-479F-8411-B5D967229D78}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "maui", "maui", "{C42EFBEF-7038-4D53-B8BA-998D6889AD5F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.Maui", "src\maui\BootstrapBlazor.Maui\BootstrapBlazor.Maui.csproj", "{28DA0B9C-11A0-4144-A909-D95BDAD7787D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UniTest.Sass", "test\UniTest.Sass\UniTest.Sass.csproj", "{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UniTest.Sass", "test\UniTest.Sass\UniTest.Sass.csproj", "{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.Splitting", "src\Extensions\Components\BootstrapBlazor.Splitting\BootstrapBlazor.Splitting.csproj", "{568237B9-209E-49B1-9BCF-E853F2D61442}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.Splitting", "src\Extensions\Components\BootstrapBlazor.Splitting\BootstrapBlazor.Splitting.csproj", "{568237B9-209E-49B1-9BCF-E853F2D61442}"
@ -272,12 +268,6 @@ Global
{8F189E6D-EC14-479F-8411-B5D967229D78}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F189E6D-EC14-479F-8411-B5D967229D78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8F189E6D-EC14-479F-8411-B5D967229D78}.Release|Any CPU.ActiveCfg = Release|Any CPU {8F189E6D-EC14-479F-8411-B5D967229D78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8F189E6D-EC14-479F-8411-B5D967229D78}.Release|Any CPU.Build.0 = Release|Any CPU {8F189E6D-EC14-479F-8411-B5D967229D78}.Release|Any CPU.Build.0 = Release|Any CPU
{28DA0B9C-11A0-4144-A909-D95BDAD7787D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28DA0B9C-11A0-4144-A909-D95BDAD7787D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28DA0B9C-11A0-4144-A909-D95BDAD7787D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{28DA0B9C-11A0-4144-A909-D95BDAD7787D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28DA0B9C-11A0-4144-A909-D95BDAD7787D}.Release|Any CPU.Build.0 = Release|Any CPU
{28DA0B9C-11A0-4144-A909-D95BDAD7787D}.Release|Any CPU.Deploy.0 = Release|Any CPU
{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -331,8 +321,6 @@ Global
{45AD6614-EA04-46E0-B71C-2B12D5F326FE} = {56FEFF09-85FC-408D-A397-6E264E68414E} {45AD6614-EA04-46E0-B71C-2B12D5F326FE} = {56FEFF09-85FC-408D-A397-6E264E68414E}
{DC144D99-C0A9-41CC-92A6-034D7E1E0363} = {56FEFF09-85FC-408D-A397-6E264E68414E} {DC144D99-C0A9-41CC-92A6-034D7E1E0363} = {56FEFF09-85FC-408D-A397-6E264E68414E}
{8F189E6D-EC14-479F-8411-B5D967229D78} = {56FEFF09-85FC-408D-A397-6E264E68414E} {8F189E6D-EC14-479F-8411-B5D967229D78} = {56FEFF09-85FC-408D-A397-6E264E68414E}
{C42EFBEF-7038-4D53-B8BA-998D6889AD5F} = {A2182155-43ED-44C1-BF6F-1B70EBD2DFFE}
{28DA0B9C-11A0-4144-A909-D95BDAD7787D} = {C42EFBEF-7038-4D53-B8BA-998D6889AD5F}
{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD} {D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD}
{568237B9-209E-49B1-9BCF-E853F2D61442} = {CD062AB6-244D-402A-8F33-C37DAC5856CC} {568237B9-209E-49B1-9BCF-E853F2D61442} = {CD062AB6-244D-402A-8F33-C37DAC5856CC}
EndGlobalSection EndGlobalSection

View File

@ -14,6 +14,7 @@
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio> <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@ -13,6 +13,7 @@ dbcell
listview listview
mixin mixin
wwwroot wwwroot
powerpoint
readonly readonly
scss scss
tablist tablist

View File

@ -33,12 +33,12 @@
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="7.2.1" /> <PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="7.2.1" />
<PackageReference Include="BootstrapBlazor.Dock" Version="7.0.11" /> <PackageReference Include="BootstrapBlazor.Dock" Version="7.0.11" />
<PackageReference Include="BootstrapBlazor.FileViewer" Version="7.0.3" /> <PackageReference Include="BootstrapBlazor.FileViewer" Version="7.0.3" />
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="7.4.2" /> <PackageReference Include="BootstrapBlazor.FontAwesome" Version="7.5.0" />
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="7.2.0" /> <PackageReference Include="BootstrapBlazor.Html2Pdf" Version="7.2.0" />
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="7.0.1" /> <PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="7.0.1" />
<PackageReference Include="BootstrapBlazor.Markdown" Version="7.2.1" /> <PackageReference Include="BootstrapBlazor.Markdown" Version="7.2.1" />
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="7.0.0" /> <PackageReference Include="BootstrapBlazor.MaterialDesign" Version="7.0.0" />
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="7.3.2" /> <PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="7.4.0" />
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="7.0.1" /> <PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="7.0.1" />
<PackageReference Include="BootstrapBlazor.PdfReader" Version="7.2.0" /> <PackageReference Include="BootstrapBlazor.PdfReader" Version="7.2.0" />
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="7.0.3" /> <PackageReference Include="BootstrapBlazor.SignaturePad" Version="7.0.3" />

View File

@ -3,7 +3,8 @@
<Import Project="..\Directory.Build.props" /> <Import Project="..\Directory.Build.props" />
<Import Project="..\Frameworks.props" /> <Import Project="..\Frameworks.props" />
<Import Project="..\Logo.props" /> <Import Project="..\Logo.props" />
<Import Project="..\bundleconfig.props" /> <Import Project="..\Bundle.props" />
<Import Project="..\WebCompiler.props" />
<Import Project="..\SourceLink.targets" /> <Import Project="..\SourceLink.targets" />
<Import Project="..\Version.targets" /> <Import Project="..\Version.targets" />

7
src/Bundle.props Normal file
View File

@ -0,0 +1,7 @@
<Project>
<ItemGroup>
<PackageReference Include="BuildBundlerMinifierPlus2022" Version="5.2.2" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == 'net6.0'" />
</ItemGroup>
</Project>

View File

@ -11,7 +11,6 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<NoWarn>NETSDK1138</NoWarn> <NoWarn>NETSDK1138</NoWarn>
</PropertyGroup> </PropertyGroup>

View File

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="..\..\..\bundleconfig.props" /> <Import Project="..\..\..\Bundle.props" />
<PropertyGroup> <PropertyGroup>
<Version>7.4.2</Version> <Version>7.5.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -22,7 +22,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.0.0" /> <PackageReference Include="BootstrapBlazor" Version="7.10.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
/*! /*!
* Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com * Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */
@ -6550,6 +6550,9 @@ readers do not read off random characters that represent icons */
.fa-edge:before { .fa-edge:before {
content: "\f282"; } content: "\f282"; }
.fa-threads:before {
content: "\e618"; }
.fa-napster:before { .fa-napster:before {
content: "\f3d2"; } content: "\f3d2"; }
@ -6718,6 +6721,9 @@ readers do not read off random characters that represent icons */
.fa-scribd:before { .fa-scribd:before {
content: "\f28a"; } content: "\f28a"; }
.fa-debian:before {
content: "\e60b"; }
.fa-openid:before { .fa-openid:before {
content: "\f19b"; } content: "\f19b"; }
@ -6958,6 +6964,9 @@ readers do not read off random characters that represent icons */
.fa-neos:before { .fa-neos:before {
content: "\f612"; } content: "\f612"; }
.fa-square-threads:before {
content: "\e619"; }
.fa-hackerrank:before { .fa-hackerrank:before {
content: "\f5f7"; } content: "\f5f7"; }
@ -7300,6 +7309,9 @@ readers do not read off random characters that represent icons */
.fa-erlang:before { .fa-erlang:before {
content: "\f39d"; } content: "\f39d"; }
.fa-x-twitter:before {
content: "\e61b"; }
.fa-cotton-bureau:before { .fa-cotton-bureau:before {
content: "\f89e"; } content: "\f89e"; }
@ -7795,6 +7807,9 @@ readers do not read off random characters that represent icons */
.fa-quora:before { .fa-quora:before {
content: "\f2c4"; } content: "\f2c4"; }
.fa-square-x-twitter:before {
content: "\e61a"; }
.fa-reacteurope:before { .fa-reacteurope:before {
content: "\f75d"; } content: "\f75d"; }

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="..\..\..\bundleconfig.props" /> <Import Project="..\..\..\Bundle.props" />
<PropertyGroup> <PropertyGroup>
<Version>7.2.1</Version> <Version>7.2.1</Version>

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup> <PropertyGroup>
<Version>7.3.2</Version> <Version>7.4.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -11,7 +11,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.8.0" /> <PackageReference Include="BootstrapBlazor" Version="7.10.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="..\..\..\bundleconfig.props" /> <Import Project="..\..\..\Bundle.props" />
<PropertyGroup> <PropertyGroup>
<Version>7.0.0</Version> <Version>7.0.0</Version>
@ -26,5 +26,5 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.0.0" /> <PackageReference Include="BootstrapBlazor" Version="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="..\..\..\bundleconfig.props" /> <Import Project="..\..\..\Bundle.props" />
<PropertyGroup> <PropertyGroup>
<Version>7.3.4</Version> <Version>7.3.4</Version>

View File

@ -1,11 +1,7 @@
<Project> <Project>
<ItemGroup>
<PackageReference Include="BuildBundlerMinifierPlus2022" Version="5.2.2" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == 'net6.0'" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BuildWebCompiler2022" Version="1.14.10" Condition="'$(Configuration)' == 'Debug' and '$(OS)' == 'Windows_NT' and '$(TargetFramework)' == 'net6.0'" /> <PackageReference Include="BuildWebCompiler2022" Version="1.14.10" Condition="'$(Configuration)' == 'Debug' and '$(OS)' == 'Windows_NT' and '$(TargetFramework)' == 'net6.0'" />
</ItemGroup> </ItemGroup>
</Project> </Project>