Skip to content

Commit 9deeb89

Browse files
vnbaaijvnbaaij
committed
Merge branch 'dev'
2 parents f6fb727 + b6f134c commit 9deeb89

File tree

119 files changed

+3654
-3120
lines changed

Some content is hidden

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

119 files changed

+3654
-3120
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
reporttypes: 'HtmlInline;MarkdownSummaryGithub'
134134

135135
- name: Upload coverage report
136-
uses: actions/upload-artifact@v2
136+
uses: actions/upload-artifact@v4
137137
with:
138138
name: CoverageReports
139139
path: CoverageReports

‎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.0</VersionFile>
16-
<VersionPrefix>4.10.0</VersionPrefix>
15+
<VersionFile>4.10.1</VersionFile>
16+
<VersionPrefix>4.10.1</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>

‎Directory.Packages.props

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
<RuntimeVersion8>8.0.0</RuntimeVersion8>
55
<AspNetCoreVersion8>8.0.8</AspNetCoreVersion8>
66
<EfCoreVersion8>8.0.8</EfCoreVersion8>
7-
<RuntimeVersion9>9.0.0-preview.7.24405.7</RuntimeVersion9>
8-
<AspNetCoreVersion9>9.0.0-preview.7.24406.2</AspNetCoreVersion9>
9-
<EfCoreVersion9>9.0.0-preview.7.24405.3</EfCoreVersion9>
7+
<RuntimeVersion9>9.0.0-rc.1.24431.7</RuntimeVersion9>
8+
<AspNetCoreVersion9>9.0.0-rc.1.24452.1</AspNetCoreVersion9>
9+
<EfCoreVersion9>9.0.0-rc.1.24451.1</EfCoreVersion9>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<!-- For Sample Apps -->
13-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
14-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.9.3" />
13+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.0" />
14+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.10.0" />
1515
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
1616
<!-- Test dependencies -->
1717
<PackageVersion Include="bunit" Version="1.31.3" />
1818
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
19-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
19+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2020
<PackageVersion Include="xunit" Version="2.9.0" />
2121
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
2222
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
@@ -27,7 +27,6 @@
2727
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
2828
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" />
2929
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
30-
3130
</ItemGroup>
3231
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
3332
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(RuntimeVersion8)" />
@@ -66,4 +65,4 @@
6665
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion9)" />
6766
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
6867
</ItemGroup>
69-
</Project>
68+
</Project>

‎Microsoft.FluentUI.sln

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.Demo.AssetExplorer
4343
EndProject
4444
Project("{54A90642-561A-4BB1-A94E-469ADEE60C69}") = "Microsoft.FluentUI.AspNetCore.Components.Assets", "src\Core.Assets\Microsoft.FluentUI.AspNetCore.Components.Assets.esproj", "{292081C2-5076-467C-AEFF-12DC0617531A}"
4545
EndProject
46-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{E7FD7A3C-3C34-4DF6-961F-D731B0164CE4}"
47-
EndProject
48-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipelines", "pipelines", "{2A9638B8-C6D0-455C-B6B1-72D734664973}"
49-
EndProject
5046
Global
5147
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5248
Debug|Any CPU = Debug|Any CPU
@@ -121,7 +117,6 @@ Global
121117
{17F26C55-E329-4117-B64D-0393E912FFFE} = {9468ADD1-3660-410D-8231-6F89384D135D}
122118
{E4E62EAA-38FC-48FE-B63E-EB4ABAD660D2} = {17F26C55-E329-4117-B64D-0393E912FFFE}
123119
{292081C2-5076-467C-AEFF-12DC0617531A} = {DF88C07D-46D7-4DEC-ACE4-409217634E57}
124-
{2A9638B8-C6D0-455C-B6B1-72D734664973} = {E7FD7A3C-3C34-4DF6-961F-D731B0164CE4}
125120
EndGlobalSection
126121
GlobalSection(ExtensibilityGlobals) = postSolution
127122
SolutionGuid = {420693A7-C2FD-498C-8E78-4B65CC25389A}

‎WHATSNEW.md

Lines changed: 104 additions & 1264 deletions
Large diffs are not rendered by default.

‎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.0' # Set the next final version here.
5+
FileVersion: '4.10.1' # Set the next final version here.
66
PackageSuffix: ''

‎examples/Demo/Shared/Components/CodeSnippet.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
3131
if (firstRender)
3232
{
3333

34-
await JSRuntime.InvokeVoidAsync("hljs.highlightElement", codeElement);
3534
_jsModule = await JSRuntime.InvokeAsync<IJSObjectReference>("import",
3635
"./_content/FluentUI.Demo.Shared/Components/CodeSnippet.razor.js");
36+
await _jsModule.InvokeVoidAsync("highlightElement", codeElement);
3737
await _jsModule.InvokeVoidAsync("addCopyButton");
3838
}
3939
}

‎examples/Demo/Shared/Components/CodeSnippet.razor.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export function addCopyButton() {
1+
export function addCopyButton() {
22
var snippets = document.querySelectorAll('.snippet');
33
var numberOfSnippets = snippets.length;
44
for (var i = 0; i < numberOfSnippets; i++) {
@@ -19,3 +19,9 @@
1919
}
2020
}
2121
}
22+
23+
export function highlightElement(id) {
24+
if (hljs) {
25+
hljs.highlightElement(id);
26+
}
27+
}

‎examples/Demo/Shared/Components/MarkdownSection.razor.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ export function highlight() {
33
var numberOfPreTags = preTagList.length;
44
for (var i = 0; i < numberOfPreTags; i++) {
55
var codeTag = preTagList[i].getElementsByTagName('code');
6-
hljs.highlightElement(codeTag[0]);
6+
if (hljs) {
7+
hljs.highlightElement(codeTag[0]);
8+
}
79
}
810
}
911

0 commit comments

Comments
 (0)