⬆ chore: upgrade Masa.Blazor to 1.3.0-beta.6 (#61)

masastack · Dec 26, 2023 · 86711fc · 86711fc
1 parent 528afe6
commit 86711fc
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 351 deletions.
diff --git a/src/MASA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractivePopup2.cs b/src/MASA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractivePopup2.cs
diff --git a/src/MASA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractiveTrigger2.razor b/src/MASA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractiveTrigger2.razor
diff --git a/src/MASA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractiveTriggerBase2.razor b/src/MASA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractiveTriggerBase2.razor
diff --git a/...SA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractiveTriggerBase2.razor.cs b/...SA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractiveTriggerBase2.razor.cs
diff --git a/src/MASA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractiveTriggers2.razor b/src/MASA.OfficialWebsite.WebApp/Components/InteractiveTrigger/MInteractiveTriggers2.razor
diff --git a/src/MASA.OfficialWebsite.WebApp/Components/Layout/MainLayout.razor b/src/MASA.OfficialWebsite.WebApp/Components/Layout/MainLayout.razor
@@ -128,19 +128,19 @@
                             <MCard Color="transparent" Flat Dark Class="footer-content__item footer-content__focus">
                                 <MCardTitle>关注我们</MCardTitle>
                                 <MCardText>
-                                    <MInteractiveTriggers2 Class="d-inline"
-                                                           QueryName="@nameof(FollowUs)"
-                                                           QueryValue="@FollowUs"
-                                                           InteractiveValue="@(new[] { "wechat", "qq" })"
-                                                           InteractiveComponentType="typeof(FollowUsBtn)"
-                                                           InteractiveComponentParameters="@FollowUsParameters">
+                                    <MInteractiveTriggers Class="d-inline"
+                                                          QueryName="@nameof(FollowUs)"
+                                                          QueryValue="@FollowUs"
+                                                          InteractiveValue="@(new[] { "wechat", "qq" })"
+                                                          InteractiveComponentType="typeof(FollowUsBtn)"
+                                                          InteractiveComponentParameters="@FollowUsParameters">
                                         <MButton Outlined
                                                  Icon
                                                  Color="white"
                                                  Class="follow-us-icon mr-9">
                                             <MIcon>@(context == "wechat" ? "mdi-wechat" : "mdi-qqchat")</MIcon>
                                         </MButton>
-                                    </MInteractiveTriggers2>
+                                    </MInteractiveTriggers>
 
                                     <MButton Class="follow-us-icon"
                                              Outlined

diff --git a/src/MASA.OfficialWebsite.WebApp/Dockerfile b/src/MASA.OfficialWebsite.WebApp/Dockerfile
@@ -1,11 +1,11 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS publish
+FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_sdk:8.0.100-1 AS publish
 WORKDIR /src
 COPY . .
 ENV CSPROJ="src\MASA.OfficialWebsite.WebApp/MASA.OfficialWebsite.WebApp.csproj"
 
 RUN dotnet restore $CSPROJ && dotnet publish $CSPROJ -c Release -o /app/publish
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:8.0-1
 WORKDIR /app
 COPY --from=publish /app/publish .
 ENV ASPNETCORE_URLS=http://0.0.0.0:80

diff --git a/src/MASA.OfficialWebsite.WebApp/MASA.OfficialWebsite.WebApp.csproj b/src/MASA.OfficialWebsite.WebApp/MASA.OfficialWebsite.WebApp.csproj
@@ -8,13 +8,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <Content Include="..\..\.dockerignore">
-        <Link>.dockerignore</Link>
-      </Content>
+        <Content Include="..\..\.dockerignore">
+            <Link>.dockerignore</Link>
+        </Content>
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Masa.Blazor" Version="1.3.0-beta.5" />
+        <PackageReference Include="Masa.Blazor" Version="1.3.0-beta.6"/>
     </ItemGroup>
 
 </Project>