Skip to content

Commit 395b667

Browse files
committed
Merge branch 'dev'
2 parents 41f4103 + b6bc531 commit 395b667

File tree

143 files changed

+1116
-769
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+1116
-769
lines changed

.azuredevops/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 2
2+
3+
# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
4+
enable-campaigned-updates: false
5+
enable-security-updates: false

.github/workflows/build-core-lib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/setup-dotnet@v4
5353
with:
5454
dotnet-version: 10.0.x
55-
dotnet-quality: preview
55+
dotnet-quality: ga
5656

5757
# Build
5858

.github/workflows/codeql-analysis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,15 @@ jobs:
3838
- name: Checkout repository
3939
uses: actions/checkout@v3
4040

41+
- name: Update TargetFrameworks to net9.0
42+
shell: pwsh
43+
run: |
44+
.\.github\workflows\update-target-frameworks.ps1 -newTarget "net9.0"
45+
4146
- name: Setup .NET
4247
uses: actions/setup-dotnet@v4
4348
with:
44-
dotnet-version: 10.0.x
45-
dotnet-quality: preview
49+
dotnet-version: 9.0.x
4650

4751
- name: Initialize CodeQL
4852
uses: github/codeql-action/init@v3
@@ -52,7 +56,7 @@ jobs:
5256
- if: matrix.language == 'csharp'
5357
name: Manually build CSharp on .NET
5458
run: |
55-
dotnet build Microsoft.FluentUI.sln
59+
dotnet build Microsoft.FluentUI.sln -c Release
5660
5761
- name: Perform CodeQL Analysis
5862
uses: github/codeql-action/analyze@v3

.github/workflows/deploy_demo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/setup-dotnet@v4
4848
with:
4949
dotnet-version: 10.0.x
50-
dotnet-quality: preview
50+
dotnet-quality: ga
5151

5252
- name: NPM Install
5353
uses: actions/setup-node@v4

.github/workflows/deploy_preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/setup-dotnet@v4
4949
with:
5050
dotnet-version: 10.0.x
51-
dotnet-quality: preview
51+
dotnet-quality: ga
5252

5353
- name: NPM Install
5454
uses: actions/setup-node@v4
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
param(
2+
[Parameter(Mandatory=$true)]
3+
[string]$newTarget
4+
)
5+
6+
Write-Host "Updating TargetFrameworks to $newTarget..."
7+
8+
Get-ChildItem -Recurse -Filter *.csproj | ForEach-Object {
9+
$content = Get-Content $_.FullName -Raw
10+
if ($content -match '<TargetFrameworks>.*?</TargetFrameworks>') {
11+
$content = $content -replace '<TargetFrameworks>.*?</TargetFrameworks>', "<TargetFrameworks>$newTarget</TargetFrameworks>"
12+
Set-Content -Path $_.FullName -Value $content -NoNewline
13+
Write-Host "Updated $($_.FullName)"
14+
}
15+
}
16+
17+
Write-Host "Done updating TargetFrameworks."

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.13.1</VersionFile>
16-
<VersionPrefix>4.13.1</VersionPrefix>
15+
<VersionFile>4.13.2</VersionFile>
16+
<VersionPrefix>4.13.2</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>

Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<RuntimeVersion9>9.0.9</RuntimeVersion9>
88
<AspNetCoreVersion9>9.0.9</AspNetCoreVersion9>
99
<EfCoreVersion9>9.0.9</EfCoreVersion9>
10-
<RuntimeVersion10>10.0.0-rc.1.25451.107</RuntimeVersion10>
11-
<AspNetCoreVersion10>10.0.0-rc.1.25451.107</AspNetCoreVersion10>
12-
<EfCoreVersion10>10.0.0-rc.1.25451.107</EfCoreVersion10>
10+
<RuntimeVersion10>10.0.0</RuntimeVersion10>
11+
<AspNetCoreVersion10>10.0.0</AspNetCoreVersion10>
12+
<EfCoreVersion10>10.0.0</EfCoreVersion10>
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<!-- For Sample Apps -->
@@ -88,4 +88,4 @@
8888
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion10)" />
8989
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
9090
</ItemGroup>
91-
</Project>
91+
</Project>

WHATSNEW.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,37 @@
1+
## V4.13.2
2+
3+
### General
4+
- \[Chore\] Use NET 10 GA SDK ([#4279](https://github.com/microsoft/fluentui-blazor/pull/4279))
5+
- \[Chore\] Fix CodeQL ([#4315](https://github.com/microsoft/fluentui-blazor/pull/4315))
6+
- \[Chore\] Configure Dependabot settings ([#4320](https://github.com/microsoft/fluentui-blazor/pull/4320))
7+
- \[Templates\] Fix .net10 web app rename issue ([#4310](https://github.com/microsoft/fluentui-blazor/pull/4310))
8+
- \[Templates\] Fix Client projects in Web App templates ([#4328](https://github.com/microsoft/fluentui-blazor/pull/4328))
9+
- \[Templates\] Adjust _Imports include condition ([#4329](https://github.com/microsoft/fluentui-blazor/pull/4329))
10+
- \[Templates\] Fix icon in Web App 9 and 10 templates ([#4337](https://github.com/microsoft/fluentui-blazor/pull/4337))
11+
12+
### Components
13+
- \[AccordionItem\] Add HeadingTooltip parameter ([#4306](https://github.com/microsoft/fluentui-blazor/pull/4306))
14+
- \[Combobox\] Fix binding to a value not in the list items ([#4353](https://github.com/microsoft/fluentui-blazor/pull/4353))
15+
- \[Dialog\] Fix error when module hasn't finished loading ([#4324](https://github.com/microsoft/fluentui-blazor/pull/4324))
16+
- \[Dialog\] Update methods to accept an IDialogReference interface ([#4316](https://github.com/microsoft/fluentui-blazor/pull/4316))
17+
- \[DataGrid\] Add a SelectColumn Comparer property ([#4344](https://github.com/microsoft/fluentui-blazor/pull/4344))
18+
- \[DataGrid\] Asynchronous IQueryable based loading enhancements ([#4343](https://github.com/microsoft/fluentui-blazor/pull/4343))
19+
- \[Grid\] Use more presice values for width percentages ([#4299](https://github.com/microsoft/fluentui-blazor/pull/4299))
20+
- \[SortableList\] Handle JS errors in a better way ([#4286](https://github.com/microsoft/fluentui-blazor/pull/4286))
21+
- \[Splitter\] Add support for touch events ([#4338](https://github.com/microsoft/fluentui-blazor/pull/4338))
22+
23+
### Icons and Emoji
24+
- Update to Fluent UI System Icons 1.1.315
25+
See the commit history in the Fluent UI System Icons repository [commit history](https://github.com/microsoft/fluentui-system-icons/commits/main/) for the full list of changes.
26+
27+
--------------
28+
129
## V4.13.1
230

31+
### General
332
- \[General\] Fix ADO pipelines ([#4227](https://github.com/microsoft/fluentui-blazor/pull/4227))
433
- \[Templates\] Fix .NET 10 Web App template ([#4242](https://github.com/microsoft/fluentui-blazor/pull/4242))
534

6-
### General
7-
835
### Components
936
- \[AutoComplete\] Override FocusAsync in FluentAutoComplete ([#4230](https://github.com/microsoft/fluentui-blazor/pull/4230))
1037
- \[Combobox\] Fix presetting option ([#4255](https://github.com/microsoft/fluentui-blazor/pull/4255))

eng/pipelines/build-all-lib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ extends:
141141
displayName: 'Install .NET 10.0'
142142
inputs:
143143
version: 10.0.x
144-
includePreviewVersions: true
144+
includePreviewVersions: false
145145

146146
# Set version number (exclude some folders)
147147
- task: PowerShell@2

0 commit comments

Comments
 (0)