[General] Re-add net10.0 TFM and update to latest SDKs/NuGet packages

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

@@ -25,7 +25,7 @@ on:
 env:
   PROJECTS: "./src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj"
   TESTS: "./tests/Core/Microsoft.FluentUI.AspNetCore.Components.Tests.csproj"
-  DOTNET_VERSION: "net9.0"
+  DOTNET_VERSION: "net10.0"
 
 jobs:
   Build:
@@ -48,17 +48,17 @@ jobs:
      #    dotnet-version: 8.0.x
      #    dotnet-quality: ga
 
-     - name: Setup .NET 9.0
-       uses: actions/setup-dotnet@v4
-       with:
-        dotnet-version: 9.0.205
-        # dotnet-quality: ga
-
-     # - name: Setup .NET 10.0
+     # - name: Setup .NET 9.0
      #   uses: actions/setup-dotnet@v4
      #   with:
-     #    dotnet-version: 10.0.x
-     #    dotnet-quality: preview
+     #    dotnet-version: 9.0.x
+     #    dotnet-quality: ga
+
+     - name: Setup .NET 10.0
+       uses: actions/setup-dotnet@v4
+       with:
+        dotnet-version: 10.0.x
+        dotnet-quality: preview
 
      # Build
 
@@ -134,7 +134,7 @@ jobs:
      - name: Report Generator
        uses: danielpalme/[email protected]
        with:
-         reports: '**/coverage.cobertura.xml;**/coverage.net8.0.cobertura.xml;**/coverage.net9.0.cobertura.xml'
+         reports: '**/coverage.cobertura.xml;**/coverage.net8.0.cobertura.xml;**/coverage.net9.0.cobertura.xml;**/coverage.net10.0.cobertura.xml'
          targetdir: 'CoverageReports'
          title: 'Unit Tests Code Coverage'
          classfilters: '-Microsoft.FluentUI.AspNetCore.Components.DesignTokens.*'

.github/workflows/codeql-analysis.yml

@@ -41,7 +41,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.205
+        dotnet-version: 9.0.x
+        dotnet-quality: ga
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

.github/workflows/deploy_demo.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Build and deploy Demo site
     env:
-      DOTNET_VERSION: "net9.0"
+      DOTNET_VERSION: "net10.0"
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
       DOTNET_NOLOGO: true
@@ -37,17 +37,17 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
 
-      - name: .NET Setup SDKs
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 9.0.205
-          # dotnet-quality: ga
-
-      # - name: Setup .NET 10.0
+      # - name: .NET Setup SDKs
       #   uses: actions/setup-dotnet@v4
       #   with:
-      #     dotnet-version: 10.0.x
-      #     dotnet-quality: preview
+      #     dotnet-version: 9.0.x
+      #     dotnet-quality: ga
+
+      - name: Setup .NET 10.0
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 10.0.x
+          dotnet-quality: preview
 
       - name: NPM Install
         uses: actions/setup-node@v4

.github/workflows/deploy_preview.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Build and deploy Demo site
     env:
-      DOTNET_VERSION: "net9.0"
+      DOTNET_VERSION: "net10.0"
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
       DOTNET_NOLOGO: true
@@ -38,17 +38,17 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
 
-      - name: .NET Setup SDKs
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 9.0.205
-          # dotnet-quality: ga
-
-      # - name: Setup .NET 10.0
+      # - name: .NET Setup SDKs
       #   uses: actions/setup-dotnet@v4
       #   with:
-      #     dotnet-version: 10.0.x
-      #     dotnet-quality: preview
+      #     dotnet-version: 9.0.205
+      #     dotnet-quality: ga
+
+      - name: Setup .NET 10.0
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 10.0.x
+          dotnet-quality: preview
 
       - name: NPM Install
         uses: actions/setup-node@v4

Directory.Packages.props

@@ -2,39 +2,39 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <RuntimeVersion8>8.0.0</RuntimeVersion8>
-    <AspNetCoreVersion8>8.0.18</AspNetCoreVersion8>
-    <EfCoreVersion8>8.0.18</EfCoreVersion8>
-    <RuntimeVersion9>9.0.7</RuntimeVersion9>
-    <AspNetCoreVersion9>9.0.7</AspNetCoreVersion9>
-    <EfCoreVersion9>9.0.7</EfCoreVersion9>
-    <RuntimeVersion10>10.0.0-preview.6.25358.103</RuntimeVersion10>
-    <AspNetCoreVersion10>10.0.0-preview.6.25358.103</AspNetCoreVersion10>
-    <EfCoreVersion10>10.0.0-preview.6.25358.103</EfCoreVersion10>
+    <AspNetCoreVersion8>8.0.20</AspNetCoreVersion8>
+    <EfCoreVersion8>8.0.20</EfCoreVersion8>
+    <RuntimeVersion9>9.0.9</RuntimeVersion9>
+    <AspNetCoreVersion9>9.0.9</AspNetCoreVersion9>
+    <EfCoreVersion9>9.0.9</EfCoreVersion9>
+    <RuntimeVersion10>10.0.0-rc.1.25451.107</RuntimeVersion10>
+    <AspNetCoreVersion10>10.0.0-rc.1.25451.107</AspNetCoreVersion10>
+    <EfCoreVersion10>10.0.0-rc.1.25451.107</EfCoreVersion10>
   </PropertyGroup>
   <ItemGroup>
     <!-- For Sample Apps -->
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.12.0" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.12.0" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.12.1" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.12.1" />
     <!-- Test dependencies -->
     <PackageVersion Include="bunit" Version="1.38.5" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <!-- Shared dependencies -->
-    <PackageVersion Include="Markdig.Signed" Version="0.41.0" />
+    <PackageVersion Include="Markdig.Signed" Version="0.41.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.OData.Client" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.OData.Client" Version="8.4.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
     <PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(RuntimeVersion8)" />
     <PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion8)" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.6" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <!-- Build dependencies -->
@@ -88,4 +88,4 @@
     <PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion10)" />
     <PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
   </ItemGroup>
-</Project>
+</Project>

Microsoft.FluentUI.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.33808.371
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11010.61 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{141FEF3E-C665-4D50-8E51-B9507C98040E}"
 EndProject

eng/pipelines/build-all-lib.yml

@@ -131,7 +131,7 @@ extends:
         - task: UseDotNet@2
           displayName: 'Install .NET 9.0'
           inputs:
-            version: 9.0.205
+            version: 9.0.x
             includePreviewVersions: false
 
         - task: UseDotNet@2

eng/pipelines/build-core-lib.yml

@@ -164,7 +164,7 @@ extends:
         - task: UseDotNet@2
           displayName: 'Install .NET 9.0'
           inputs:
-            version: 9.0.205
+            version: 9.0.x
             includePreviewVersions: false
 
         - task: UseDotNet@2

examples/Demo/AssetExplorer/FluentUI.Demo.AssetExplorer.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

examples/Demo/Client/FluentUI.Demo.Client.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>latest</LangVersion>

examples/Demo/Server/FluentUI.Demo.Server.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-      <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+      <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>latest</LangVersion>

examples/Demo/Shared/FluentUI.Demo.Shared.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-      <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+      <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>latest</LangVersion>

global.bak

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.301",
+    "version": "9.0.305",
     "allowPrerelease": true,
     "rollForward": "latestPatch"
   }

src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>Microsoft.FluentUI.AspNetCore.Components</PackageId>
 
     <Summary>A Blazor component library leveraging Microsoft’s Fluent Design System UI. Use the look of modern Microsoft products in your Blazor applications</Summary>

src/Extensions/DataGrid.EntityFrameworkAdapter/Microsoft.FluentUI.AspNetCore.Components.DataGrid.EntityFrameworkAdapter.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>Microsoft.FluentUI.AspNetCore.Components.DataGrid.EntityFrameworkAdapter</PackageId>
     <Authors>Microsoft</Authors>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>

src/Extensions/DataGrid.ODataAdapter/Microsoft.FluentUI.AspNetCore.Components.DataGrid.ODataAdapter.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>Microsoft.FluentUI.AspNetCore.Components.DataGrid.ODataAdapter</PackageId>
     <Authors>Microsoft</Authors>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>

src/Templates/templates/blazorweb-csharp-10/.template.config/dotnetcli.host.json

@@ -53,6 +53,10 @@
     "UseProgramMain": {
       "longName": "use-program-main",
       "shortName": ""
+    },
+    "LocalhostTld": {
+      "longName": "localhost-tld",
+      "shortName": ""
     }
   },
   "usageExamples": [

src/Templates/templates/blazorweb-csharp-10/.template.config/ide.host.json

@@ -25,6 +25,12 @@
       "isVisible": true,
       "persistenceScope": "shared",
       "persistenceScopeName": "Microsoft"
+    },
+    {
+      "id": "LocalhostTld",
+      "isVisible": true,
+      "persistenceScope": "shared",
+      "persistenceScopeName": "Microsoft"
     }
   ]
 }

src/Templates/templates/blazorweb-csharp-10/.template.config/localize/templatestrings.cs.json

@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Určuje, jestli se má vypnout protokol HTTPS. Tato možnost platí jenom v případě, že se pro --auth nepoužívá jednotlivec.",
   "symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně",
   "symbols/UseProgramMain/description": "Určuje, jestli se má místo příkazů nejvyšší úrovně generovat explicitní třída Program a metoda Main.",
+  "symbols/LocalhostTld/displayName": "Použití TLD .dev.localhost v adrese URL aplikace",
+  "symbols/LocalhostTld/description": "Určuje, jestli se má název projektu zkombinovat s TLD .dev.localhost v adrese URL aplikace pro místní vývoj, například https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
   "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"
 }

src/Templates/templates/blazorweb-csharp-10/.template.config/localize/templatestrings.de.json

@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn \"Individual\" nicht für \"--auth\" verwendet wird.",
   "symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden",
   "symbols/UseProgramMain/description": "Gibt an, ob anstelle von Anweisungen der obersten Ebene eine explizite Programmklasse und eine Main-Methode generiert werden soll.",
+  "symbols/LocalhostTld/displayName": "Verwenden der .dev.localhost-TLD in der Anwendungs-URL",
+  "symbols/LocalhostTld/description": "Gibt an, ob der Projektname mit der .dev.localhost-TLD in der Anwendungs-URL für die lokale Entwicklung kombiniert werden soll, z. B. https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
   "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen"
 }

src/Templates/templates/blazorweb-csharp-10/.template.config/localize/templatestrings.en.json

@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual isn't used for --auth.",
   "symbols/UseProgramMain/displayName": "Do not use _top-level statements",
   "symbols/UseProgramMain/description": "Whether to generate an explicit Program class and Main method instead of top-level statements.",
+  "symbols/LocalhostTld/displayName": "Use the .dev.localhost TLD in the application URL",
+  "symbols/LocalhostTld/description": "Whether to combine the project name with the .dev.localhost TLD in the application URL for local development, e.g. https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restore NuGet packages required by this project.",
   "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"
 }

src/Templates/templates/blazorweb-csharp-10/.template.config/localize/templatestrings.es.json

@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Si se va a desactivar HTTPS. Esta opción solo se aplica si individual no se usa para --auth.",
   "symbols/UseProgramMain/displayName": "No usar instrucciones de _nivel superior",
   "symbols/UseProgramMain/description": "Indica si se debe generar una clase Program explícita y un método Main en lugar de instrucciones de nivel superior.",
+  "symbols/LocalhostTld/displayName": "Usar el TLD .dev.localhost en la dirección URL de la aplicación",
+  "symbols/LocalhostTld/description": "Indica si se debe combinar el nombre del proyecto con el TLD .dev.localhost en la dirección URL de la aplicación para el desarrollo local, por ejemplo, https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
   "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\""
 }

src/Templates/templates/blazorweb-csharp-10/.template.config/localize/templatestrings.fr.json

@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si Individual n’est pas utilisé pour --auth.",
   "symbols/UseProgramMain/displayName": "N’utilisez pas _d’instructions de niveau supérieur.",
   "symbols/UseProgramMain/description": "Indique s’il faut générer une classe Programme explicite et une méthode Main au lieu d’instructions de niveau supérieur.",
+  "symbols/LocalhostTld/displayName": "Utilisez le TLD .dev.localhost dans l’URL de l’application",
+  "symbols/LocalhostTld/description": "Indique s’il faut combiner le nom du projet avec le TLD .dev.localhost dans l’URL de l’application pour le développement local, par exemple https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
   "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »"
 }

src/Templates/templates/blazorweb-csharp-10/.template.config/localize/templatestrings.it.json

@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se Individual non viene usata per --auth.",
   "symbols/UseProgramMain/displayName": "Non usare_istruzioni di primo livello",
   "symbols/UseProgramMain/description": "Indica se generare una classe Program esplicita e un metodo Main anziché istruzioni di primo livello.",
+  "symbols/LocalhostTld/displayName": "Usa il TLD .dev.localhost nell'URL dell'applicazione",
+  "symbols/LocalhostTld/description": "Indicare se combinare il nome del progetto con il TLD .dev.localhost nell'URL dell'applicazione per lo sviluppo in locale, ad esempio https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
   "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'"
 }

src/Templates/templates/blazorweb-csharp-10/.template.config/localize/templatestrings.ja.json

@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、Individual が --auth に使用されていない場合にのみ適用されます。",
   "symbols/UseProgramMain/displayName": "最上位レベルのステートメントを使用しない(_T)",
   "symbols/UseProgramMain/description": "最上位レベルのステートメントではなく、明示的な Program クラスと Main メソッドを生成するかどうか。",
+  "symbols/LocalhostTld/displayName": "アプリケーション URL で .dev.localhost TLD を使用する",
+  "symbols/LocalhostTld/description": "ローカル開発用のアプリケーション URL 内で、プロジェクト名を .dev.localhost TLD と組み合わせるかどうか (例: https://myapp.dev.localhost:12345)。",
   "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する"
 }

src/Templates/templates/blazorweb-csharp-10/.template.config/localize/templatestrings.ko.json

@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 개별 항목이 --auth에 사용되지 않는 경우에만 적용됩니다.",
   "symbols/UseProgramMain/displayName": "최상위 문 사용 안 함(_T)",
   "symbols/UseProgramMain/description": "최상위 문 대신 명시적 Program 클래스 및 Main 메서드를 생성할지 여부입니다.",
+  "symbols/LocalhostTld/displayName": "애플리케이션 URL에서 .dev.localhost TLD를 사용하세요.",
+  "symbols/LocalhostTld/description": "로컬 개발을 위한 애플리케이션 URL에서 프로젝트 이름과 .dev.localhost TLD를 결합할지 여부, 예를 들어 https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행"
 }