Skip to content

Restore support for .NET Framework 4.8 (multi-targeting with .Net Core) #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Restore support for .NET Framework 4.8 (multi-targeting with .Net Core) #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions Source/DirectShow/MediaPlayers/DvdPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,11 @@ private void BuildGraph()
}

/* This will be the audio stream pin */
if (mediaType.subType == MediaSubType.Audio.DolbyAc3 ||
mediaType.subType == MediaSubType.Mpeg2Audio)
#if NET48
if (mediaType.subType == MediaSubType.DolbyAC3 || mediaType.subType == MediaSubType.Mpeg2Audio)
#elif NET8_0 || NET9_0
if (mediaType.subType == MediaSubType.Audio.DolbyAc3 || mediaType.subType == MediaSubType.Mpeg2Audio)
#endif
{
/* Keep the ref and we'll work with it later */
dvdAudioPin = dvdNavPin;
Expand Down
140 changes: 67 additions & 73 deletions Source/WPF MediaKit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,79 +1,73 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-windows;net9.0-windows</TargetFrameworks>
<OutputType>Library</OutputType>
<RootNamespace>WPFMediaKit</RootNamespace>
<AssemblyName>WPFMediaKit</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<PropertyGroup>
<TargetFrameworks>net48;net8.0-windows;net9.0-windows</TargetFrameworks>
<OutputType>Library</OutputType>
<RootNamespace>WPFMediaKit</RootNamespace>
<AssemblyName>WPFMediaKit</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<AssemblyVersion>3.0.1</AssemblyVersion>
<FileVersion>3.0.1</FileVersion>
</PropertyGroup>

<AssemblyVersion>3.0.1</AssemblyVersion>
<FileVersion>3.0.1</FileVersion>
<PropertyGroup>
<PackageId>WPFMediaKit</PackageId>
<PackageVersion>3.0.1</PackageVersion>
<Authors>WPF MediaKit Team</Authors>
<Owners>WPF MediaKit Team</Owners>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseUrl>https://github.com/Sascha-L/WPF-MediaKit/blob/master/License.txt</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Sascha-L/WPF-MediaKit</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Description>A library to quickly build DirectShow and MediaFoundation media player controls in WPF. The kit comes with a MediaElement replacement, a VideoCaptureElement for web cams and a DVDPlayerElement that plays DVDs and supports interactive menus.</Description>
<PackageReleaseNotes>Added .NET 8 &amp; .NET 9 compatibility and fixed DirectShowLib.</PackageReleaseNotes>
<Copyright>Copyright © 2015-2025 by WPF MediaKit Team</Copyright>
<PackageTags>wpf video directshow evr dvd player media MediaFoundation</PackageTags>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>default</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<None Remove="Effects\DeeperColor.ps" />
<Resource Include="Effects\DeeperColor.ps" />
</ItemGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
</ItemGroup>

</PropertyGroup>

<PropertyGroup>
<PackageId>WPFMediaKit</PackageId>
<PackageVersion>3.0.1</PackageVersion>
<Authors>WPF MediaKit Team</Authors>
<Owners>WPF MediaKit Team</Owners>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseUrl>https://github.com/Sascha-L/WPF-MediaKit/blob/master/License.txt</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Sascha-L/WPF-MediaKit</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Description>A library to quickly build DirectShow and MediaFoundation media player controls in WPF. The kit comes with a MediaElement replacement, a VideoCaptureElement for web cams and a DVDPlayerElement that plays DVDs and supports interactive menus.</Description>
<PackageReleaseNotes>Added .NET 8 &amp; .NET 9 compatibility, removed .NET Framework compatibility. Fixed DirectShowLib. If you are still using .NET Framework, please use Version 2.3.0 of WPF MediaKit!</PackageReleaseNotes>
<Copyright>Copyright © 2015-2025 by WPF MediaKit Team</Copyright>
<PackageTags>wpf video directshow evr dvd player media MediaFoundation</PackageTags>
</PropertyGroup>



<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>default</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<None Remove="Effects\DeeperColor.ps" />
<Resource Include="Effects\DeeperColor.ps" />
</ItemGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="DirectShowLib.Net" Version="3.0.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<None Include="..\License.txt">

<Visible>False</Visible>
</None>
<None Include="..\README.md" Pack="true" PackagePath="\">

<Visible>False</Visible>
</None>

</ItemGroup>
<ItemGroup>


<Content Include="..\EVR Presenter\bin\Release\x86\EVRPresenter32.dll" CopyToOutputDirectory="Always" Pack="true" PackagePath="runtimes\win-x86\native" TargetPath="runtimes\win-x86\native\EVRPresenter32.dll">
<Visible>False</Visible>
</Content>

<Content Include="..\EVR Presenter\bin\Release\x64\EVRPresenter64.dll" CopyToOutputDirectory="Always" Pack="true" PackagePath="runtimes\win-x64\native" TargetPath="runtimes\win-x64\native\EVRPresenter64.dll">
<Visible>False</Visible>
</Content>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="DirectShowLib" Version="1.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows' Or '$(TargetFramework)' == 'net9.0-windows'">
<PackageReference Include="DirectShowLib.Net" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
<None Include="..\License.txt">
<Visible>False</Visible>
</None>
<None Include="..\README.md" Pack="true" PackagePath="\">
<Visible>False</Visible>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="..\EVR Presenter\bin\Release\x86\EVRPresenter32.dll" CopyToOutputDirectory="Always" Pack="true" PackagePath="runtimes\win-x86\native" TargetPath="runtimes\win-x86\native\EVRPresenter32.dll">
<Visible>False</Visible>
</Content>
<Content Include="..\EVR Presenter\bin\Release\x64\EVRPresenter64.dll" CopyToOutputDirectory="Always" Pack="true" PackagePath="runtimes\win-x64\native" TargetPath="runtimes\win-x64\native\EVRPresenter64.dll">
<Visible>False</Visible>
</Content>
</ItemGroup>
</Project>
66 changes: 33 additions & 33 deletions Test Application/Test Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<RootNamespace>Test_Application</RootNamespace>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Source\WPF MediaKit.csproj" />
</ItemGroup>
<PropertyGroup>
<TargetFrameworks>net48;net8.0-windows;net9.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<RootNamespace>Test_Application</RootNamespace>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Source\WPF MediaKit.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>

</Project>