Commit 0daabdd3 authored by Martin Finkel's avatar Martin Finkel

Add VS2019 support for all projects

Also move msbuild.sdk.extras in global.json in solution root to manage its version more easily
parent 08b83b6b
<Project Sdk="MSBuild.Sdk.Extras/1.6.46">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<Title>LibVLCSharp.Forms</Title>
<Summary>Xamarin.Forms integration for LibVLCSharp</Summary>
......
<Project Sdk="MSBuild.Sdk.Extras/1.6.46">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<Title>LibVLCSharp.WPF</Title>
<Summary>WPF integration for LibVLCSharp</Summary>
......@@ -31,7 +31,7 @@ Features:
<LangVersion>7.3</LangVersion>
<Version>0.8.1</Version>
<PackageId>LibVLCSharp.WPF</PackageId>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<UseWPF>true</UseWPF>
<Authors>VideoLAN</Authors>
<Owners>VideoLAN</Owners>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
......@@ -47,8 +47,22 @@ Features:
<ItemGroup>
<Reference Include="WindowsFormsIntegration" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LibVLCSharp\LibVLCSharp.csproj" />
</ItemGroup>
<!-- Workaround https://github.com/onovotny/MSBuildSdkExtras/issues/158 -->
<ItemGroup Condition=" '$(UseWpf)' == 'true'">
<None Remove="**\*.xaml" />
<Page Remove="**\*.xaml" />
<Page Include="**\*.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Remove="**\App.xaml" />
<ApplicationDefinition Include="**\App.xaml" />
<Reference Include="System.Xaml" />
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -8,6 +8,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5F2B2E4-7F93-4919-89F6-EEAB5D1C0AA7}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
global.json = global.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{799A84A2-2161-4676-878B-5610E3586137}"
......
<Project Sdk="MSBuild.Sdk.Extras/1.6.46">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<Title>LibVLCSharp</Title>
<Summary>The official .NET wrapper around LibVLC.</Summary>
......
<Project Sdk="MSBuild.Sdk.Extras/1.6.46">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<Title>LibVLCSharp.WinForms.Sample</Title>
<OutputType>WinExe</OutputType>
<TargetFramework>net40</TargetFramework>
<RootNamespace>LibVLCSharp.WinForms.Sample</RootNamespace>
<ExtrasEnableWinFormsProjectSetup>true</ExtrasEnableWinFormsProjectSetup>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LibVLCSharp.WinForms\LibVLCSharp.WinForms.csproj" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Update="Form1.cs">
......
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.24"
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment