leftyer/MASA.Blazor
1
0
Fork 0
mirror of https://gitee.com/blazorcomponent/MASA.Blazor.git synced 2025-12-06 10:19:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

🔧 chore(docs): use net9 as the target framework (#2240)

Browse Source
This commit is contained in:
capdiem
2024-11-14 11:21:09 +08:00
committed by GitHub
parent cb7bb22803
commit d2bd0252bb
8 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -29,8 +29,6 @@ jobs:
include-prerelease: true
- name: setting tools
run: dotnet workload install wasm-tools
- name: setting tools for net8
run: dotnet workload install wasm-tools-net8
- name: check tools
run: dotnet workload list
- name: build

5
.github/workflows/wasm-prd.yml vendored
View File

@@ -27,13 +27,14 @@ jobs:
6.0.x
7.0.x
8.0.402
9.0.x
include-prerelease: true
- name: setting tools
run: dotnet workload install wasm-tools
- name: build
run: dotnet build Masa.Blazor.Docs.sln
- name: publish
run: dotnet publish docs/Masa.Docs.WebAssembly/Masa.Docs.WebAssembly.csproj -c Release -f net8.0
run: dotnet publish docs/Masa.Docs.WebAssembly/Masa.Docs.WebAssembly.csproj -c Release -f net9.0
- name: setup python
uses: actions/setup-python@v4
with:
@@ -49,7 +50,7 @@ jobs:
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/docs/Masa.Docs.WebAssembly/bin/Release/net8.0/publish/wwwroot/ oss://masa-blazor-wasm-v1/
run: ossutil cp -rf /home/runner/work/MASA.Blazor/MASA.Blazor/docs/Masa.Docs.WebAssembly/bin/Release/net9.0/publish/wwwroot/ oss://masa-blazor-wasm-v1/
- name: run index-create tools
env:
MASA_DOC_DOMAIN: "/"

10
docs/Masa.Blazor.Docs/Masa.Blazor.Docs.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
@@ -12,10 +12,10 @@
<ItemGroup>
<PackageReference Include="Masa.Blazor.Extensions.Languages.Razor" Version="0.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.CustomElements" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.CustomElements" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

10
docs/Masa.Docs.Core/Masa.Docs.Core.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>
@@ -12,11 +12,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.CustomElements" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.CustomElements" Version="9.0.0" />
<PackageReference Include="YamlDotNet" Version="12.0.2" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageReference Include="Octokit" Version="8.1.1" />
</ItemGroup>

2
docs/Masa.Docs.Server/Masa.Docs.Server.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>

4
docs/Masa.Docs.Shared/Masa.Docs.Shared.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
@@ -11,7 +11,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
</ItemGroup>
<ItemGroup>

14
docs/Masa.Docs.WebAssembly/Masa.Docs.WebAssembly.csproj
View File

@@ -1,17 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<!-- <TargetFrameworks>net8.0;net9.0</TargetFrameworks>-->
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
</ItemGroup>
<!-- <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">-->
<!-- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-rc.2.*" />-->
<!-- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-rc.2.*" PrivateAssets="all" />-->
<!-- </ItemGroup>-->
<ItemGroup>
<BlazorWebAssemblyLazyLoad Include="SkiaSharp.wasm" />
<BlazorWebAssemblyLazyLoad Include="SkiaSharp.Views.Blazor.wasm" />

2
scirpts/sitemapgenerate.py
View File

@@ -42,7 +42,7 @@ def create_robots(filename, domain, robotSet=None):
base_dir = os.path.join(
os.getcwd(), r'docs/Masa.Docs.WebAssembly/bin/Release/net8.0/publish/wwwroot')
os.getcwd(), r'docs/Masa.Docs.WebAssembly/bin/Release/net9.0/publish/wwwroot')
#base_dir = r"D:\Source\Stack\src\MASA.Blazor\docs\Masa.Docs.WebAssembly\bin\Release\net7.0\publish\wwwroot"
print(base_dir)