Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .github/workflows/dotnet-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
51 changes: 1 addition & 50 deletions SystemTools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -37,10 +29,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">
Expand Down Expand Up @@ -71,29 +60,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>
Expand Down Expand Up @@ -156,19 +122,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')" />

<PropertyGroup Condition="'$(ClassIslandPowerShellExecutable)' != ''">
<PowershellBinaryName>&quot;$(ClassIslandPowerShellExecutable)&quot;</PowershellBinaryName>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions Themes/ClassWidgets/ClassWidgetsCard.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -101,7 +101,7 @@
<GradientStop Offset="1" Color="#58FFFFFF" />
</LinearGradientBrush>
</Border.BorderBrush>
</Border>
</Border>-->

<Grid x:Name="CardContentGrid"
Margin="16 11 16 10"
Expand Down
Loading