Merge pull request #5 from johnt84/UpgradeToNet8

Upgrade to .Net 8
johnt84 · Jun 9, 2024 · e47069e · e47069e
2 parents 128b19b + 5f314cf
commit e47069e
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 34 deletions.
diff --git a/.github/workflows/wordleblazorapp.yml b/.github/workflows/wordleblazorapp.yml
@@ -12,7 +12,7 @@ env:
   AZURE_WEBAPP_PACKAGE_PATH: WordleBlazorWASMApp/publish
   AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.wordleblazorapp_b23f }}
   CONFIGURATION: Release
-  DOTNET_CORE_VERSION: 6.0.x
+  DOTNET_CORE_VERSION: 8.0.x
   WORKING_DIRECTORY: WordleBlazorWASMApp
 jobs:
   build-and-deploy:

diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@ Simple open source clone of the popular Wordle game developed to demo how the wo
 <a href="https://www.powerlanguage.co.uk/wordle/" class="underline font-bold">You can play the original game here</a>
 
 * Three GUI projects developed using Blazor
-    * Blazor WASM with PWA/.Net 6 (Is what is currently deployed)
-    * Blazor Server/.Net 6
-    * Blazor MAUI/.Net 6
-* Game engine is a Class Library project developed using .Net 6
-* Unit Test app which unit tests the Wordle Game engine. Uses MS Test/.Net 6 and AutoMoq
+    * Blazor WASM with PWA/.Net 8 (Is what is currently deployed)
+    * Blazor Server/.Net 8
+    * Blazor MAUI/.Net 8
+* Game engine is a Class Library project developed using .Net 8
+* Unit Test app which unit tests the Wordle Game engine. Uses MS Test/.Net 8 and AutoMoq
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/WordleBlazorMaui/WordleBlazorMaui/WordleBlazorMaui.csproj b/WordleBlazorMaui/WordleBlazorMaui/WordleBlazorMaui.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>WordleBlazorMaui</RootNamespace>
 		<UseMaui>true</UseMaui>
@@ -58,8 +58,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/WordleBlazorServerApp/WordleBlazorServerApp/Pages/About.razor b/WordleBlazorServerApp/WordleBlazorServerApp/Pages/About.razor
@@ -4,7 +4,7 @@
 
 <div>
     <p class="about_text">
-        This is a simple open source clone of the popular Wordle game developed to demo how the wordle game would work using a Blazor Server/.Net 6 app.
+        This is a simple open source clone of the popular Wordle game developed to demo how the wordle game would work using a Blazor Server/.Net 8 app.
     </p>
 
     <table>

diff --git a/WordleBlazorServerApp/WordleBlazorServerApp/WordleBlazorServerApp.csproj b/WordleBlazorServerApp/WordleBlazorServerApp/WordleBlazorServerApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/WordleBlazorWASMApp/WordleBlazorWASMApp/Pages/About.razor b/WordleBlazorWASMApp/WordleBlazorWASMApp/Pages/About.razor
@@ -4,7 +4,7 @@
 
 <div>
     <p class="about_text">
-        This is a simple open source clone of the popular Wordle game developed to demo how the wordle game would work using a Blazor WASM/.Net 6 app.
+        This is a simple open source clone of the popular Wordle game developed to demo how the wordle game would work using a Blazor WASM/.Net 8 app.
     </p>
 
     <table>

diff --git a/WordleBlazorWASMApp/WordleBlazorWASMApp/WordleBlazorWASMApp.csproj b/WordleBlazorWASMApp/WordleBlazorWASMApp/WordleBlazorWASMApp.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WorldleGameConsoleApp/WorldleGameConsoleApp/WorldleGameConsoleApp.csproj b/WorldleGameConsoleApp/WorldleGameConsoleApp/WorldleGameConsoleApp.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WorldleGameEngine/WorldleGameEngine.csproj b/WorldleGameEngine/WorldleGameEngine.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WorldleGameEngineUnitTests/WordleUnitTests.csproj b/WorldleGameEngineUnitTests/WordleUnitTests.csproj
@@ -1,19 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Moq" Version="4.18.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     <div>
         <p class="about_text">
-            This is a simple open source clone of the popular Wordle game developed to demo how the wordle game would work using a Blazor Server/.Net 6 app.
+            This is a simple open source clone of the popular Wordle game developed to demo how the wordle game would work using a Blazor Server/.Net 8 app.
         </p>
         <table>
@@ Expand Down @@