From a25664547639b717c3127e39b9ad42d2ccaa76f4 Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Wed, 12 Nov 2025 15:44:50 +0700
Subject: [PATCH 1/8] CI: switch to dotnet 10

---
 buildsystem/base-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildsystem/base-template.yml b/buildsystem/base-template.yml
index be528007..3b73a1de 100644
--- a/buildsystem/base-template.yml
+++ b/buildsystem/base-template.yml
@@ -3,7 +3,7 @@ steps:
   displayName: 'Use .NET Core SDK'
   inputs:
     packageType: sdk
-    version: 9.0.201
+    version: 10.0.100
 
 - bash: |
    dotnet workload install android

From 9ed6e7579db17f5351d6198593b5ba995622635d Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Wed, 12 Nov 2025 15:58:12 +0700
Subject: [PATCH 2/8] AWindowModern: bump to .NET9

---
 .../LibVLCSharp.Android.AWindowModern.csproj                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/LibVLCSharp.Android.AWindowModern/LibVLCSharp.Android.AWindowModern.csproj b/src/LibVLCSharp.Android.AWindowModern/LibVLCSharp.Android.AWindowModern.csproj
index 5700bbe0..51313116 100644
--- a/src/LibVLCSharp.Android.AWindowModern/LibVLCSharp.Android.AWindowModern.csproj
+++ b/src/LibVLCSharp.Android.AWindowModern/LibVLCSharp.Android.AWindowModern.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-android</TargetFramework>
+    <TargetFramework>net9.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

From 47b354bbab3f97a7dfce792d8d8cfc96bb4e8162 Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Wed, 12 Nov 2025 16:41:15 +0700
Subject: [PATCH 3/8] try fix maui version restore error

---
 .../LibVLCSharp.MAUI.Sample.MediaElement.csproj             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
index 1f46b27f..a9e9be94 100644
--- a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
+++ b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
@@ -37,9 +37,9 @@
     <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <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.Maui.Controls" Version="9.0.10" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.10" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
 		<PackageReference Include="VideoLAN.LibVLC.Android" Version="3.6.5" />

From d33b9ef563886235e2ddec61acc33195f48076eb Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Wed, 12 Nov 2025 17:18:55 +0700
Subject: [PATCH 4/8] update global.json

---
 src/global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/global.json b/src/global.json
index a9a773f2..f6f1f8e0 100644
--- a/src/global.json
+++ b/src/global.json
@@ -3,6 +3,6 @@
     "MSBuild.Sdk.Extras": "3.0.44"
   },
     "sdk": {
-        "version": "9.0.201"
+        "version": "10.0.100"
     }
 }

From 0378cb9c45856f73e611ec354720eb35757a23b9 Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Mon, 17 Nov 2025 16:10:08 +0700
Subject: [PATCH 5/8] shotgun

---
 .../LibVLCSharp.MAUI.Sample.csproj                       | 2 +-
 .../LibVLCSharp.WinUI.Sample.csproj                      | 4 ++--
 .../LibVLCSharp.MAUI.Sample.MediaElement.csproj          | 6 ++++--
 src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj             | 2 +-
 src/LibVLCSharp/LibVLCSharp.csproj                       | 9 ++++++---
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj b/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj
index 3ddf5e06..7c5804bb 100644
--- a/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj
+++ b/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>LibVLCSharp.MAUI.Sample</RootNamespace>
 		<UseMaui>true</UseMaui>
diff --git a/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj b/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj
index 32f73064..5f555787 100644
--- a/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj
+++ b/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
     <PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.18" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
diff --git a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
index a9e9be94..220b8439 100644
--- a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
+++ b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
-	<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
+	<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>LibVLCSharp.MAUI.Sample.MediaElement</RootNamespace>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>
-	<WindowsPackageType>None</WindowsPackageType>
+    <WindowsPackageType>None</WindowsPackageType>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+    <DisableWinAppSDKPriGeneration>true</DisableWinAppSDKPriGeneration>
     <!-- Display name -->
     <ApplicationTitle>LibVLCSharp.MAUI.Sample.MediaElement</ApplicationTitle>
     <!-- App Identifier -->
diff --git a/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj b/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj
index 8bc0d002..b024ff8d 100644
--- a/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj
+++ b/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0-android;net9.0-ios</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/src/LibVLCSharp/LibVLCSharp.csproj b/src/LibVLCSharp/LibVLCSharp.csproj
index cff39260..e1ea34ba 100644
--- a/src/LibVLCSharp/LibVLCSharp.csproj
+++ b/src/LibVLCSharp/LibVLCSharp.csproj
@@ -30,14 +30,14 @@ If you need Xamarin.Forms support, see LibVLCSharp.Forms.
 LibVLC needs to be installed separately, see VideoLAN.LibVLC.* packages.</Description>
     <TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.1;net40;net471;net8.0;net9;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="!$([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworks);net9.0-android;net9.0-ios;net9.0-macos;net9.0-tvos</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);uap10.0.18362;net6.0-windows10.0.17763.0;net8.0-windows10.0.19041;monoandroid81;xamarin.ios10;xamarin.mac20</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);uap10.0.18362;net6.0-windows10.0.17763.0;net9.0-windows10.0.19041;monoandroid81;xamarin.ios10;xamarin.mac20</TargetFrameworks>
     <Configurations>Debug;Release;Win32Debug;Win32Release</Configurations>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeAWindow</TargetsForTfmSpecificBuildOutput>
     <RootNamespace>LibVLCSharp</RootNamespace>
     <PackageId>LibVLCSharp</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
-   <RuntimeIdentifiers Condition="$(TargetFramework.Contains('net8.0-windows10'))">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+   <RuntimeIdentifiers Condition="$(TargetFramework.Contains('net9.0-windows10'))">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
   <!--Override TFMs when building from the LVS.Win32 solution-->
   <PropertyGroup Condition="$(Configuration.StartsWith('Win32'))">
@@ -47,6 +47,9 @@ LibVLC needs to be installed separately, see VideoLAN.LibVLC.* packages.</Descri
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.Contains('windows10'))">
+    <DisableWinAppSDKPriGeneration>true</DisableWinAppSDKPriGeneration>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Platforms\**\*.cs" />
     <None Include="Platforms\**\*.cs" />
@@ -84,7 +87,7 @@ LibVLC needs to be installed separately, see VideoLAN.LibVLC.* packages.</Descri
   </ItemGroup>
   
   <ItemGroup Condition="$(TargetFramework.Contains('windows10')) ">
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
   </ItemGroup>
 
   <ItemGroup Condition="$(DefineConstants.Contains('UWP'))">

From 4c1d45996b3efe41a80beca9894818c2981bbc6f Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Mon, 17 Nov 2025 16:54:35 +0700
Subject: [PATCH 6/8] duh

---
 src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj b/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj
index e9959ce8..5ea5d09b 100644
--- a/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj
+++ b/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj
@@ -3,7 +3,7 @@
     <Title>LibVLCSharp.Uno</Title>
     <Summary>Uno integration for LibVLCSharp</Summary>
     <TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <OutputType>Library</OutputType>
     <Description>LibVLCSharp.Uno is the integration of LibVLCSharp with the Uno Platform on Windows, iOS and Android.

From 04193e4bacbcab59cedd55137204e8453b4dacad Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Mon, 17 Nov 2025 16:56:03 +0700
Subject: [PATCH 7/8] add rid

---
 .../LibVLCSharp.MAUI.Sample.MediaElement.csproj                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
index 220b8439..85607b8c 100644
--- a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
+++ b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
@@ -23,6 +23,7 @@
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+    <RuntimeIdentifiers Condition="$(TargetFramework.Contains('-windows'))">win-x64;win-x86;win-arm64</RuntimeIdentifiers>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>

From b43c38f2974e2234ecd9100c5851e5389c0bfeac Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Mon, 24 Nov 2025 13:52:57 +0700
Subject: [PATCH 8/8] bump

---
 .../LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj  | 2 +-
 src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj b/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj
index 5f555787..33003b5b 100644
--- a/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj
+++ b/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
     <PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.18" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
diff --git a/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj b/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj
index 5ea5d09b..2493220e 100644
--- a/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj
+++ b/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj
@@ -55,7 +55,7 @@ It also contains a VLC MediaPlayerElement for the Uno Platform (UWP, Android, iO
     <Page Include="**\*.iOS.*xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('windows'))">
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
   </ItemGroup>
 </Project>