From 0bb50d1b5da152defa66f383cba8f454a103cb63 Mon Sep 17 00:00:00 2001 From: Martin Finkel Date: Mon, 12 Jan 2026 17:17:51 +0100 Subject: [PATCH 1/8] Update .NET SDK to 10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - global.json: 9.0.0 → 10.0.0 - CI pipeline: 9.0.308 → 10.0.100 --- buildsystem/base-template.yml | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildsystem/base-template.yml b/buildsystem/base-template.yml index 7a10179f0..3b73a1dec 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.308 + version: 10.0.100 - bash: | dotnet workload install android diff --git a/global.json b/global.json index b550660e6..20c7b184c 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "MSBuild.Sdk.Extras": "3.0.44" }, "sdk": { - "version": "9.0.0", + "version": "10.0.0", "rollForward": "latestFeature" } } \ No newline at end of file From 8b184ccdb7ad12defe5fdd1622f14e7a9b6c63e8 Mon Sep 17 00:00:00 2001 From: Martin Finkel Date: Mon, 12 Jan 2026 17:20:24 +0100 Subject: [PATCH 2/8] Add net10.0 TFM to LibVLCSharp - Add net10.0 to LibVLCSharp target frameworks - Update Windows TFM to net9.0-windows10.0.19041 - Add MSBuild SDK workaround for TFM detection - Add DisableWinAppSDKPriGeneration for Windows builds - Update tests to target net10.0 - Bump Microsoft.WindowsAppSDK to 1.8.251106002 --- src/LibVLCSharp.Tests/LibVLCSharp.Tests.csproj | 2 +- src/LibVLCSharp/LibVLCSharp.csproj | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/LibVLCSharp.Tests/LibVLCSharp.Tests.csproj b/src/LibVLCSharp.Tests/LibVLCSharp.Tests.csproj index 96597e6be..e3dd9e261 100644 --- a/src/LibVLCSharp.Tests/LibVLCSharp.Tests.csproj +++ b/src/LibVLCSharp.Tests/LibVLCSharp.Tests.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 Exe false disable diff --git a/src/LibVLCSharp/LibVLCSharp.csproj b/src/LibVLCSharp/LibVLCSharp.csproj index cff39260c..a3939ef6a 100644 --- a/src/LibVLCSharp/LibVLCSharp.csproj +++ b/src/LibVLCSharp/LibVLCSharp.csproj @@ -28,16 +28,18 @@ This package also contains the views for the following platforms: If you need Xamarin.Forms support, see LibVLCSharp.Forms. LibVLC needs to be installed separately, see VideoLAN.LibVLC.* packages. - netstandard2.1;netstandard2.0;netstandard1.1;net40;net471;net8.0;net9;net6.0 + netstandard2.1;netstandard2.0;netstandard1.1;net40;net471;net6.0;net8.0;net9;net10.0 $(TargetFrameworks);net9.0-android;net9.0-ios;net9.0-macos;net9.0-tvos - $(TargetFrameworks);uap10.0.18362;net6.0-windows10.0.17763.0;net8.0-windows10.0.19041;monoandroid81;xamarin.ios10;xamarin.mac20 + $(TargetFrameworks);uap10.0.18362;net6.0-windows10.0.17763.0;net9.0-windows10.0.19041;monoandroid81;xamarin.ios10;xamarin.mac20 Debug;Release;Win32Debug;Win32Release $(TargetsForTfmSpecificBuildOutput);IncludeAWindow LibVLCSharp LibVLCSharp true false - win-x86;win-x64;win-arm64 + win-x86;win-x64;win-arm64 + + .NETCoreApp @@ -47,6 +49,9 @@ LibVLC needs to be installed separately, see VideoLAN.LibVLC.* packages.true 10.0.19041.0 + + true + @@ -84,7 +89,7 @@ LibVLC needs to be installed separately, see VideoLAN.LibVLC.* packages. - + From f56c25c7053c4171df9fc2abb6b0880ed5d80889 Mon Sep 17 00:00:00 2001 From: Martin Finkel Date: Mon, 12 Jan 2026 17:21:57 +0100 Subject: [PATCH 3/8] Update MAUI, Uno, and Android projects to net9 TFMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - LibVLCSharp.MAUI: net8.0-windows → net9.0-windows - LibVLCSharp.Uno: net8.0-windows → net9.0-windows, add EnableDefaultPageItems fix - LibVLCSharp.Android.AWindowModern: net8.0-android → net9.0-android - Bump Microsoft.WindowsAppSDK and BuildTools in Uno project --- .../LibVLCSharp.Android.AWindowModern.csproj | 2 +- src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj | 2 +- src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/LibVLCSharp.Android.AWindowModern/LibVLCSharp.Android.AWindowModern.csproj b/src/LibVLCSharp.Android.AWindowModern/LibVLCSharp.Android.AWindowModern.csproj index 5700bbe01..51313116d 100644 --- a/src/LibVLCSharp.Android.AWindowModern/LibVLCSharp.Android.AWindowModern.csproj +++ b/src/LibVLCSharp.Android.AWindowModern/LibVLCSharp.Android.AWindowModern.csproj @@ -1,6 +1,6 @@ - net8.0-android + net9.0-android 21 enable enable diff --git a/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj b/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj index 8bc0d002e..b024ff8d6 100644 --- a/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj +++ b/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj @@ -1,7 +1,7 @@  net8.0;net9.0-android;net9.0-ios - $(TargetFrameworks);net8.0-windows10.0.19041 + $(TargetFrameworks);net9.0-windows10.0.19041 true true enable diff --git a/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj b/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj index e9959ce87..7c0d3e842 100644 --- a/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj +++ b/src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj @@ -3,7 +3,7 @@ LibVLCSharp.Uno Uno integration for LibVLCSharp net9.0-android;net9.0-ios - $(TargetFrameworks);net8.0-windows10.0.19041 + $(TargetFrameworks);net9.0-windows10.0.19041 true Library LibVLCSharp.Uno is the integration of LibVLCSharp with the Uno Platform on Windows, iOS and Android. @@ -13,6 +13,7 @@ It also contains a VLC MediaPlayerElement for the Uno Platform (UWP, Android, iO LibVLCSharp.Uno LibVLCSharp.Uno win-x86;win-x64;win-arm64 + false @@ -55,7 +56,7 @@ It also contains a VLC MediaPlayerElement for the Uno Platform (UWP, Android, iO - - + + From d861dc3ca0550164b7729d40810dcb8abe1d6c46 Mon Sep 17 00:00:00 2001 From: Martin Finkel Date: Mon, 12 Jan 2026 17:23:11 +0100 Subject: [PATCH 4/8] Update samples to net9 TFMs and bump dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - MAUI.Sample: net8.0-windows → net9.0-windows - MediaElement sample: net8.0-windows → net9.0-windows, cleanup - WinUI.Sample: bump WindowsAppSDK and BuildTools - Bump Microsoft.Extensions.Logging.Debug to 9.0.0 --- .../LibVLCSharp.MAUI.Sample.csproj | 2 +- .../LibVLCSharp.WinUI.Sample.csproj | 4 ++-- .../LibVLCSharp.MAUI.Sample.MediaElement.csproj | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj b/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj index 3ddf5e06d..7c5804bb7 100644 --- a/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj +++ b/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj @@ -2,7 +2,7 @@ net9.0-android;net9.0-ios - $(TargetFrameworks);net8.0-windows10.0.19041.0 + $(TargetFrameworks);net9.0-windows10.0.19041.0 Exe LibVLCSharp.MAUI.Sample true diff --git a/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj b/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj index 32f73064e..33003b5b8 100644 --- a/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj +++ b/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj @@ -24,8 +24,8 @@ - - + + 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 1f46b27fb..06c2681a9 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,15 @@  net9.0-android;net9.0-ios - $(TargetFrameworks);net8.0-windows10.0.19041 + $(TargetFrameworks);net9.0-windows10.0.19041 Exe LibVLCSharp.MAUI.Sample.MediaElement true true enable latest - None + None + true LibVLCSharp.MAUI.Sample.MediaElement @@ -37,9 +38,8 @@ - - - + + From e265c6b9f1b1169811345d0b3a0ab2f534ee4ace Mon Sep 17 00:00:00 2001 From: Martin Finkel Date: Tue, 13 Jan 2026 14:38:49 +0100 Subject: [PATCH 5/8] Add net8.0-windows and net10.0-windows TFMs to LibVLCSharp --- src/LibVLCSharp/LibVLCSharp.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LibVLCSharp/LibVLCSharp.csproj b/src/LibVLCSharp/LibVLCSharp.csproj index a3939ef6a..c4bf9bb04 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. netstandard2.1;netstandard2.0;netstandard1.1;net40;net471;net6.0;net8.0;net9;net10.0 $(TargetFrameworks);net9.0-android;net9.0-ios;net9.0-macos;net9.0-tvos - $(TargetFrameworks);uap10.0.18362;net6.0-windows10.0.17763.0;net9.0-windows10.0.19041;monoandroid81;xamarin.ios10;xamarin.mac20 + $(TargetFrameworks);uap10.0.18362;net6.0-windows10.0.17763.0;net8.0-windows10.0.19041;net9.0-windows10.0.19041;net10.0-windows10.0.19041;monoandroid81;xamarin.ios10;xamarin.mac20 Debug;Release;Win32Debug;Win32Release $(TargetsForTfmSpecificBuildOutput);IncludeAWindow LibVLCSharp LibVLCSharp true false - win-x86;win-x64;win-arm64 + win-x86;win-x64;win-arm64 .NETCoreApp From a1c4a354a64597cbd89d8876abd3b5de3d308c7e Mon Sep 17 00:00:00 2001 From: Martin Finkel Date: Tue, 13 Jan 2026 14:38:49 +0100 Subject: [PATCH 6/8] Update WinUI sample to net10.0-windows TFM --- .../LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj b/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj index 33003b5b8..76f84519a 100644 --- a/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj +++ b/samples/LibVLCSharp.WinUI.Sample/LibVLCSharp.WinUI.Sample.csproj @@ -1,12 +1,13 @@  WinExe - net6.0-windows10.0.19041.0 + net10.0-windows10.0.19041.0 + win-x64 10.0.17763.0 LibVLCSharp.WinUI.Sample app.manifest x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 + win-x86;win-x64;win-arm64 win10-$(Platform).pubxml true true From 72f86c4fb5f99a6e96d790bf9de124cfece4922d Mon Sep 17 00:00:00 2001 From: Martin Finkel Date: Mon, 19 Jan 2026 17:46:27 +0100 Subject: [PATCH 7/8] make older targets build from VS2026 --- src/Directory.Build.props | 7 +++++++ .../LibVLCSharp.Android.AWindow.csproj | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 69a581eee..34a12cf49 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,4 +1,11 @@  + + + C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild + C:\Program Files\Microsoft Visual Studio\2022\Community + C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ + + $(DefineConstants);IOS;APPLE diff --git a/src/LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.csproj b/src/LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.csproj index 424875aa3..c03c00470 100644 --- a/src/LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.csproj +++ b/src/LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.csproj @@ -1,5 +1,10 @@  + + + C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild + C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ + Debug AnyCPU From 4badd9ff352cc0824a3eafd20c7e660a89bba879 Mon Sep 17 00:00:00 2001 From: Martin Finkel Date: Tue, 20 Jan 2026 11:09:49 +0100 Subject: [PATCH 8/8] support both enterprise and community VS --- src/Directory.Build.props | 10 +++++++--- .../LibVLCSharp.Android.AWindow.csproj | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 34a12cf49..1cf8bb67d 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,9 +1,13 @@  - C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild - C:\Program Files\Microsoft Visual Studio\2022\Community - C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ + Enterprise + Professional + Community + C:\Program Files\Microsoft Visual Studio\2022\$(VS2022Edition) + $(VS2022Root)\MSBuild + $(VS2022Root) + $(VS2022Root)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ diff --git a/src/LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.csproj b/src/LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.csproj index c03c00470..2104d165d 100644 --- a/src/LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.csproj +++ b/src/LibVLCSharp.Android.AWindow/LibVLCSharp.Android.AWindow.csproj @@ -2,8 +2,12 @@ - C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild - C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ + Enterprise + Professional + Community + C:\Program Files\Microsoft Visual Studio\2022\$(VS2022Edition) + $(VS2022Root)\MSBuild + $(VS2022Root)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ Debug