feat: update to .net 10. (#20)

Use ClientAssets to build tailwind styles. Make blog anchors not open new tab. Reviewed-on: #20
2026-01-04 01:04:00 +08:00
parent 58ba4b2a2f
commit 56374a4e6b
22 changed files with 133 additions and 107 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -18,7 +18,7 @@ jobs:
      - name: Build docker image.
        run: |
          proxy
-          podman pull mcr.microsoft.com/dotnet/aspnet:9.0
+          podman pull mcr.microsoft.com/dotnet/aspnet:10.0
          unproxy
          cd YaeBlog
          podman build . -t ccr.ccs.tencentyun.com/jackfiled/blog --build-arg COMMIT_ID=$(git rev-parse --short=10 HEAD)
--- a/YaeBlog/Components/App.razor
+++ b/YaeBlog/Components/App.razor
@@ -5,16 +5,33 @@
    <meta charset="utf-8"/>
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <base href="/"/>
-    <link rel="stylesheet" href="YaeBlog.styles.css"/>
-    <link rel="icon" href="images/favicon.ico"/>
-    <link rel="stylesheet" href="globals.css"/>
-    <link rel="stylesheet" href="tailwind.g.css"/>
+    <link rel="stylesheet" href="@Assets["YaeBlog.styles.css"]"/>
+    <link rel="icon" href="@Assets["images/favicon.ico"]"/>
+    <link rel="stylesheet" href="@Assets["tailwind.g.css"]"/>
+    <style>
+        @@font-face {
+            font-family: "Font Awesome 6 Free";
+            font-style: normal;
+            font-weight: 400;
+            font-display: block;
+            src: url(@Assets["fonts/fa-regular-400.woff2"]) format("woff2") url(@Assets["fonts/fa-regular-400.ttf"]) format("truetype");
+        }
+
+        @@font-face {
+            font-family: "Font Awesome 6 Free";
+            font-style: normal;
+            font-weight: 900;
+            font-display: block;
+            src: url(@Assets["fonts/fa-solid-900.woff2"]) format("woff2"), url(@Assets["fonts/fa-solid-900.ttf"]) format("truetype")
+        }
+    </style>
    <HeadOutlet/>
+    <ImportMap/>
 </head>

 <body>
-    <Routes/>
-    <script src="_framework/blazor.web.js"></script>
+<Routes/>
+<script src="@Assets["_framework/blazor.web.js"]"></script>
 </body>

 </html>
--- a/YaeBlog/Components/EssayCard.razor
+++ b/YaeBlog/Components/EssayCard.razor
@@ -3,7 +3,7 @@

 <div class="flex flex-col p-3">
    <div class="text-3xl font-bold py-2">
-        <a href="/blog/essays/@(Essay.FileName)" target="_blank">@(Essay.Title)</a>
+        <a href="/blog/essays/@(Essay.FileName)">@(Essay.Title)</a>
    </div>

    <div class="p-2 flex flex-row justify-content-start gap-2">
@@ -14,9 +14,7 @@
        @foreach (string key in Essay.Tags)
        {
            <div class="text-sky-600">
-                <a href="/blog/tags/?tagName=@(UrlEncoder.Default.Encode(key))">
-                    # @key
-                </a>
+                <Anchor Address="@($"/blog/tags/?tagName={UrlEncoder.Default.Encode(key)}")" Text="@($"# {key}")"/>
            </div>
        }
    </div>
--- a/YaeBlog/Components/Layout/BlogLayout.razor
+++ b/YaeBlog/Components/Layout/BlogLayout.razor
@@ -0,0 +1,28 @@
+@inherits LayoutComponentBase
+
+@attribute [StreamRendering]
+
+<main class="container mx-auto flex flex-col min-h-screen">
+    <div class="grid grid-cols-3 mx-3">
+        <div class="md:col-span-2 col-span-3 h-20 flex items-center">
+            <a href="/blog/">
+                <span class="text-blue-600 text-2xl">Ricardo's Blog</span>
+            </a>
+        </div>
+
+        <div class="md:col-span-1 col-span-3 h-20 flex items-center">
+            <div class="flex flex-row w-full px-2 md:justify-center justify-end text-xl gap-3">
+                <Anchor Address="/blog/archives" Text="归档"/>
+                <Anchor Address="/blog/tags/" Text="标签"/>
+                <Anchor Address="/about/" Text="关于" NewPage="@(true)"/>
+                <Anchor Address="/friends" Text="友链" NewPage="@(true)"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="px-4 py-2 flex-grow">
+        @Body
+    </div>
+
+    <Foonter/>
+</main>
--- a/YaeBlog/Components/Layout/MainLayout.razor
+++ b/YaeBlog/Components/Layout/MainLayout.razor
--- a/YaeBlog/Components/Pages/About.razor
+++ b/YaeBlog/Components/Pages/About.razor
--- a/YaeBlog/Components/Pages/Archives.razor
+++ b/YaeBlog/Components/Pages/Archives.razor
--- a/YaeBlog/Components/Pages/BlogIndex.razor
+++ b/YaeBlog/Components/Pages/BlogIndex.razor
--- a/YaeBlog/Components/Pages/Essays.razor
+++ b/YaeBlog/Components/Pages/Essays.razor
--- a/YaeBlog/Components/Pages/Friends.razor
+++ b/YaeBlog/Components/Pages/Friends.razor
--- a/YaeBlog/Components/Pages/Index.razor
+++ b/YaeBlog/Components/Pages/Index.razor
@@ -7,7 +7,7 @@
 <div class="mx-20">
    <div class="grid grid-cols-3 py-4">
        <div class="col-span-3 md:col-span-1 p-5 p-lg-0">
-            <img src="images/avatar.png" alt="Ricardo's Avatar" class="h-auto max-w-full">
+            <img src="@Assets["images/avatar.png"]" alt="Ricardo's Avatar" class="h-auto max-w-full">
        </div>

        <div class="col-span-3 md:col-span-2">
--- a/YaeBlog/Components/Pages/NotFound.razor
+++ b/YaeBlog/Components/Pages/NotFound.razor
--- a/YaeBlog/Components/Pages/Tags.razor
+++ b/YaeBlog/Components/Pages/Tags.razor
--- a/YaeBlog/Components/_Imports.razor
+++ b/YaeBlog/Components/_Imports.razor
@@ -6,5 +6,4 @@
@using static Microsoft.AspNetCore.Components.Web.RenderMode
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.JSInterop
-@using YaeBlog
@using YaeBlog.Components
--- a/YaeBlog/Directory.Build.targets
+++ b/YaeBlog/Directory.Build.targets
@@ -0,0 +1,53 @@
+<Project>
+  <PropertyGroup>
+    <ClientAssetsRestoreCommand Condition="'$(ClientAssesRestoreCommand)' == ''">pnpm install</ClientAssetsRestoreCommand>
+    <ClientAssetsBuildCommand Condition="'$(ClientAssetsBuildCommand)' == ''">pnpm run build</ClientAssetsBuildCommand>
+    <ClientAssetsBuildOutputParameter Condition="'$(ClientAssetsBuildOutputParameter)' == ''">--output</ClientAssetsBuildOutputParameter>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_RestoreClientAssetsBeforeTargets Condition="'$(TargetFramework)' == ''">DispatchToInnerBuilds</_RestoreClientAssetsBeforeTargets>
+  </PropertyGroup>
+
+  <Target Name="RestoreClientAssets" BeforeTargets="$(_RestoreClientAssetsBeforeTargets)">
+    <Message Importance="high" Text="Running $(ClientAssetsRestoreCommand)"/>
+    <Exec Command="$(ClientAssetsRestoreCommand)"/>
+  </Target>
+
+  <Target Name="BuildClientAssets" DependsOnTargets="RestoreClientAssets" BeforeTargets="AssignTargetPaths">
+    <PropertyGroup>
+      <_ClientAssetsOutputFullPath>$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)ClientAssets'))</_ClientAssetsOutputFullPath>
+    </PropertyGroup>
+
+    <MakeDir Directories="$(_ClientAssetsOutputFullPath)"/>
+    <Exec Command="$(ClientAssetsBuildCommand) $(ClientAssetsBuildOutputParameter) $(_ClientAssetsOutputFullPath)"/>
+
+    <ItemGroup>
+      <_ClientAssetsBuildOutput Include="$(IntermediateOutputPath)ClientAssets\**"/>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="DefineClientAssets" AfterTargets="BuildClientAssets" DependsOnTargets="ResolveStaticWebAssetsConfiguration">
+    <ItemGroup>
+      <FileWrites Include="@(_ClientAssetsBuildOutput)"/>
+    </ItemGroup>
+
+    <DefineStaticWebAssets
+      CandidateAssets="@(_ClientAssetsBuildOutput)"
+      SourceId="$(PackageId)"
+      SourceType="Computed"
+      ContentRoot="$(_ClientAssetsOutputFullPath)"
+      BasePath="$(StaticWebAssetBasePath)"
+    >
+      <Output TaskParameter="Assets" ItemName="StaticWebAsset"/>
+      <Output TaskParameter="Assets" ItemName="_ClientAssetsStaticWebAsset"/>
+    </DefineStaticWebAssets>
+
+    <DefineStaticWebAssetEndpoints
+      CandidateAssets="@(_ClientAssetsStaticWebAsset)"
+      ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
+    >
+      <Output TaskParameter="Endpoints" ItemName="StaticWebAssetEndpoint" />
+    </DefineStaticWebAssetEndpoints>
+  </Target>
+</Project>
--- a/YaeBlog/Dockerfile
+++ b/YaeBlog/Dockerfile
@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
+FROM mcr.microsoft.com/dotnet/aspnet:10.0

 ARG COMMIT_ID
 ENV COMMIT_ID=${COMMIT_ID}

 WORKDIR /app
-COPY bin/Release/net9.0/publish/ ./
+COPY bin/Release/net10.0/publish/ ./
 COPY source/ ./source/
 COPY appsettings.json .

--- a/YaeBlog/Layout/BlogLayout.razor
+++ b/YaeBlog/Layout/BlogLayout.razor
@@ -1,44 +0,0 @@
-@inherits LayoutComponentBase
-
-@attribute [StreamRendering]
-
-<main class="container mx-auto flex flex-col min-h-screen">
-    <div class="grid grid-cols-3 mx-3">
-        <div class="md:col-span-2 col-span-3 h-20 flex items-center">
-            <a href="/blog/">
-                <span class="text-blue-600 text-2xl">Ricardo's Blog</span>
-            </a>
-        </div>
-
-        <div class="md:col-span-1 col-span-3 h-20 flex items-center">
-            <div class="flex flex-row w-full px-2 gap-3 md:justify-center justify-end">
-                <div>
-                    <a href="/blog/archives/">
-                        <span class="text-xl text-blue-600">归档</span>
-                    </a>
-                </div>
-                <div>
-                    <a href="/blog/tags/">
-                        <span class="text-xl text-blue-600">标签</span>
-                    </a>
-                </div>
-                <div>
-                    <a href="/about/" target="_blank">
-                        <span class="text-xl text-blue-600">关于</span>
-                    </a>
-                </div>
-                <div>
-                    <a href="/friends/" target="_blank">
-                        <span class="text-xl text-blue-600">友链</span>
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="px-4 py-2 flex-grow">
-        @Body
-    </div>
-
-    <Foonter/>
-</main>
--- a/YaeBlog/YaeBlog.csproj
+++ b/YaeBlog/YaeBlog.csproj
@@ -11,30 +11,13 @@
  </ItemGroup>

  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>

-  <Target Name="EnsurePnpmInstalled" BeforeTargets="BeforeBuild">
-    <Message Importance="low" Text="Ensure pnpm is installed..."/>
-    <Exec Command="pnpm --version" ContinueOnError="true">
-      <Output TaskParameter="ExitCode" PropertyName="ErrorCode"/>
-    </Exec>
-
-    <Error Condition="$(ErrorCode) != 0" Text="Pnpm is not installed which is required for build."/>
-
-    <Message Importance="normal" Text="Installing pakages using pnpm..."/>
-    <Exec Command="pnpm install"/>
-  </Target>
-
-  <Target Name="TailwindGenerate" AfterTargets="EnsurePnpmInstalled" BeforeTargets="BeforeBuild" Condition="'$(_IsPublishing)' == 'yes'">
-    <Message Importance="normal" Text="Generate css files using tailwind..."/>
-    <Exec Command="pnpm tailwindcss -i wwwroot/tailwind.css -o $(IntermediateOutputPath)tailwind.g.css"/>
-
-    <ItemGroup>
-      <Content Include="$(IntermediateOutputPath)tailwind.g.css" Visible="false" TargetPath="wwwroot/tailwind.g.css"/>
-    </ItemGroup>
-  </Target>
-
+  <PropertyGroup>
+    <ClientAssetsRestoreCommand>pnpm install</ClientAssetsRestoreCommand>
+    <ClientAssetsBuildCommand>pwsh build-tailwind.ps1</ClientAssetsBuildCommand>
+  </PropertyGroup>
 </Project>
--- a/YaeBlog/appsettings.json
+++ b/YaeBlog/appsettings.json
@@ -37,7 +37,7 @@
                "Name": "万木长风",
                "Description": "世界渲染中...",
                "Link": "https://ryohai.fun",
-                "AvatarImage": "https://ryohai.fun/icon.jpg"
+                "AvatarImage": "https://ryohai.fun/static/favicons/favicon-32x32.png"
            }
        ]
    }
--- a/YaeBlog/build-tailwind.ps1
+++ b/YaeBlog/build-tailwind.ps1
@@ -0,0 +1,7 @@
+[cmdletbinding()]
+param(
+    [string]$output = "wwwroot"
+)
+
+Write-Output "Output directory: $output"
+pnpm tailwindcss -i wwwroot/tailwind.css -o $output/tailwind.g.css
--- a/YaeBlog/docker-compose.yaml
+++ b/YaeBlog/docker-compose.yaml
@@ -1,13 +1,13 @@
 version: '3.8'

 services:
-    blog:
-        image: registry.cn-beijing.aliyuncs.com/jackfiled/blog:latest
-        restart: unless-stopped
-        labels:
-            - "traefik.enable=true"
-            - "traefik.http.routers.blog.rule=Host(`rrricardo.top`) || Host(`www.rrricardo.top`)"
-            - "traefik.http.services.blog.loadbalancer.server.port=8080"
-            - "traefik.http.routers.blog.tls=true"
-            - "traefik.http.routers.blog.tls.certresolver=myresolver"
-            - "com.centurylinklabs.watchtower.enable=true"
+  blog:
+    image: registry.cn-beijing.aliyuncs.com/jackfiled/blog:latest
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.blog.rule=Host(`rrricardo.top`) || Host(`www.rrricardo.top`)"
+      - "traefik.http.services.blog.loadbalancer.server.port=8080"
+      - "traefik.http.routers.blog.tls=true"
+      - "traefik.http.routers.blog.tls.certresolver=myresolver"
+      - "com.centurylinklabs.watchtower.enable=true"
--- a/YaeBlog/wwwroot/globals.css
+++ b/YaeBlog/wwwroot/globals.css
@@ -1,15 +0,0 @@
-@font-face {
-    font-family: "Font Awesome 6 Free";
-    font-style: normal;
-    font-weight: 400;
-    font-display: block;
-    src: url(fonts/fa-regular-400.woff2) format("woff2"), url(fonts/fa-regular-400.ttf) format("truetype")
-}
-
-@font-face {
-    font-family: "Font Awesome 6 Free";
-    font-style: normal;
-    font-weight: 900;
-    font-display: block;
-    src: url(fonts/fa-solid-900.woff2) format("woff2"), url(fonts/fa-solid-900.ttf) format("truetype")
-}