Skip to content

Commit 774b1d3

Browse files
committed
merge
2 parents 9f26d69 + 84170b5 commit 774b1d3

File tree

18 files changed

+50
-56
lines changed

18 files changed

+50
-56
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
8.0.x
4545
9.0.x
4646
dotnet-quality: ga
47-
47+
4848
- name: Initialize CodeQL
4949
uses: github/codeql-action/init@v2
5050
with:
5151
languages: ${{ matrix.language }}
5252

53-
- if: matrix.language == 'csharp'
53+
- if: matrix.language == 'csharp'
5454
name: Manually build CSharp on .NET
5555
run: |
5656
dotnet build Microsoft.FluentUI.sln

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
1313
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
1414

15-
<VersionFile>4.10.4</VersionFile>
16-
<VersionPrefix>4.10.4</VersionPrefix>
15+
<VersionFile>4.11.0</VersionFile>
16+
<VersionPrefix>4.11.0</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>

WHATSNEW.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,39 @@
2323
- Update to Fluent UI System Icons 1.1.265 (changes since 1.1.261)
2424

2525
**What's new (Name / Size(s) / Variant(s))**
26-
- Animal Paw Print / 16, 20, 24, 28, 32, 48 / Filled & Regular
26+
2727
- Arrow Bounce / 12, 28, 48 / Filled & Regular
2828
- Arrow Clockwise Dashes / 28, 48 / Filled & Regular
29-
- Arrow Clockwise Dashes Settings / 16, 20, 24, 28, 32, 48 / Filled & Regular
29+
3030
- Arrow Down Left / 12, 28 / Filled & Regular
3131
- Arrow Flow Diagonal Up Right / 12, 28, 48 / Filled & Regular
3232
- Arrow Up Right / 12, 28 / Filled & Regular
3333
- Arrow Up Right Dashes / 12, 20, 24, 28, 32, 48 / Filled & Regular
3434
- Arrow Wrap / 32 / Filled & Regular
3535
- Arrow Wrap Up To Down / 20, 32 / Filled & Regular
36-
- Chat Off / 16 / Filled & Regular
36+
3737
- Coin Multiple / 16, 24 / Filled & Regular
3838
- Comment Badge / 16, 20, 24 / Filled & Regular
39-
- Connected / 24, 32 / Filled & Regular
39+
4040
- Data Usage / 28, 32, 48 / Filled & Regular
4141
- Data Usage Checkmark / 16, 20, 24, 28, 32, 48 / Filled & Regular
4242
- Document One Page Multiple / 16, 20, 24 / Filled & Regular
4343
- Document One Page Multiple / 16, 20, 24 / Filled & Regular
4444
- Document One Page Multiple Sparkle / 16, 20, 24 / Filled & Regular
4545
- Document One Page Multiple Sparkle / 16, 20, 24 / Filled & Regular
46-
- Lightbulb / 32 / Light
46+
4747
- Line Horizontal 1 Dash Dot Dash / 20 / Filled & Regular
4848
- Line Horizontal 1 Dot / 20 / Filled & Regular
4949
- Line Horizontal 3 / 16, 24, 28, 32, 48 / Filled & Regular
5050
- Navigation / 28, 32, 48 / Filled & Regular
5151
- Pause Circle / 16 / Filled & Regular
52-
- Square Text Arrow Repeat All / 16, 20, 24 / Filled & Regular
52+
5353
- Stack / 28, 48 / Filled & Regular
5454
- Stack Off / 16, 20, 24, 28, 32, 48 / Filled & Regular
5555
- Text Bullet List Square / 28 / Filled & Regular
5656
- TextBox / 20, 28, 32, 48 / Filled & Regular
5757
- TextBox Checkmark / 16, 20, 24, 28, 32, 48 / Filled & Regular
58-
- Translate / 32 / Filled & Regular
58+
5959

6060
**What's updated (Name / Size(s) / Variant(s))**
6161
- Add Circle / 16 / Filled & Regular

eng/pipelines/version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ variables:
22
# File and Package version
33
# dev branch: 1.2.4-Preview-23282-1' (PackageSuffix is always ignored in Dev branch)
44
# main branch: 1.2.4-RC.1' (PackageSuffix is ignored, if empty, in Main branch)
5-
FileVersion: '4.10.4' # Set the next final version here.
5+
FileVersion: '4.11.0' # Set the next final version here.
66
PackageSuffix: ''

examples/Demo/Shared/wwwroot/docs/WhatsNew.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,33 @@
2323
- Update to Fluent UI System Icons 1.1.265 (changes since 1.1.261)
2424

2525
**What's new (Name / Size(s) / Variant(s))**
26-
- Animal Paw Print / 16, 20, 24, 28, 32, 48 / Filled & Regular
2726
- Arrow Bounce / 12, 28, 48 / Filled & Regular
2827
- Arrow Clockwise Dashes / 28, 48 / Filled & Regular
29-
- Arrow Clockwise Dashes Settings / 16, 20, 24, 28, 32, 48 / Filled & Regular
3028
- Arrow Down Left / 12, 28 / Filled & Regular
3129
- Arrow Flow Diagonal Up Right / 12, 28, 48 / Filled & Regular
3230
- Arrow Up Right / 12, 28 / Filled & Regular
3331
- Arrow Up Right Dashes / 12, 20, 24, 28, 32, 48 / Filled & Regular
3432
- Arrow Wrap / 32 / Filled & Regular
3533
- Arrow Wrap Up To Down / 20, 32 / Filled & Regular
36-
- Chat Off / 16 / Filled & Regular
3734
- Coin Multiple / 16, 24 / Filled & Regular
3835
- Comment Badge / 16, 20, 24 / Filled & Regular
39-
- Connected / 24, 32 / Filled & Regular
4036
- Data Usage / 28, 32, 48 / Filled & Regular
4137
- Data Usage Checkmark / 16, 20, 24, 28, 32, 48 / Filled & Regular
4238
- Document One Page Multiple / 16, 20, 24 / Filled & Regular
4339
- Document One Page Multiple / 16, 20, 24 / Filled & Regular
4440
- Document One Page Multiple Sparkle / 16, 20, 24 / Filled & Regular
4541
- Document One Page Multiple Sparkle / 16, 20, 24 / Filled & Regular
46-
- Lightbulb / 32 / Light
4742
- Line Horizontal 1 Dash Dot Dash / 20 / Filled & Regular
4843
- Line Horizontal 1 Dot / 20 / Filled & Regular
4944
- Line Horizontal 3 / 16, 24, 28, 32, 48 / Filled & Regular
5045
- Navigation / 28, 32, 48 / Filled & Regular
5146
- Pause Circle / 16 / Filled & Regular
52-
- Square Text Arrow Repeat All / 16, 20, 24 / Filled & Regular
5347
- Stack / 28, 48 / Filled & Regular
5448
- Stack Off / 16, 20, 24, 28, 32, 48 / Filled & Regular
5549
- Text Bullet List Square / 28 / Filled & Regular
5650
- TextBox / 20, 28, 32, 48 / Filled & Regular
5751
- TextBox Checkmark / 16, 20, 24, 28, 32, 48 / Filled & Regular
58-
- Translate / 32 / Filled & Regular
52+
5953

6054
**What's updated (Name / Size(s) / Variant(s))**
6155
- Add Circle / 16 / Filled & Regular

0 commit comments

Comments
 (0)