Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildsystem/base-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.7175" />
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.18" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -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 -->
Expand All @@ -21,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>
Expand All @@ -37,9 +40,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" />
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/LibVLCSharp.Uno/LibVLCSharp.Uno.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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>
9 changes: 6 additions & 3 deletions src/LibVLCSharp/LibVLCSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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'))">
Expand All @@ -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" />
Expand Down Expand Up @@ -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'))">
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"MSBuild.Sdk.Extras": "3.0.44"
},
"sdk": {
"version": "9.0.201"
"version": "10.0.100"
}
}
Loading