From b0afa05e314a1dafd21775a48f390fe117f12601 Mon Sep 17 00:00:00 2001
From: David Humphreys <newky2k@users.noreply.github.com>
Date: Tue, 18 Nov 2025 19:17:22 +0000
Subject: [PATCH] Updated packages for .NET 10 support

---
 .../DSoft.System.Mvvm.Hosting.csproj          |  2 +-
 .../DSoft.System.Mvvm.UI.MAUI.csproj          |  2 +-
 Directory.Build.props                         |  2 +-
 MVVMSample/MVVMSample.csproj                  |  2 +-
 MauiSample/MauiSample.csproj                  |  2 +-
 .../DSoft.System.Mvvm.UI.WinUI.csproj         | 31 +++----------------
 .../DSoft.System.Mvvm.UI.WPF.csproj           |  2 +-
 System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj    |  2 +-
 ....Mvvm.VisualStudio.Extensibility.UI.csproj |  2 +-
 9 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj b/DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj
index 5108816..44d94b2 100644
--- a/DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj
+++ b/DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj
@@ -21,7 +21,7 @@
 		<Compile Include="**\*.shared.*.cs" />
 		<Compile Include="HostMode.cs" />
 		<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" $(TargetFramework.Equals('netstandard2.0'))">
diff --git a/DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj b/DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj
index 487e630..c9faf1f 100644
--- a/DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj
+++ b/DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj
@@ -32,7 +32,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.7" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
index 86e1858..5be2292 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,7 +13,7 @@
 		<Owners>newky2k</Owners>
 		<LangVersion>Latest</LangVersion>
 		<Configurations>Debug;Release</Configurations>
-		<NoWarn>1701;1702;CS8002</NoWarn>
+		<NoWarn>1701;1702;CS8002;NETSDK1206;</NoWarn>
 		<PackageReleaseNotes>Updated to .NET 9.0 and latest packages</PackageReleaseNotes>
 	</PropertyGroup>
 
diff --git a/MVVMSample/MVVMSample.csproj b/MVVMSample/MVVMSample.csproj
index bc87f82..508b9e7 100644
--- a/MVVMSample/MVVMSample.csproj
+++ b/MVVMSample/MVVMSample.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.4.10" />
+    <PackageReference Include="MahApps.Metro" Version="2.4.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MauiSample/MauiSample.csproj b/MauiSample/MauiSample.csproj
index 4312637..dd246e5 100644
--- a/MauiSample/MauiSample.csproj
+++ b/MauiSample/MauiSample.csproj
@@ -66,7 +66,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj b/System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj
index 22b08a7..b527e61 100644
--- a/System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj
+++ b/System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj
@@ -16,14 +16,8 @@
 		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 	</PropertyGroup>
-	<PropertyGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows10')) ">
-		<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-		<RootNamespace>System.Mvvm.Ui</RootNamespace>
-		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64;win10-arm</RuntimeIdentifiers>
-		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
-	</PropertyGroup>
 
-	<PropertyGroup Condition=" $(TargetFramework.StartsWith('net8.0-windows10')) ">
+	<PropertyGroup Condition=" $(TargetFramework.Contains('windows10')) ">
 		<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
 		<RootNamespace>System.Mvvm.Ui</RootNamespace>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64;</RuntimeIdentifiers>
@@ -40,28 +34,13 @@
 		<Compile Include="**\*.shared.*.cs" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net8.0-windows10')) ">
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+	<ItemGroup Condition=" $(TargetFramework.Contains('windows10')) ">
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
 		<Compile Include="**\*.uwp.cs" />
 		<Compile Include="**\*.uwp.*.cs" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0-windows10')) ">
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
-		<Compile Include="**\*.uwp.cs" />
-		<Compile Include="**\*.uwp.*.cs" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net10.0-windows10')) ">
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
-		<Compile Include="**\*.uwp.cs" />
-		<Compile Include="**\*.uwp.*.cs" />
-	</ItemGroup>
-
-
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
 		<Compile Include="**\*.uwp.cs" />
 		<Compile Include="**\*.uwp.*.cs" />
@@ -70,6 +49,6 @@
 	<ItemGroup>
 		<ProjectReference Include="..\System.Mvvm.Ui\DSoft.System.Mvvm.UI.csproj" />
 		<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj b/System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj
index f7fa27e..c5a6ea4 100644
--- a/System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj
+++ b/System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj
@@ -19,6 +19,6 @@
 		<None Include="readme.md" Pack="true" PackagePath="\" />
 		<ProjectReference Include="..\System.Mvvm.Ui\DSoft.System.Mvvm.UI.csproj" />
 		<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj b/System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj
index a18e08a..a5ad4a3 100644
--- a/System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj
+++ b/System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <None Include="readme.md" Pack="true" PackagePath="\" />
     <ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
   </ItemGroup>
 	<ItemGroup>
 	  <InternalsVisibleTo Include="System.Mvvm.UI.WinUI, PublicKey=002400000480000094000000060200000024000052534131000400000100010085529aa44bb5b76cfba9f8f376ec13c1503e7e38ee7b236b946df8c17b6f24d11609eea05229320dd531dc92211156f2b9b7843b7791a680221bd4a358fb785b180fcd35731dc1b7cfaf2fc314b102b20896af562662dacd08d7d2d830a4a4cb84c6df91d7af56a6e5b46f0b65db4259bcac25bc7828791d65dfcefaefac7aad" />
diff --git a/System.Mvvm.VisualStudio.Extensibility.UI/DSoft.System.Mvvm.VisualStudio.Extensibility.UI.csproj b/System.Mvvm.VisualStudio.Extensibility.UI/DSoft.System.Mvvm.VisualStudio.Extensibility.UI.csproj
index d1da2cc..8bee175 100644
--- a/System.Mvvm.VisualStudio.Extensibility.UI/DSoft.System.Mvvm.VisualStudio.Extensibility.UI.csproj
+++ b/System.Mvvm.VisualStudio.Extensibility.UI/DSoft.System.Mvvm.VisualStudio.Extensibility.UI.csproj
@@ -20,7 +20,7 @@
 	
 	<ItemGroup>
 		<PackageReference Include="Microsoft.VisualStudio.Extensibility.Framework" Version="17.14.2098" />
-		<PackageReference Include="Nerdbank.Streams" Version="2.11.90" />
+		<PackageReference Include="Nerdbank.Streams" Version="2.13.16" />
 	</ItemGroup>
 
 </Project>