Skip to content
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

Added net6.0-windows to TFMs. #1019

Closed
wants to merge 2 commits into from
Closed

Added net6.0-windows to TFMs. #1019

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c280db8
Added net6.0-windows to TFMs.
AraHaan Oct 19, 2022
ebc686c
Update Source/Svg.csproj
AraHaan Oct 19, 2022
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
25 changes: 16 additions & 9 deletions Source/Svg.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net462</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net6.0-windows</TargetFrameworks>
<PackageLicenseExpression>MS-PL</PackageLicenseExpression>
<RootNamespace>Svg</RootNamespace>
<AssemblyName>Svg</AssemblyName>
Expand Down Expand Up @@ -57,39 +58,44 @@
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net452'">
<Title>Svg for .Net Framework 4.5.2</Title>
<Title>Svg for .NET Framework 4.5.2</Title>
<DefineConstants>$(DefineConstants);NETFULL;NET452;Net4</DefineConstants>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net462'">
<Title>Svg for .Net Framework 4.6.2</Title>
<Title>Svg for .NET Framework 4.6.2</Title>
<DefineConstants>$(DefineConstants);NETFULL;NET462;Net4</DefineConstants>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
<Title>Svg for .Net Core 2.1</Title>
<Title>Svg for .NET Core 2.1</Title>
<DefineConstants>$(DefineConstants);NETCORE;NETCORE21</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<Title>Svg for .Net Core 3.1</Title>
<Title>Svg for .NET Core 3.1</Title>
<DefineConstants>$(DefineConstants);NETCORE;NETCORE31</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
<Title>Svg for .Net 5.0</Title>
<Title>Svg for .NET 5.0</Title>
<DefineConstants>$(DefineConstants);NETCORE;NETCORE50</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
<Title>Svg for .NET 6.0 on WindowsDesktop (WinForms, WPF)</Title>
<DefineConstants>$(DefineConstants);NETCORE;NETCORE60</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<Title>Svg for .Net Standard 2.0</Title>
<Title>Svg for .NET Standard 2.0</Title>
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD20</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
<Title>Svg for .Net Standard 2.1</Title>
<Title>Svg for .NET Standard 2.1</Title>
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD21</DefineConstants>
</PropertyGroup>

Expand All @@ -106,6 +112,7 @@
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

<!-- In .NET 6 these 2 packages are not required. -->
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0'">
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
Expand All @@ -117,7 +124,7 @@
</ItemGroup>

<!-- Mac specific include -->

<!-- Not required for net6.0-windows as that is only meant to be used on windows. -->
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0'">
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
</ItemGroup>
Expand All @@ -127,7 +134,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Memory" Version="4.5.4" Condition="'$(TargetFramework)' != 'net6.0-windows'" />
<PackageReference Include="ExCSS" Version="4.1.4" />
<PackageReference Include="Fizzler" Version="1.2.1" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
Expand Down