NR: Migrate to MAUI 8 / .NET 8

jbe2277 · Nov 22, 2023 · 8ce99e8 · 8ce99e8
1 parent 6b91356
commit 8ce99e8
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 35 deletions.
diff --git a/src/NewsReader/Directory.Build.props b/src/NewsReader/Directory.Build.props
@@ -15,9 +15,9 @@
         <RunSettingsFilePath>$(MSBuildThisFileDirectory)CodeCoverage.runsettings</RunSettingsFilePath>
       </PropertyGroup>
       <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="MSTest.TestAdapter" />
-        <PackageReference Include="MSTest.TestFramework" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
       </ItemGroup>
     </When>
     <Otherwise>
@@ -28,7 +28,7 @@
   </Choose>
 
   <ItemGroup>
-    <PackageReference Include="MinVer">
+    <PackageReference Include="MinVer" Version="4.3.0" >
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/NewsReader/NewsReader.Applications/NewsReader.Applications.csproj b/src/NewsReader/NewsReader.Applications/NewsReader.Applications.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Waf.NewsReader.Applications</RootNamespace>
     <AssemblyName>Waf.NewsReader.Applications</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" />
-    <PackageReference Include="Microsoft.AppCenter.Analytics" />
-    <PackageReference Include="Microsoft.AppCenter.Crashes" />
+    <PackageReference Include="Autofac" Version="7.1.0" />
+    <PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NewsReader/NewsReader.Domain.Test/NewsReader.Domain.Test.csproj b/src/NewsReader/NewsReader.Domain.Test/NewsReader.Domain.Test.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Test.NewsReader.Domain</RootNamespace>
     <AssemblyName>Test.NewsReader.Domain</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Waf.UnitTesting.Core" />
+    <PackageReference Include="System.Waf.UnitTesting.Core" Version="7.0.1-alpha.0.49" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NewsReader/NewsReader.Domain/NewsReader.Domain.csproj b/src/NewsReader/NewsReader.Domain/NewsReader.Domain.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Waf.NewsReader.Domain</RootNamespace>
     <AssemblyName>Waf.NewsReader.Domain</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Waf.Core" />
+    <PackageReference Include="System.Waf.Core" Version="7.0.1-alpha.0.49" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NewsReader/NewsReader.MauiSystem/NewsReader.MauiSystem.csproj b/src/NewsReader/NewsReader.MauiSystem/NewsReader.MauiSystem.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>Waf.NewsReader.MauiSystem</RootNamespace>
     <UseMaui>true</UseMaui>
@@ -25,7 +25,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NewsReader/NewsReader.Presentation.Test/NewsReader.Presentation.Test.csproj b/src/NewsReader/NewsReader.Presentation.Test/NewsReader.Presentation.Test.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Test.NewsReader.Presentation</RootNamespace>
     <AssemblyName>Test.NewsReader.Presentation</AssemblyName>
     <UseMaui>true</UseMaui>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Waf.UnitTesting.Core" />
+    <PackageReference Include="System.Waf.UnitTesting.Core" Version="7.0.1-alpha.0.49" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NewsReader/NewsReader.Presentation/NewsReader.Presentation.csproj b/src/NewsReader/NewsReader.Presentation/NewsReader.Presentation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net7.0-android;net7.0-ios</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net8.0-android;net8.0-ios</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
     <RootNamespace>Waf.NewsReader.Presentation</RootNamespace>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
@@ -13,9 +13,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graph" />
-    <PackageReference Include="Microsoft.Identity.Client" />
-    <PackageReference Include="System.ServiceModel.Syndication" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+
+    <PackageReference Include="Microsoft.Graph" Version="4.54.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.55.0" />
+    <PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NewsReader/NewsReader.sln b/src/NewsReader/NewsReader.sln
@@ -20,7 +20,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\.editorconfig = ..\.editorconfig
 		CodeCoverage.runsettings = CodeCoverage.runsettings
 		Directory.Build.props = Directory.Build.props
-		..\Directory.Packages.props = ..\Directory.Packages.props
 	EndProjectSection
 EndProject
 Global

diff --git a/src/Directory.Packages.props → src/System.Waf/Directory.Packages.props b/src/Directory.Packages.props → src/System.Waf/Directory.Packages.props
@@ -22,16 +22,5 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
-
-    <!-- News Reader (MAUI) -->
-    <PackageVersion Include="Autofac" Version="7.1.0" />
-    <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.AppCenter.Analytics" Version="5.0.2" />
-    <PackageVersion Include="Microsoft.AppCenter.Crashes" Version="5.0.2" />
-    <PackageVersion Include="Microsoft.Graph" Version="4.54.0" />
-    <PackageVersion Include="Microsoft.Identity.Client" Version="4.55.0" />
-    <PackageVersion Include="System.ServiceModel.Syndication" Version="7.0.0" />
-    <PackageVersion Include="System.Waf.Core" Version="7.0.1-alpha.0.49" />
-    <PackageVersion Include="System.Waf.UnitTesting.Core" Version="7.0.1-alpha.0.49" />
   </ItemGroup>
 </Project>
diff --git a/src/System.Waf/System.Waf.sln b/src/System.Waf/System.Waf.sln
@@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Changelog.txt = Changelog.txt
 		CodeCoverage.runsettings = CodeCoverage.runsettings
 		Directory.Build.props = Directory.Build.props
-		..\Directory.Packages.props = ..\Directory.Packages.props
+		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EmailClient", "EmailClient", "{74B96B02-FF13-48C1-9A18-F99B27CBBC0F}"