Skip to content

Commit 8b184cc

Browse files
committed
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
1 parent 0bb50d1 commit 8b184cc

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/LibVLCSharp.Tests/LibVLCSharp.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<GenerateProgramFile>false</GenerateProgramFile>
66
<Nullable>disable</Nullable>

src/LibVLCSharp/LibVLCSharp.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,18 @@ This package also contains the views for the following platforms:
2828
If you need Xamarin.Forms support, see LibVLCSharp.Forms.
2929

3030
LibVLC needs to be installed separately, see VideoLAN.LibVLC.* packages.</Description>
31-
<TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.1;net40;net471;net8.0;net9;net6.0</TargetFrameworks>
31+
<TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.1;net40;net471;net6.0;net8.0;net9;net10.0</TargetFrameworks>
3232
<TargetFrameworks Condition="!$([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworks);net9.0-android;net9.0-ios;net9.0-macos;net9.0-tvos</TargetFrameworks>
33-
<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>
33+
<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>
3434
<Configurations>Debug;Release;Win32Debug;Win32Release</Configurations>
3535
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeAWindow</TargetsForTfmSpecificBuildOutput>
3636
<RootNamespace>LibVLCSharp</RootNamespace>
3737
<PackageId>LibVLCSharp</PackageId>
3838
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3939
<EnableDefaultPageItems>false</EnableDefaultPageItems>
40-
<RuntimeIdentifiers Condition="$(TargetFramework.Contains('net8.0-windows10'))">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
40+
<RuntimeIdentifiers Condition="$(TargetFramework.Contains('net9.0-windows10'))">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
41+
<!-- https://github.com/novotnyllc/MSBuildSdkExtras/issues/305 -->
42+
<TargetFrameworkIdentifier Condition=" $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp' ">.NETCoreApp</TargetFrameworkIdentifier>
4143
</PropertyGroup>
4244
<!--Override TFMs when building from the LVS.Win32 solution-->
4345
<PropertyGroup Condition="$(Configuration.StartsWith('Win32'))">
@@ -47,6 +49,9 @@ LibVLC needs to be installed separately, see VideoLAN.LibVLC.* packages.</Descri
4749
<GenerateLibraryLayout>true</GenerateLibraryLayout>
4850
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
4951
</PropertyGroup>
52+
<PropertyGroup Condition="$(TargetFramework.Contains('windows10'))">
53+
<DisableWinAppSDKPriGeneration>true</DisableWinAppSDKPriGeneration>
54+
</PropertyGroup>
5055
<ItemGroup>
5156
<Compile Remove="Platforms\**\*.cs" />
5257
<None Include="Platforms\**\*.cs" />
@@ -84,7 +89,7 @@ LibVLC needs to be installed separately, see VideoLAN.LibVLC.* packages.</Descri
8489
</ItemGroup>
8590

8691
<ItemGroup Condition="$(TargetFramework.Contains('windows10')) ">
87-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
92+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
8893
</ItemGroup>
8994

9095
<ItemGroup Condition="$(DefineConstants.Contains('UWP'))">

0 commit comments

Comments
 (0)