Skip to content

Added Net6 in the conditional to take the reference System.Drawing.Co… #484

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

Closed
wants to merge 1 commit into from
Closed

Added Net6 in the conditional to take the reference System.Drawing.Co… #484

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
2 changes: 1 addition & 1 deletion QRCoder.Xaml/QRCoder.Xaml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net35;net40;net5.0-windows;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net40;net5.0-windows;net6.0-windows</TargetFrameworks>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<!-- <UseWindowsForms Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows'">true</UseWindowsForms> -->
<UseWPF Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows'">true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion QRCoder/ArtQRCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS

using System;
using System.Drawing;
Expand Down
2 changes: 1 addition & 1 deletion QRCoder/Base64QRCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
using System;
using System.Drawing;
using System.Drawing.Imaging;
Expand Down
2 changes: 1 addition & 1 deletion QRCoder/PdfByteQRCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
using System;
using System.Collections.Generic;
using System.Drawing.Imaging;
Expand Down
2 changes: 1 addition & 1 deletion QRCoder/PostscriptQRCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
using System;
using System.Drawing;
using static QRCoder.QRCodeGenerator;
Expand Down
2 changes: 1 addition & 1 deletion QRCoder/QRCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
using System;
using System.Drawing;
using System.Drawing.Drawing2D;
Expand Down
10 changes: 5 additions & 5 deletions QRCoder/QRCoder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net35;net40;netstandard1.3;netstandard2.0;net5.0;net5.0-windows;net6.0;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net40;netstandard1.3;netstandard2.0;net5.0;net5.0-windows;net6.0;net6.0-windows;</TargetFrameworks>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_WINDOWS</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' == 'net6.0-windows'">$(DefineConstants);NET6_0_WINDOWS</DefineConstants>
Expand All @@ -16,7 +16,7 @@
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PackageId>QRCoder</PackageId>
<Version>1.4.3</Version>
<Version>1.4.4</Version>
<Authors>Raffael Herrmann</Authors>
<PackageOwners>Raffael Herrmann</PackageOwners>
<AssemblyName>QRCoder</AssemblyName>
Expand Down Expand Up @@ -48,9 +48,9 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net5.0-windows' ">
<PackageReference Include="System.Drawing.Common" Version="5.0.3" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net6.0-windows' ">
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>

<PropertyGroup>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
Expand Down
2 changes: 1 addition & 1 deletion QRCoder/SvgQRCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET5_0_WINDOWS || NET6_0 || NET6_0_WINDOWS
using QRCoder.Extensions;
using System;
using System.Collections;
Expand Down
2 changes: 1 addition & 1 deletion QRCoderTests/QRCoderTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net35;net452;netcoreapp1.1;netcoreapp2.0;net5.0;net5.0-windows;net6.0;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net452;netcoreapp1.1;netcoreapp2.0;net5.0;net5.0-windows;net6.0;net6.0-windows</TargetFrameworks>
<UseWindowsForms Condition="'$(TargetFramework)' == 'net5.0-windows'">true</UseWindowsForms>
<UseWPF Condition="'$(TargetFramework)' == 'net5.0-windows'">true</UseWPF>
<DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_WINDOWS</DefineConstants>
Expand Down