Skip to content

Commit

Permalink
v1.1.247
Browse files Browse the repository at this point in the history
  • Loading branch information
davidxuang committed Jul 3, 2024
1 parent 1b46787 commit ff08e7d
Show file tree
Hide file tree
Showing 19 changed files with 65 additions and 20 deletions.
18 changes: 18 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="Avalonia" Version="11.0.0" />
<PackageVersion Include="FluentAvaloniaUI" Version="2.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
<PackageVersion Include="Nullable" Version="1.3.1" />
<PackageVersion Include="Uno.UI" Version="5.0.19" />
<PackageVersion Include="Uno.WinUI" Version="5.0.19" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAvaloniaUI" Version="2.0.0" />
<PackageReference Condition="$(TargetFramework) == 'netstandard2.0'" Include="Nullable" Version="1.3.*" />
<PackageReference Include="FluentAvaloniaUI" />
<PackageReference Condition="$(TargetFramework) == 'netstandard2.0'" Include="Nullable" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion FluentIcons.Avalonia/FluentIcons.Avalonia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0" />
<PackageReference Include="Avalonia" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions FluentIcons.Maui/FluentIcons.Maui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
<PackageReference Include="Microsoft.Maui.Controls" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions FluentIcons.Uwp/FluentIcons.Uwp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nullable" Version="1.3.*" />
<PackageReference Include="Nullable" />
</ItemGroup>
</When>

<Otherwise>
<ItemGroup>
<PackageReference Include="Uno.UI" Version="5.0.19" />
<PackageReference Include="Uno.UI" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
8 changes: 4 additions & 4 deletions FluentIcons.WinUI/FluentIcons.WinUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
</ItemGroup>

<Choose>
<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
</ItemGroup>
</When>

<Otherwise>
<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
<PackageReference Include="Uno.WinUI" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
1 change: 1 addition & 0 deletions FluentIcons.sln
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Global
Expand Down
Binary file modified seagull-icons/assets/FluentSystemIcons.ttf
Binary file not shown.
Binary file modified seagull-icons/assets/SeagullFluentIcons.ttf
Binary file not shown.
4 changes: 2 additions & 2 deletions seagull-icons/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

$PSNativeCommandUseErrorActionPreference = $true
if ($DebugPreference -eq 'SilentlyContinue') {
$ErrorActionPreference = 'Stop'
} else {
$ErrorActionPreference = 'Break'
} else {
$ErrorActionPreference = 'Stop'
}

if (Test-Path "$PSScriptRoot/obj") {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions seagull-icons/transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@ const compose = (() => {
if (typeof m === 'string' || m[cat] === undefined) {
const item = new paper.CompoundPath(m['#'] ?? m);
if (window) {
if (cat === '#') {
throw [badge_meta, cat]; // missing entry in `base`
}
if (cat.startsWith('1') || cat.startsWith('2')) {
item.translate([window[0], 0]);
}
Expand Down
Loading

0 comments on commit ff08e7d

Please sign in to comment.