Skip to content

Commit

Permalink
v1.1.233
Browse files Browse the repository at this point in the history
  • Loading branch information
davidxuang committed Mar 24, 2024
1 parent 236e5b2 commit 679d436
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.{js,ts,jsx,tsx,py,json,yaml,toml,svg}]
[*.{js,ts,jsx,tsx,py,json,yml,yaml,toml,svg}]
indent_size = 2

[*.{xml,csproj,fsproj,vbproj,props,targets}]
Expand Down
23 changes: 15 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,23 @@ jobs:
name: Publish
runs-on: windows-latest
steps:
- name: Set variables
id: vars
run: |
echo "dotnet_version=$(dotnet --version)" >> $env:GITHUB_OUTPUT
echo "program_data=$env:ProgramData" >> $env:GITHUB_OUTPUT
- name: Cache
uses: actions/cache@v4
with:
key: ${{ steps.vars.outputs.dotnet_version }}
path: ${{ steps.vars.outputs.program_data }}/dotnet/workloads
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true
- name: Setup .NET
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
- name: Setup .NET workloads
run: dotnet workload install android ios maccatalyst macos
- name: Setup Java
uses: actions/setup-java@v4
Expand All @@ -30,13 +42,8 @@ jobs:
- name: Build and pack
run: |
$suffix = "${{ steps.tag_name.outputs.tag }}" -replace "^[^\-]+-?", ""
dotnet pack -c Release -o . --version-suffix "$suffix" FluentIcons.Common/FluentIcons.Common.csproj
dotnet pack -c Release -o . --version-suffix "$suffix" FluentIcons.Avalonia/FluentIcons.Avalonia.csproj
dotnet pack -c Release -o . --version-suffix "$suffix" FluentIcons.Avalonia.Fluent/FluentIcons.Avalonia.Fluent.csproj
dotnet pack -c Release -o . --version-suffix "$suffix" FluentIcons.Maui/FluentIcons.Maui.csproj
MSBuild -t:pack -p:Configuration=Release -p:PackageOutputPath=".." -p:VersionSuffix="$suffix" FluentIcons.Uwp/FluentIcons.Uwp.csproj
dotnet pack -c Release -o . --version-suffix "$suffix" FluentIcons.WinUI/FluentIcons.WinUI.csproj
dotnet pack -c Release -o . --version-suffix "$suffix" FluentIcons.WPF/FluentIcons.WPF.csproj
MSBuild -t:restore -v:minimal
MSBuild -t:pack -p:Configuration=Release -p:PackageOutputPath=".." -p:VersionSuffix="$suffix" -v:minimal
- name: Publish
run: |
dotnet nuget push FluentIcons.*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
1 change: 0 additions & 1 deletion FluentIcons.Maui/FluentIcons.Maui.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionSuffix>preview</VersionSuffix>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
Expand Down
1 change: 1 addition & 0 deletions FluentIcons.WinUI/Extensions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.Extensions.Hosting;
using Microsoft.UI.Xaml;

namespace FluentIcons.WinUI
{
Expand Down
3 changes: 2 additions & 1 deletion FluentIcons.WinUI/FluentIcons.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">
$(TargetFrameworks);net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0</TargetFrameworks>
$(TargetFrameworks);net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0
</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
<Description>FluentUI System Icons wrapper for WinUI.</Description>
<PackageTags>$(PackageTags);WinUI</PackageTags>
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.
2 changes: 1 addition & 1 deletion seagull-icons/collect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ collect(SRC_DIR, '', 0, (subdir, name) => {
}
// size16 icons
matches = name.match(
/^ic_fluent_(?=presence_|text_whole_word_)(.+)_16_(regular|filled|mono|color)\.svg$/
/^ic_fluent_(?=presence_|spatula_spoon_|text_whole_word_)(.+)_16_(regular|filled|mono|color)\.svg$/
);
if (matches) {
return path.join(
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.
9 changes: 9 additions & 0 deletions seagull-icons/transform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,13 @@ compose:
icons:
- channel

alert_off#:
window: [7, 7]
mask: M2.0033,-0.1152c0.0348,-0.0348 0.0723,-0.0673 0.1123,-0.0971c0.6658,-0.4947 1.4906,-0.7877 2.3838,-0.7877c2.2089,0 4,1.7911 4,4l0.0006,3.3786l0.5609,0.5609c0.5854,0.5857 0.5853,1.5355 -0.0002,2.1212c-0.5857,0.5855 -1.5356,0.5855 -2.1213,0.0001l-0.2881,-0.2881c-0.4351,0.7345 -1.2358,1.2273 -2.1519,1.2273c-1.088,0 -2.0139,-0.6957 -2.3573,-1.6664c-0.0384,-0.1086 -0.0573,-0.2214 -0.0573,-0.3336h-1.582c-1.3963,0 -2.0347,-1.741 -0.97,-2.6441l0.9666,-0.819v-1.5369c0,-0.1225 0.0055,-0.2438 0.0163,-0.3629l-0.5766,-0.5766c-0.5854,-0.5857 -0.5853,-1.5355 0.0002,-2.1212c0.567,-0.5668 1.4752,-0.585 2.064,-0.0545z
badge: M7.6464,8.3536l-1.3535,-1.3536h-5.7901c-0.4654,0 -0.6782,-0.5803 -0.3233,-0.8813l1.3199,-1.1185v-2.0002c0,-0.2443 0.0292,-0.4818 0.0843,-0.7092l-0.9373,-0.9372c-0.1952,-0.1953 -0.1952,-0.5119 0,-0.7072c0.1953,-0.1952 0.5119,-0.1952 0.7072,0l7,7c0.1952,0.1953 0.1952,0.5119 0,0.7072c-0.1953,0.1952 -0.5119,0.1952 -0.7072,0zM7.4995,5.3779l-4.7875,-4.7875c0.4992,-0.3709 1.1177,-0.5904 1.7874,-0.5904c1.6567,0 3,1.3433 3,3zM4.4994,9c-0.6529,0 -1.2085,-0.4175 -1.4146,-1h2.8291c-0.2056,0.5825 -0.7612,1 -1.4145,1z
icons:
- person

apps: # cat 2
mask:
2: M11.75,4h2.5c1.5188,0 2.75,1.2312 2.75,2.75v6.75c0,1.933 -1.567,3.5 -3.5,3.5h-6.75c-1.5188,0 -2.75,-1.2312 -2.75,-2.75v-2.5c0,-1.5188 1.2312,-2.75 2.75,-2.75h2.25v-2.25c0,-1.5188 1.2312,-2.75 2.75,-2.75z
Expand Down Expand Up @@ -1404,6 +1411,7 @@ compose:
mask: M0.267,3.0182c0.2215,-0.6322 0.583,-1.2105 1.0619,-1.6893c0.4788,-0.4789 1.0571,-0.8404 1.6893,-1.0619c0.0491,-0.3114 0.1956,-0.602 0.4211,-0.8277c0.2813,-0.281 0.6631,-0.4393 1.0607,-0.4393c0.3976,0 0.7794,0.1583 1.0607,0.4393c0.2255,0.2257 0.372,0.5163 0.4211,0.8277c0.6322,0.2215 1.2105,0.583 1.6893,1.0619c0.4789,0.4788 0.8404,1.0571 1.0619,1.6893c0.3114,0.0491 0.602,0.1956 0.8277,0.4211c0.281,0.2813 0.4393,0.6631 0.4393,1.0607c0,0.3976 -0.1583,0.7794 -0.4393,1.0607c-0.2257,0.2255 -0.5163,0.372 -0.8277,0.4211c-0.2215,0.6322 -0.583,1.2105 -1.0619,1.6893c-0.4788,0.4789 -1.0571,0.8404 -1.6893,1.0619c-0.0491,0.3114 -0.1956,0.602 -0.4211,0.8277c-0.2813,0.281 -0.6631,0.4393 -1.0607,0.4393c-0.3976,0 -0.7794,-0.1583 -1.0607,-0.4393c-0.2255,-0.2257 -0.372,-0.5163 -0.4211,-0.8277c-0.6322,-0.2215 -1.2105,-0.583 -1.6893,-1.0619c-0.4789,-0.4788 -0.8404,-1.0571 -1.0619,-1.6893c-0.3114,-0.0491 -0.602,-0.1956 -0.8277,-0.4211c-0.281,-0.2813 -0.4393,-0.6631 -0.4393,-1.0607c0,-0.3976 0.1583,-0.7794 0.4393,-1.0607c0.2257,-0.2255 0.5163,-0.372 0.8277,-0.4211z
badge: M5.0556,5.3315c-0.1645,0.1099 -0.3578,0.1685 -0.5556,0.1685c-0.2652,0 -0.5196,-0.1054 -0.7071,-0.2929c-0.1875,-0.1875 -0.2929,-0.4419 -0.2929,-0.7071c0,-0.1978 0.0586,-0.3911 0.1685,-0.5556c0.1099,-0.1644 0.2661,-0.2926 0.4488,-0.3683c0.1827,-0.0757 0.3838,-0.0955 0.5778,-0.0569c0.194,0.0386 0.3722,0.1338 0.512,0.2737c0.1399,0.1398 0.2351,0.318 0.2737,0.512c0.0386,0.194 0.0188,0.3951 -0.0569,0.5778c-0.0757,0.1827 -0.2039,0.3389 -0.3683,0.4488zM7.949,4h0.551c0.1326,0 0.2598,0.0527 0.3536,0.1464c0.0937,0.0938 0.1464,0.221 0.1464,0.3536c0,0.1326 -0.0527,0.2598 -0.1464,0.3536c-0.0938,0.0937 -0.221,0.1464 -0.3536,0.1464h-0.551c-0.1081,0.7437 -0.4536,1.4326 -0.985,1.964c-0.5314,0.5314 -1.2203,0.8769 -1.964,0.985v0.551c0,0.1326 -0.0527,0.2598 -0.1464,0.3536c-0.0938,0.0937 -0.221,0.1464 -0.3536,0.1464c-0.1326,0 -0.2598,-0.0527 -0.3536,-0.1464c-0.0937,-0.0938 -0.1464,-0.221 -0.1464,-0.3536v-0.551c-0.7437,-0.1081 -1.4326,-0.4536 -1.964,-0.985c-0.5314,-0.5314 -0.8769,-1.2203 -0.985,-1.964h-0.551c-0.1326,0 -0.2598,-0.0527 -0.3536,-0.1464c-0.0937,-0.0938 -0.1464,-0.221 -0.1464,-0.3536c0,-0.1326 0.0527,-0.2598 0.1464,-0.3536c0.0938,-0.0937 0.221,-0.1464 0.3536,-0.1464h0.551c0.1081,-0.7437 0.4536,-1.4326 0.985,-1.964c0.5314,-0.5314 1.2203,-0.8769 1.964,-0.985v-0.551c0,-0.1326 0.0527,-0.2598 0.1464,-0.3536c0.0938,-0.0937 0.221,-0.1464 0.3536,-0.1464c0.1326,0 0.2598,0.0527 0.3536,0.1464c0.0937,0.0938 0.1464,0.221 0.1464,0.3536v0.551c0.7437,0.1081 1.4326,0.4536 1.964,0.985c0.5314,0.5314 0.8769,1.2203 0.985,1.964zM4.7454,6.9884c0.5756,-0.0568 1.1137,-0.3114 1.5226,-0.7204c0.2321,-0.2322 0.4163,-0.5078 0.5419,-0.8112c0.1255,-0.3033 0.1902,-0.6285 0.1901,-0.9568c-0.0001,-0.5784 -0.2008,-1.1388 -0.5678,-1.5859c-0.367,-0.447 -0.8776,-0.7529 -1.4449,-0.8657c-0.5673,-0.1127 -1.1561,-0.0253 -1.6662,0.2475c-0.51,0.2727 -0.9097,0.7138 -1.131,1.2482c-0.2212,0.5344 -0.2503,1.129 -0.0823,1.6824c0.1679,0.5535 0.5226,1.0316 1.0036,1.3528c0.4809,0.3213 1.0584,0.4659 1.634,0.4091z
icons:
- document#/document_target
- navigation
- rectangle_portrait
- window
Expand Down Expand Up @@ -1886,6 +1894,7 @@ compose:
icons:
- channel
- drawer
- people
- person
- voicemail
- voicemail:voicemail_arrow
Expand Down
4 changes: 3 additions & 1 deletion update.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/pwsh

using namespace System.Management.Automation

[CmdletBinding()]
param ()

Expand All @@ -26,7 +28,7 @@ try {
$upstreamTag = git describe --tag --abbrev=0
Write-Host "Upstream at $upstreamTag"

if ($localTag -eq $upstreamTag -and -not $Debug) {
if (([Version][SemanticVersion]::Parse($localTag)) -le ([Version][SemanticVersion]::Parse($upstreamTag)) -and -not $Debug) {
return
}

Expand Down

0 comments on commit 679d436

Please sign in to comment.