Skip to content

Commit

Permalink
merge code
Browse files Browse the repository at this point in the history
  • Loading branch information
LONSID\guohao committed Mar 23, 2023
2 parents 5157707 + 43179a0 commit fa42bd0
Show file tree
Hide file tree
Showing 340 changed files with 7,781 additions and 3,911 deletions.

This file was deleted.

12 changes: 12 additions & 0 deletions .github/workflows/wasm-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ jobs:
run: dotnet build Masa.Blazor.Docs.sln
- name: publish
run: dotnet publish docs/Masa.Docs.WebAssembly/Masa.Docs.WebAssembly.csproj -c Release
- name: setup python
uses: actions/setup-python@v4
with:
python-version: '3.10' # install the python version needed
# - name: install python packages
# run: |
# python -m pip install --upgrade pip
# pip install -r scirpts/requirements.txt
- name: execute py script # run sitemapgenerate.py
env:
DOC_DOMAIN: "https://blazor.masastack.com"
run: python scirpts/sitemapgenerate.py
- name: setup oss
uses: manyuanrong/[email protected]
with:
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/wasm-prd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: deploy-wasm-prd
on:
release:
types: [ created ]
push:
branches:
- main
paths:
- docs/MASA.Docs*/**
workflow_dispatch:

jobs:
Expand All @@ -27,6 +32,14 @@ jobs:
run: dotnet build Masa.Blazor.Docs.sln
- name: publish
run: dotnet publish docs/Masa.Docs.WebAssembly/Masa.Docs.WebAssembly.csproj -c Release
- name: setup python
uses: actions/setup-python@v4
with:
python-version: '3.10' # install the python version needed
- name: execute py script # run sitemapgenerate.py
env:
DOC_DOMAIN: "https://blazor.masastack.com"
run: python scirpts/sitemapgenerate.py
- name: setup oss
uses: manyuanrong/[email protected]
with:
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/wasm-try.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: deploy-wasm-try

on:
push:
branches:
- main
paths:
- src/Masa.Try.Shared/**
- src/Masa.Try.WebAssembly/**
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: git pull
uses: actions/checkout@v3
with:
submodules: 'recursive'
- run: git submodule foreach git checkout main
- name: setting dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
6.0.x
7.0.x
include-prerelease: true
- name: setting tools
run: dotnet workload install wasm-tools
- name: build
run: dotnet build Masa.Try.sln
- name: publish
run: dotnet publish src/Masa.Try.WebAssembly/Masa.Try.WebAssembly.csproj -c Release
- name: setup oss
uses: manyuanrong/[email protected]
with:
endpoint: "oss-cn-hangzhou.aliyuncs.com"
access-key-id: ${{ secrets.ACCESS_KEY_ID }}
access-key-secret: ${{ secrets.ACCESS_KEY_SECRET }}
- name: deploy oss
run: ossutil cp -rf /home/runner/work/MASA.Blazor/MASA.Blazor/src/Masa.Try.WebAssembly/bin/Release/net7.0/publish/wwwroot/ oss://masa-try/
39 changes: 21 additions & 18 deletions Masa.Blazor.Docs.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorComponent", "src\BlazorComponent\src\Component\BlazorComponent\BlazorComponent.csproj", "{E44B505E-644E-4399-AAD5-F7726AEA86F9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorComponent", "src\BlazorComponent\src\Component\BlazorComponent\BlazorComponent.csproj", "{E44B505E-644E-4399-AAD5-F7726AEA86F9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Blazor", "src\Masa.Blazor\Masa.Blazor.csproj", "{961D5CBE-393B-4C65-B82D-4BA7F9433295}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Blazor", "src\Masa.Blazor\Masa.Blazor.csproj", "{961D5CBE-393B-4C65-B82D-4BA7F9433295}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Docs.Shared", "docs\Masa.Docs.Shared\Masa.Docs.Shared.csproj", "{7C0A9B3A-ACF3-4742-84EA-7E6F987826E6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Docs.Shared", "docs\Masa.Docs.Shared\Masa.Docs.Shared.csproj", "{7C0A9B3A-ACF3-4742-84EA-7E6F987826E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Framework.Docs", "docs\MASA.Docs\src\Masa.Framework.Docs\Masa.Framework.Docs.csproj", "{C72FA11E-E756-4475-8C82-82A6BCF6ACA0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Framework.Docs", "docs\MASA.Docs\src\Masa.Framework.Docs\Masa.Framework.Docs.csproj", "{C72FA11E-E756-4475-8C82-82A6BCF6ACA0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Stack.Docs", "docs\MASA.Docs\src\Masa.Stack.Docs\Masa.Stack.Docs.csproj", "{619FCF67-9C64-4B28-80FC-F8E48EB863A3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Stack.Docs", "docs\MASA.Docs\src\Masa.Stack.Docs\Masa.Stack.Docs.csproj", "{619FCF67-9C64-4B28-80FC-F8E48EB863A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Blazor.Docs", "docs\Masa.Blazor.Docs\Masa.Blazor.Docs.csproj", "{7F29908E-BACF-4E53-B621-D7F4052992BB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Blazor.Docs", "docs\Masa.Blazor.Docs\Masa.Blazor.Docs.csproj", "{7F29908E-BACF-4E53-B621-D7F4052992BB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Docs.Core", "docs\Masa.Docs.Core\Masa.Docs.Core.csproj", "{90156980-2229-48E8-8CF8-1D09E99F0025}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Docs.Core", "docs\Masa.Docs.Core\Masa.Docs.Core.csproj", "{90156980-2229-48E8-8CF8-1D09E99F0025}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Docs.Server", "docs\Masa.Docs.Server\Masa.Docs.Server.csproj", "{C1BED814-051F-4083-BA97-EA78BBA4AC07}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Docs.Server", "docs\Masa.Docs.Server\Masa.Docs.Server.csproj", "{C1BED814-051F-4083-BA97-EA78BBA4AC07}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Docs.WebAssembly", "docs\Masa.Docs.WebAssembly\Masa.Docs.WebAssembly.csproj", "{2A74E4DF-147A-4C20-95DA-465F796E5AFD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Docs.WebAssembly", "docs\Masa.Docs.WebAssembly\Masa.Docs.WebAssembly.csproj", "{2A74E4DF-147A-4C20-95DA-465F796E5AFD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1 - Component", "1 - Component", "{CC0C651C-DD30-4DAD-872E-8AC484B712E5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Product Docs", "Product Docs", "{D33F490D-1A15-44E0-BA04-291BAE3389EF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGenerator", "ApiGenerator", "{054B3CBA-328F-486A-8646-D398F604517F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Blazor.SourceGenerator.Docs.ApiGenerator", "src\Masa.Blazor.SourceGenerator.Docs.ApiGenerator\Masa.Blazor.SourceGenerator.Docs.ApiGenerator.csproj", "{B98B2C2E-107F-4C78-B642-113C7A37F882}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Blazor.SourceGenerator.Docs.ApiGenerator", "src\Masa.Blazor.SourceGenerator.Docs.ApiGenerator\Masa.Blazor.SourceGenerator.Docs.ApiGenerator.csproj", "{B98B2C2E-107F-4C78-B642-113C7A37F882}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 - Docs", "2 - Docs", "{3A19290D-DC10-4317-89B2-2B7CD1FD4723}"
EndProject
Expand All @@ -36,9 +36,6 @@ Global
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E44B505E-644E-4399-AAD5-F7726AEA86F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E44B505E-644E-4399-AAD5-F7726AEA86F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand Down Expand Up @@ -81,18 +78,24 @@ Global
{B98B2C2E-107F-4C78-B642-113C7A37F882}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B98B2C2E-107F-4C78-B642-113C7A37F882}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E44B505E-644E-4399-AAD5-F7726AEA86F9} = {CC0C651C-DD30-4DAD-872E-8AC484B712E5}
{961D5CBE-393B-4C65-B82D-4BA7F9433295} = {CC0C651C-DD30-4DAD-872E-8AC484B712E5}
{7F29908E-BACF-4E53-B621-D7F4052992BB} = {D33F490D-1A15-44E0-BA04-291BAE3389EF}
{7C0A9B3A-ACF3-4742-84EA-7E6F987826E6} = {3A19290D-DC10-4317-89B2-2B7CD1FD4723}
{C72FA11E-E756-4475-8C82-82A6BCF6ACA0} = {D33F490D-1A15-44E0-BA04-291BAE3389EF}
{619FCF67-9C64-4B28-80FC-F8E48EB863A3} = {D33F490D-1A15-44E0-BA04-291BAE3389EF}
{B98B2C2E-107F-4C78-B642-113C7A37F882} = {054B3CBA-328F-486A-8646-D398F604517F}
{054B3CBA-328F-486A-8646-D398F604517F} = {3A19290D-DC10-4317-89B2-2B7CD1FD4723}
{D33F490D-1A15-44E0-BA04-291BAE3389EF} = {3A19290D-DC10-4317-89B2-2B7CD1FD4723}
{7F29908E-BACF-4E53-B621-D7F4052992BB} = {D33F490D-1A15-44E0-BA04-291BAE3389EF}
{90156980-2229-48E8-8CF8-1D09E99F0025} = {3A19290D-DC10-4317-89B2-2B7CD1FD4723}
{C1BED814-051F-4083-BA97-EA78BBA4AC07} = {3A19290D-DC10-4317-89B2-2B7CD1FD4723}
{7C0A9B3A-ACF3-4742-84EA-7E6F987826E6} = {3A19290D-DC10-4317-89B2-2B7CD1FD4723}
{2A74E4DF-147A-4C20-95DA-465F796E5AFD} = {3A19290D-DC10-4317-89B2-2B7CD1FD4723}
{D33F490D-1A15-44E0-BA04-291BAE3389EF} = {3A19290D-DC10-4317-89B2-2B7CD1FD4723}
{054B3CBA-328F-486A-8646-D398F604517F} = {3A19290D-DC10-4317-89B2-2B7CD1FD4723}
{B98B2C2E-107F-4C78-B642-113C7A37F882} = {054B3CBA-328F-486A-8646-D398F604517F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0CFE01E0-B558-4BBE-A263-09FF0BC81EF0}
EndGlobalSection
EndGlobal
24 changes: 24 additions & 0 deletions Masa.Blazor.sln
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
.github\workflows\pr-docs-next.yml = .github\workflows\pr-docs-next.yml
.github\workflows\wasm-dev.yml = .github\workflows\wasm-dev.yml
.github\workflows\wasm-prd.yml = .github\workflows\wasm-prd.yml
.github\workflows\wasm-try.yml = .github\workflows\wasm-try.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{4234D98C-4DCA-404D-AE9D-EB9DC91FC8DC}"
Expand All @@ -73,6 +74,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Docs.Server", "docs\Ma
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Docs.WebAssembly", "docs\Masa.Docs.WebAssembly\Masa.Docs.WebAssembly.csproj", "{205A7827-829B-4A35-9796-48F5705499FB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5 - Try", "5 - Try", "{CBCF9CD0-AB20-4747-B841-DE9BB197EE28}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Try.Server", "src\Masa.Try.Server\Masa.Try.Server.csproj", "{B8AC9708-3DDC-4523-BCE3-656E37301B21}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Try.Shared", "src\Masa.Try.Shared\Masa.Try.Shared.csproj", "{2CC061F3-6E19-4B8F-91F3-3640B9EEE908}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Try.WebAssembly", "src\Masa.Try.WebAssembly\Masa.Try.WebAssembly.csproj", "{5D90677E-3422-4CB2-A006-288880B3A010}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -127,6 +136,18 @@ Global
{205A7827-829B-4A35-9796-48F5705499FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{205A7827-829B-4A35-9796-48F5705499FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{205A7827-829B-4A35-9796-48F5705499FB}.Release|Any CPU.Build.0 = Release|Any CPU
{B8AC9708-3DDC-4523-BCE3-656E37301B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8AC9708-3DDC-4523-BCE3-656E37301B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8AC9708-3DDC-4523-BCE3-656E37301B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8AC9708-3DDC-4523-BCE3-656E37301B21}.Release|Any CPU.Build.0 = Release|Any CPU
{2CC061F3-6E19-4B8F-91F3-3640B9EEE908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2CC061F3-6E19-4B8F-91F3-3640B9EEE908}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2CC061F3-6E19-4B8F-91F3-3640B9EEE908}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2CC061F3-6E19-4B8F-91F3-3640B9EEE908}.Release|Any CPU.Build.0 = Release|Any CPU
{5D90677E-3422-4CB2-A006-288880B3A010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D90677E-3422-4CB2-A006-288880B3A010}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D90677E-3422-4CB2-A006-288880B3A010}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D90677E-3422-4CB2-A006-288880B3A010}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -149,6 +170,9 @@ Global
{DEFB408C-5D0E-437F-9FAC-508BBDE255A7} = {6D52B20D-5559-4E10-8386-4B6AD391A6A1}
{4C9C8096-1803-4DA4-B37F-976B76D9F6AC} = {6D52B20D-5559-4E10-8386-4B6AD391A6A1}
{205A7827-829B-4A35-9796-48F5705499FB} = {6D52B20D-5559-4E10-8386-4B6AD391A6A1}
{B8AC9708-3DDC-4523-BCE3-656E37301B21} = {CBCF9CD0-AB20-4747-B841-DE9BB197EE28}
{2CC061F3-6E19-4B8F-91F3-3640B9EEE908} = {CBCF9CD0-AB20-4747-B841-DE9BB197EE28}
{5D90677E-3422-4CB2-A006-288880B3A010} = {CBCF9CD0-AB20-4747-B841-DE9BB197EE28}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9F25C776-A200-4DEB-8F8B-9D1FA2CDC740}
Expand Down
53 changes: 53 additions & 0 deletions Masa.Try.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33417.168
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Try", "Try", "{1487F7CB-2A53-4ACA-BCCD-873E5008E43B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Try.Shared", "src\Masa.Try.Shared\Masa.Try.Shared.csproj", "{19DB3BAF-0812-418C-8178-C8C79F986577}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Try.WebAssembly", "src\Masa.Try.WebAssembly\Masa.Try.WebAssembly.csproj", "{9993EFC9-8D75-4640-954F-57F35EEDF595}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Blazor", "src\Masa.Blazor\Masa.Blazor.csproj", "{0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Component", "Component", "{E9DCD167-6407-4BD1-B336-25DA1D0E5BAC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Try.Server", "src\Masa.Try.Server\Masa.Try.Server.csproj", "{9B49C042-76F9-4B78-85E7-A9DAE499A8CD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{19DB3BAF-0812-418C-8178-C8C79F986577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19DB3BAF-0812-418C-8178-C8C79F986577}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19DB3BAF-0812-418C-8178-C8C79F986577}.Release|Any CPU.ActiveCfg = Release|Any CPU
{19DB3BAF-0812-418C-8178-C8C79F986577}.Release|Any CPU.Build.0 = Release|Any CPU
{9993EFC9-8D75-4640-954F-57F35EEDF595}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9993EFC9-8D75-4640-954F-57F35EEDF595}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9993EFC9-8D75-4640-954F-57F35EEDF595}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9993EFC9-8D75-4640-954F-57F35EEDF595}.Release|Any CPU.Build.0 = Release|Any CPU
{0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}.Release|Any CPU.Build.0 = Release|Any CPU
{9B49C042-76F9-4B78-85E7-A9DAE499A8CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B49C042-76F9-4B78-85E7-A9DAE499A8CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B49C042-76F9-4B78-85E7-A9DAE499A8CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9B49C042-76F9-4B78-85E7-A9DAE499A8CD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{19DB3BAF-0812-418C-8178-C8C79F986577} = {1487F7CB-2A53-4ACA-BCCD-873E5008E43B}
{9993EFC9-8D75-4640-954F-57F35EEDF595} = {1487F7CB-2A53-4ACA-BCCD-873E5008E43B}
{0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD} = {E9DCD167-6407-4BD1-B336-25DA1D0E5BAC}
{9B49C042-76F9-4B78-85E7-A9DAE499A8CD} = {1487F7CB-2A53-4ACA-BCCD-873E5008E43B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B916CE94-77DB-4DC7-868C-BBE373D4BEEB}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ services.AddMasaBlazor();
<!--Style-->
<link href="_content/Masa.Blazor/css/masa-blazor.min.css" rel="stylesheet">
<!--Font-->
<link href="https://cdn.jsdelivr.net/npm/@("@mdi")/font@5.x/css/materialdesignicons.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/@("@mdi")/font@7.1.96/css/materialdesignicons.min.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Material+Icons" rel="stylesheet">
<link href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" rel="stylesheet">
</head>
Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ services.AddMasaBlazor();
<!--Style-->
<link href="_content/Masa.Blazor/css/masa-blazor.min.css" rel="stylesheet">
<!--Font-->
<link href="https://cdn.masastack.com/npm/@("@mdi")/font@5.x/css/materialdesignicons.min.css" rel="stylesheet">
<link href="https://cdn.masastack.com/npm/@("@mdi")/font@7.1.96/css/materialdesignicons.min.css" rel="stylesheet">
<link href="https://cdn.masastack.com/npm/materialicons/materialicons.css" rel="stylesheet">
<link href="https://cdn.masastack.com/npm/fontawesome/v5.0.13/css/all.css" rel="stylesheet">
</head>
Expand Down
Loading

0 comments on commit fa42bd0

Please sign in to comment.