Update features and setup apps for .net 9

Caliburn-Micro · Nov 14, 2024 · a956057 · a956057
1 parent 688067c
commit a956057
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/samples/features/Features.NetFive/Features.DotNet.csproj b/samples/features/Features.NetFive/Features.DotNet.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssemblyName>Features.CrossPlatform</AssemblyName>
     <RootNamespace>Features.CrossPlatform</RootNamespace>
@@ -23,10 +23,10 @@
 
   <ItemGroup>
     <Reference Include="Caliburn.Micro.Core">
-      <HintPath>..\..\..\bin\Caliburn.Micro.Platform\release\net8.0-windows\Caliburn.Micro.Core.dll</HintPath>
+      <HintPath>..\..\..\bin\Caliburn.Micro.Platform\release\net9.0-windows\Caliburn.Micro.Core.dll</HintPath>
     </Reference>
     <Reference Include="Caliburn.Micro.Platform">
-      <HintPath>..\..\..\bin\Caliburn.Micro.Platform\release\net8.0-windows\Caliburn.Micro.Platform.dll</HintPath>
+      <HintPath>..\..\..\bin\Caliburn.Micro.Platform\release\net9.0-windows\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/samples/setup/Setup.UWP/Setup.UWP.csproj b/samples/setup/Setup.UWP/Setup.UWP.csproj
@@ -127,7 +127,7 @@
       <Version>4.0.173</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/setup/Setup.WPF.Core.VB/Bootstrapper.vb b/samples/setup/Setup.WPF.Core.VB/Bootstrapper.vb
@@ -18,7 +18,7 @@ Public Class Bootstrapper
     End Sub
 
     Protected Overrides Sub OnStartup(sender As Object, e As StartupEventArgs)
-        DisplayRootViewFor(Of ShellViewModel)()
+        DisplayRootViewForAsync(Of ShellViewModel)()
     End Sub
 
     Protected Overrides Function GetInstance(service As Type, key As String) As Object

diff --git a/samples/setup/Setup.WPF.Core.VB/Setup.WPF.Core.VB.vbproj b/samples/setup/Setup.WPF.Core.VB/Setup.WPF.Core.VB.vbproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <RootNamespace>Setup.WPF.Core.VB</RootNamespace>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Caliburn.Micro" Version="4.0.173" />
+    <PackageReference Include="Caliburn.Micro" Version="4.0.212" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/setup/Setup.WPF.Core/Bootstrapper.cs b/samples/setup/Setup.WPF.Core/Bootstrapper.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using Caliburn.Micro;
 using Setup.WPF.Core.ViewModels;
@@ -30,7 +27,7 @@ protected override void Configure()
 
         protected override void OnStartup(object sender, StartupEventArgs e)
         {
-            DisplayRootViewFor<ShellViewModel>();
+            DisplayRootViewForAsync<ShellViewModel>();
         }
 
         protected override object GetInstance(Type service, string key)

diff --git a/samples/setup/Setup.WPF.Core/Setup.WPF.Core.csproj b/samples/setup/Setup.WPF.Core/Setup.WPF.Core.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Caliburn.Micro" Version="4.0.173" />
+    <PackageReference Include="Caliburn.Micro" Version="4.0.212" />
   </ItemGroup>
 
 </Project>