Remove net8.o TFM

Update to latest SDKs and packages
microsoft · Oct 30, 2023 · ef4066d · ef4066d
1 parent 6bf40cd
commit ef4066d
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 49 deletions.
diff --git a/examples/Demo/Client/FluentUI.Demo.Client.csproj b/examples/Demo/Client/FluentUI.Demo.Client.csproj
@@ -3,15 +3,13 @@
   <PropertyGroup>
     <!-- Uncomment below line if you want to target all mentioned frameworks -->
     <!-- Targeting just one framework will speed up build time -->
-    <!--<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>-->
+    <!--<TargetFrameworks>net6.0;net7.0</TargetFrameworks>-->
     <!-- Comment below line if you enable line above -->
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <!-- We can't trim here because we want ALL icons and emjoi available and searchable -->
     <PublishTrimmed>false</PublishTrimmed>
-    <!-- Set False to avoid ConvertDllsToWebCil error -->
-    <WasmEnableWebcil>false</WasmEnableWebcil>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
@@ -20,13 +18,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.12" PrivateAssets="all" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.2.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-rc.2.*" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.13" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Demo/DocGenerator/FluentUI.Demo.Generators.csproj b/examples/Demo/DocGenerator/FluentUI.Demo.Generators.csproj
@@ -17,7 +17,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/examples/Demo/Server/FluentUI.Demo.Server.csproj b/examples/Demo/Server/FluentUI.Demo.Server.csproj
@@ -3,9 +3,9 @@
 	<PropertyGroup>
 		<!-- Uncomment below line if you want to target all mentioned frameworks -->
 		<!-- Targeting just one framework will speed up build time -->
-		<!--<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>-->
+		<!--<TargetFrameworks>net6.0;net7.0</TargetFrameworks>-->
 		<!-- Comment below line if you enable line above -->
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

diff --git a/examples/Demo/Shared/FluentUI.Demo.Shared.csproj b/examples/Demo/Shared/FluentUI.Demo.Shared.csproj
@@ -2,9 +2,9 @@
 	<PropertyGroup>
 		<!-- Uncomment below line if you want to target all mentioned frameworks -->
 		<!-- Targeting just one framework will speed up build time -->
-		<!--<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>-->
+		<!--<TargetFrameworks>net6.0;net7.0</TargetFrameworks>-->
 		<!-- Comment below line if you enable line above -->
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>latest</LangVersion>
@@ -37,19 +37,15 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.12" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-rc.2.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.13" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\src\Core\Microsoft.Fast.Components.FluentUI.csproj" />
 		<ProjectReference Include="..\DocGenerator\FluentUI.Demo.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<PackageReference Include="Markdig" Version="0.31.0" />
+		<PackageReference Include="Markdig" Version="0.33.0" />
 		<PackageReference Include="Microsoft.Fast.Components.FluentUI.Emojis" Version="3.*-*" />
-		<PackageReference Include="Microsoft.Fast.Components.FluentUI.Icons" version="3.0.1" />
+		<PackageReference Include="Microsoft.Fast.Components.FluentUI.Icons" version="3.2.2" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 		<TrimmerRootAssembly Include="Microsoft.Fast.Components.FluentUI" />
 	</ItemGroup>

diff --git a/src/Core/Microsoft.Fast.Components.FluentUI.csproj b/src/Core/Microsoft.Fast.Components.FluentUI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackageId>Microsoft.Fast.Components.FluentUI</PackageId>
 
     <Summary>A set of Blazor components wrapping Microsoft’s official Fluent UI Web Components. They implement the latest state of the Fluent design language, are built on FAST and work in every major browser.</Summary>
@@ -63,21 +63,13 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.13" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="System.Text.Json" Version="7.0.3" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-rc.2.*" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.*" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-rc.2.*" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.*" />
-    <PackageReference Include="System.Text.Json" Version="8.0.0-rc.2.*" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>

diff --git a/...rameworkAdapter/Microsoft.Fast.Components.FluentUI.DataGrid.EntityFrameworkAdapter.csproj b/...rameworkAdapter/Microsoft.Fast.Components.FluentUI.DataGrid.EntityFrameworkAdapter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<PackageId>Microsoft.Fast.Components.FluentUI.DataGrid.EntityFrameworkAdapter</PackageId>
 		<Authors>Microsoft</Authors>
 		<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
@@ -35,11 +35,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework)=='net7.0' ">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
-	</ItemGroup>
-
-	<ItemGroup Condition="$(TargetFramework)=='net8.0' ">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.2.*" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Extensions/DesignToken.Generator/Microsoft.Fast.Components.FluentUI.Generators.csproj b/src/Extensions/DesignToken.Generator/Microsoft.Fast.Components.FluentUI.Generators.csproj
@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Templates/Microsoft.Fast.Templates.FluentUI.csproj b/src/Templates/Microsoft.Fast.Templates.FluentUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<Authors>Microsoft</Authors>
 		<ContentTargetFolders>Content</ContentTargetFolders>
 		<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
@@ -12,10 +12,10 @@
 		<PackageId>Microsoft.Fast.Templates.FluentUI</PackageId>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/microsoft/fluentui-blazor</PackageProjectUrl>
-		<PackageTags>templates;fast;fast-blazor;blazor;fluentui;web-assembly</PackageTags>
+		<PackageTags>templates;blazor;fluentui;web-components;web-assembly</PackageTags>
 		<PackageType>Template</PackageType>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<Title>Microsoft FAST Fluent UI Blazor Templates</Title>
+		<Title>Microsoft Fluent UI Blazor Templates</Title>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageIcon>icon.png</PackageIcon>
 	</PropertyGroup>

diff --git a/tests/Core/Microsoft.Fast.Components.FluentUI.Tests.csproj b/tests/Core/Microsoft.Fast.Components.FluentUI.Tests.csproj
@@ -10,19 +10,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="bunit" Version="1.20.8" />
-    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="bunit" Version="1.24.10" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>