Merge branch 'dev'

microsoft · Sep 26, 2024 · 9deeb89 · 9deeb89
2 parents f6fb727 + b6f134c
commit 9deeb89
Show file tree

Hide file tree

Showing 119 changed files with 3,654 additions and 3,120 deletions.
diff --git a/.github/workflows/build-core-lib.yml b/.github/workflows/build-core-lib.yml
@@ -133,7 +133,7 @@ jobs:
          reporttypes: 'HtmlInline;MarkdownSummaryGithub'
 
      - name: Upload coverage report
-       uses: actions/upload-artifact@v2
+       uses: actions/upload-artifact@v4
        with:
          name: CoverageReports
          path: CoverageReports

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,8 +12,8 @@
 		<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 
-		<VersionFile>4.10.0</VersionFile>
-		<VersionPrefix>4.10.0</VersionPrefix>
+		<VersionFile>4.10.1</VersionFile>
+		<VersionPrefix>4.10.1</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<AssemblyVersion>$(VersionFile)</AssemblyVersion>
 		<FileVersion>$(VersionFile)</FileVersion>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,19 +4,19 @@
     <RuntimeVersion8>8.0.0</RuntimeVersion8>
     <AspNetCoreVersion8>8.0.8</AspNetCoreVersion8>
     <EfCoreVersion8>8.0.8</EfCoreVersion8>
-    <RuntimeVersion9>9.0.0-preview.7.24405.7</RuntimeVersion9>
-    <AspNetCoreVersion9>9.0.0-preview.7.24406.2</AspNetCoreVersion9>
-    <EfCoreVersion9>9.0.0-preview.7.24405.3</EfCoreVersion9>
+    <RuntimeVersion9>9.0.0-rc.1.24431.7</RuntimeVersion9>
+    <AspNetCoreVersion9>9.0.0-rc.1.24452.1</AspNetCoreVersion9>
+    <EfCoreVersion9>9.0.0-rc.1.24451.1</EfCoreVersion9>
   </PropertyGroup>
   <ItemGroup>
     <!-- For Sample Apps -->
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.9.3" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.0" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.10.0" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
     <!-- Test dependencies -->
     <PackageVersion Include="bunit" Version="1.31.3" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="xunit" Version="2.9.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
@@ -27,7 +27,6 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" />
     <PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
-
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(RuntimeVersion8)" />
@@ -66,4 +65,4 @@
     <PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion9)" />
     <PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Microsoft.FluentUI.sln b/Microsoft.FluentUI.sln
@@ -43,10 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.Demo.AssetExplorer
 EndProject
 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}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{E7FD7A3C-3C34-4DF6-961F-D731B0164CE4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipelines", "pipelines", "{2A9638B8-C6D0-455C-B6B1-72D734664973}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -121,7 +117,6 @@ Global
 		{17F26C55-E329-4117-B64D-0393E912FFFE} = {9468ADD1-3660-410D-8231-6F89384D135D}
 		{E4E62EAA-38FC-48FE-B63E-EB4ABAD660D2} = {17F26C55-E329-4117-B64D-0393E912FFFE}
 		{292081C2-5076-467C-AEFF-12DC0617531A} = {DF88C07D-46D7-4DEC-ACE4-409217634E57}
-		{2A9638B8-C6D0-455C-B6B1-72D734664973} = {E7FD7A3C-3C34-4DF6-961F-D731B0164CE4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {420693A7-C2FD-498C-8E78-4B65CC25389A}

diff --git a/WHATSNEW.md b/WHATSNEW.md
diff --git a/eng/pipelines/version.yml b/eng/pipelines/version.yml
@@ -2,5 +2,5 @@ variables:
   # File and Package version
   # dev  branch: 1.2.4-Preview-23282-1'    (PackageSuffix is always ignored in Dev branch)
   # main branch: 1.2.4-RC.1'               (PackageSuffix is ignored, if empty, in Main branch)
-  FileVersion: '4.10.0'   # Set the next final version here.
+  FileVersion: '4.10.1'   # Set the next final version here.
   PackageSuffix: ''
diff --git a/examples/Demo/Shared/Components/CodeSnippet.razor.cs b/examples/Demo/Shared/Components/CodeSnippet.razor.cs
@@ -31,9 +31,9 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender)
         {
 
-            await JSRuntime.InvokeVoidAsync("hljs.highlightElement", codeElement);
             _jsModule = await JSRuntime.InvokeAsync<IJSObjectReference>("import",
                 "./_content/FluentUI.Demo.Shared/Components/CodeSnippet.razor.js");
+            await _jsModule.InvokeVoidAsync("highlightElement", codeElement);
             await _jsModule.InvokeVoidAsync("addCopyButton");
         }
     }

diff --git a/examples/Demo/Shared/Components/CodeSnippet.razor.js b/examples/Demo/Shared/Components/CodeSnippet.razor.js
@@ -1,4 +1,4 @@
-export function addCopyButton() {
+export function addCopyButton() {
     var snippets = document.querySelectorAll('.snippet');
     var numberOfSnippets = snippets.length;
     for (var i = 0; i < numberOfSnippets; i++) {
@@ -19,3 +19,9 @@
         }
     }
 }
+
+export function highlightElement(id) {
+    if (hljs) {
+        hljs.highlightElement(id);
+    }
+}
diff --git a/examples/Demo/Shared/Components/MarkdownSection.razor.js b/examples/Demo/Shared/Components/MarkdownSection.razor.js
@@ -3,7 +3,9 @@ export function highlight() {
     var numberOfPreTags = preTagList.length;
     for (var i = 0; i < numberOfPreTags; i++) {
         var codeTag = preTagList[i].getElementsByTagName('code');
-        hljs.highlightElement(codeTag[0]);
+        if (hljs) {
+            hljs.highlightElement(codeTag[0]);
+        }
     }
 }