From c7137c33668c058c1841a84738ba55639b95df60 Mon Sep 17 00:00:00 2001
From: Nikoa <diannwork@outlook.com>
Date: Sat, 5 Sep 2026 18:41:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?ci:=E5=B0=9D=E8=AF=95=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E4=BA=A7=E7=89=A9=E4=BD=93=E7=A7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SystemTools.csproj | 52 +---------------------------------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

diff --git a/SystemTools.csproj b/SystemTools.csproj
index 502a26b..66a60f1 100644
--- a/SystemTools.csproj
+++ b/SystemTools.csproj
@@ -5,15 +5,7 @@
         <LangVersion>latest</LangVersion>
         <UseWindowsForms>true</UseWindowsForms>
         <Platforms>x64</Platforms>
-        <EnableDynamicLoading>true</EnableDynamicLoading>
         <CreateCipx>true</CreateCipx>
-        <ClassIslandSourceRoot Condition="'$(ClassIslandSourceRoot)' == ''">E:\ClassIsland-git-misha</ClassIslandSourceRoot>
-        <UseLocalClassIslandSdk Condition="'$(UseLocalClassIslandSdk)' == '' And Exists('$(ClassIslandSourceRoot)\ClassIsland.PluginSdk\ClassIsland.PluginSdk.csproj')">true</UseLocalClassIslandSdk>
-        <UseLocalClassIslandSdk Condition="'$(UseLocalClassIslandSdk)' == ''">false</UseLocalClassIslandSdk>
-        <ClassIslandPluginSdkVersion Condition="'$(ClassIslandPluginSdkVersion)' == ''">2.1.1.1</ClassIslandPluginSdkVersion>
-        <ClassIslandPowerShellExecutable Condition="'$(ClassIslandPowerShellExecutable)' == '' And Exists('D:\PowerShell-7.7.0-preview.4-win-x64\pwsh.exe')">D:\PowerShell-7.7.0-preview.4-win-x64\pwsh.exe</ClassIslandPowerShellExecutable>
-        <ClassIslandPowerShellExecutable Condition="'$(ClassIslandPowerShellExecutable)' == '' And Exists('C:\Program Files\PowerShell\7\pwsh.exe')">C:\Program Files\PowerShell\7\pwsh.exe</ClassIslandPowerShellExecutable>
-        <ClassIslandPowerShellExecutable Condition="'$(ClassIslandPowerShellExecutable)' == '' And Exists('C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe')">C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</ClassIslandPowerShellExecutable>
     </PropertyGroup>
     <ItemGroup>
       <None Include=".github\workflows\dotnet-build.yml" />
@@ -39,10 +31,7 @@
     </ItemGroup>
     
     <ItemGroup>
-        <PackageReference Condition="'$(UseLocalClassIslandSdk)' != 'true' Or !Exists('$(ClassIslandSourceRoot)\ClassIsland.PluginSdk\ClassIsland.PluginSdk.csproj')"
-                          Include="ClassIsland.PluginSdk" Version="$(ClassIslandPluginSdkVersion)">
-            <ExcludeAssets>runtime;native</ExcludeAssets>
-        </PackageReference>
+        <PackageReference Include="ClassIsland.PluginSdk" Version="2.1.1.1" />
         <PackageReference Include="DlibDotNet" Version="19.21.0.20220724" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
         <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.298">
@@ -73,29 +62,6 @@
         </ItemGroup>
     </Target>
 
-    <Target Name="VerifyClassIslandSource" BeforeTargets="PrepareForBuild"
-            Condition="'$(UseLocalClassIslandSdk)' == 'true'">
-        <Error Condition="!Exists('$(ClassIslandSourceRoot)\ClassIsland.PluginSdk\ClassIsland.PluginSdk.csproj')"
-               Text="ClassIsland source was not found at '$(ClassIslandSourceRoot)'. Set ClassIslandSourceRoot to the develop/v2/misha-alpha checkout or build with UseLocalClassIslandSdk=false." />
-    </Target>
-
-    <Target Name="VerifyClassIslandPowerShell" BeforeTargets="PrepareForBuild"
-            Condition="'$(UseLocalClassIslandSdk)' == 'true'">
-        <Error Condition="'$(ClassIslandPowerShellExecutable)' == ''"
-               Text="PowerShell executable was not found. Set ClassIslandPowerShellExecutable to the full path of pwsh.exe." />
-    </Target>
-
-    <Target Name="StripClassIslandHostDependencies" BeforeTargets="CreateCipx"
-            Condition="'$(UseLocalClassIslandSdk)' == 'true'
-                       And Exists('$(ClassIslandSourceRoot)\ClassIsland.PluginSdk\ClassIsland.PluginSdk.csproj')
-                       And Exists('$(ClassIslandSourceRoot)\ClassIsland.Desktop\bin\Debug\net10.0-windows10.0.19041.0')">
-        <PropertyGroup>
-            <PluginOutputDirectory>$([System.String]::Copy('$([System.IO.Path]::GetFullPath('$(OutDir)'))').TrimEnd([char]92))</PluginOutputDirectory>
-        </PropertyGroup>
-        <Message Importance="High" Text="Using PowerShell executable: $(ClassIslandPowerShellExecutable)" />
-        <Exec Command="&quot;$(ClassIslandPowerShellExecutable)&quot; -NoLogo -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\Strip-ClassIslandHostDependencies.ps1&quot; -OutputDirectory &quot;$(PluginOutputDirectory).&quot; -ClassIslandDebugDirectory &quot;$(ClassIslandSourceRoot)\ClassIsland.Desktop\bin\Debug\net10.0-windows10.0.19041.0&quot;" />
-    </Target>
-
     <ItemGroup>
         <None Update="manifest.yml">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -158,20 +124,4 @@
       <AvaloniaResource Remove="cipx\**" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(UseLocalClassIslandSdk)' == 'true' And Exists('$(ClassIslandSourceRoot)\ClassIsland.PluginSdk\ClassIsland.PluginSdk.csproj')">
-        <ProjectReference Include="$(ClassIslandSourceRoot)\ClassIsland.PluginSdk\ClassIsland.PluginSdk.csproj">
-            <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-            <Private>false</Private>
-            <GlobalPropertiesToRemove>CreateCipx</GlobalPropertiesToRemove>
-        </ProjectReference>
-    </ItemGroup>
-
-    <Import Project="$(ClassIslandSourceRoot)\ClassIsland.PluginSdk\ClassIsland.PluginSdk.targets"
-            Condition="'$(UseLocalClassIslandSdk)' == 'true' And Exists('$(ClassIslandSourceRoot)\ClassIsland.PluginSdk\ClassIsland.PluginSdk.targets')" />
-
-    <!-- The SDK target invokes PowerShell for CIPX hash generation. Keep it aligned with the executable above. -->
-    <PropertyGroup Condition="'$(ClassIslandPowerShellExecutable)' != ''">
-        <PowershellBinaryName>&quot;$(ClassIslandPowerShellExecutable)&quot;</PowershellBinaryName>
-    </PropertyGroup>
-
 </Project>

From 48a45a2cfb6e6ca06bf2655638ef7e446917e56a Mon Sep 17 00:00:00 2001
From: Nikoa <diannwork@outlook.com>
Date: Sat, 5 Sep 2026 18:44:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?ci:=E5=9B=9E=E9=80=80workflow=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dotnet-build.yml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
index 244d700..79305ac 100644
--- a/.github/workflows/dotnet-build.yml
+++ b/.github/workflows/dotnet-build.yml
@@ -14,25 +14,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Checkout ClassIsland SDK source
-        uses: actions/checkout@v4
-        with:
-          repository: ClassIsland/ClassIsland
-          ref: develop/v2/misha-alpha
-          path: ClassIsland
-          # ClassIsland derives AssemblyVersion from git tags via git describe.
-          fetch-depth: 0
-
       - name: Setup .NET 10
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '10.0.x'
 
       - name: Restore dependencies
-        run: dotnet restore -p:UseLocalClassIslandSdk=true -p:ClassIslandSourceRoot="${{ github.workspace }}/ClassIsland"
+        run: dotnet restore
 
       - name: Build CIPX
-        run: dotnet publish -p:CreateCipx=true -p:UseLocalClassIslandSdk=true -p:ClassIslandSourceRoot="${{ github.workspace }}/ClassIsland" --configuration Release --no-restore
+        run: dotnet publish -p:CreateCipx=true --configuration Release --no-restore
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4

From bc88501c82e81a3665ef201b9ac89c9c439dd12c Mon Sep 17 00:00:00 2001
From: Nikoa <diannwork@outlook.com>
Date: Sat, 5 Sep 2026 19:18:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=B0=9A=E6=9C=AA=E5=8F=91=E7=89=88PluginSdk=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Themes/ClassWidgets/ClassWidgetsCard.axaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Themes/ClassWidgets/ClassWidgetsCard.axaml b/Themes/ClassWidgets/ClassWidgetsCard.axaml
index b72fa0a..da19408 100644
--- a/Themes/ClassWidgets/ClassWidgetsCard.axaml
+++ b/Themes/ClassWidgets/ClassWidgetsCard.axaml
@@ -87,7 +87,7 @@
              by MainWindowLine/ComponentPresenter in the host theme. Keep the original
              CW2 frame for solid backgrounds; the host material frame replaces it when
              native material is enabled. -->
-        <Border BorderThickness="1"
+        <!--<Border BorderThickness="1"
                 IsHitTestVisible="False"
                 IsVisible="{Binding !$self.(assists:MainWindowStylesAssist.IsBackgroundMaterialEnabled), Mode=OneWay}"
                 CornerRadius="{Binding $self.(assists:MainWindowStylesAssist.CornerRadius),
@@ -101,7 +101,7 @@
                     <GradientStop Offset="1" Color="#58FFFFFF" />
                 </LinearGradientBrush>
             </Border.BorderBrush>
-        </Border>
+        </Border>-->
 
         <Grid x:Name="CardContentGrid"
               Margin="16 11 16 10"