Skip to content

Commit 45dcbf2

Browse files
committed
update version and readme file
1 parent bc0c308 commit 45dcbf2

4 files changed

Lines changed: 79 additions & 62 deletions

File tree

README.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ These system are tested:
99

1010
- Windows 8.1 64bit
1111
- Ubuntu Server 16.04 LTS 64bit
12+
- Fedora 24 64bit
13+
- CentOS 7.2 64bit
1214

1315
These features should work:
1416

@@ -28,11 +30,26 @@ On windows, just install package `ZKWeb.System.Drawing` from nuget, nothing else
2830

2931
On Linux, except install package `ZKWeb.System.Drawing` from nuget, you need install `libgdiplus`.<br/>
3032

31-
- Ubuntu:
33+
- Ubuntu 16.04 and above:
3234
- apt-get install libgdiplus
3335
- cd /usr/lib
3436
- ln -s libgdiplus.so gdiplus.dll
35-
- Other distribution: see https://github.com/mono/libgdiplus
37+
- Fedora 23 and above:
38+
- dnf install libgdiplus
39+
- cd /usr/lib64/
40+
- ln -s libgdiplus.so gdiplus.dll
41+
- CentOS 7 and above:
42+
- yum install autoconf automake libtool
43+
- yum install freetype-devel fontconfig libXft-devel
44+
- yum install libjpeg-turbo-devel libpng-devel giflib-devel libtiff-devel libexif-devel
45+
- yum install glib2-devel cairo-devel
46+
- git clone https://github.com/mono/libgdiplus
47+
- cd libgdiplus
48+
- ./autogen.sh
49+
- make
50+
- make install
51+
- cd /usr/lib64/
52+
- ln -s /usr/local/lib/libgdiplus.so gdiplus.dll
3653

3754
# Huh? What's the different with CoreCompat.System.Drawing?
3855

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-*",
33

4-
"dependencies": {
5-
"NETStandard.Library": "1.6.0",
6-
"ZKWeb.System.Drawing": { "target": "project" },
7-
"NUnit": "3.4.1",
8-
"dotnet-test-nunit": "3.4.0-beta-2"
9-
},
4+
"dependencies": {
5+
"NETStandard.Library": "1.6.0",
6+
"ZKWeb.System.Drawing": { "target": "project" },
7+
"NUnit": "3.4.1",
8+
"dotnet-test-nunit": "3.4.0-beta-2"
9+
},
1010

11-
"testRunner": "nunit",
11+
"testRunner": "nunit",
1212

13-
"buildOptions": {
14-
"allowUnsafe": true
15-
},
13+
"buildOptions": {
14+
"allowUnsafe": true
15+
},
1616

17-
"frameworks": {
18-
"net461": {
19-
"frameworkAssemblies": {
20-
"System.Data": "4.0.0.0"
21-
}
22-
},
23-
"netcoreapp1.0": {
24-
"imports": [
25-
"portable-net451+win8",
26-
"dnxcore5"
27-
],
28-
"buildOptions": {
29-
"define": [ "CORECLR", "NETCORE" ]
30-
},
31-
"dependencies": {
32-
"Microsoft.NETCore.App": {
33-
"version": "1.0.0",
34-
"type": "platform"
35-
}
36-
}
37-
}
38-
}
17+
"frameworks": {
18+
"net461": {
19+
"frameworkAssemblies": {
20+
"System.Data": "4.0.0.0"
21+
}
22+
},
23+
"netcoreapp1.0": {
24+
"imports": [
25+
"portable-net451+win8",
26+
"dnxcore5"
27+
],
28+
"buildOptions": {
29+
"define": [ "CORECLR", "NETCORE" ]
30+
},
31+
"dependencies": {
32+
"Microsoft.NETCore.App": {
33+
"version": "1.0.0",
34+
"type": "platform"
35+
}
36+
}
37+
}
38+
}
3939
}

src/ZKWeb.System.Drawing/ZKWeb.System.Drawing.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
<id>ZKWeb.System.Drawing</id>
5-
<version>2.0.0-beta-1</version>
5+
<version>2.0.0</version>
66
<authors>ZKWeb.System.Drawing</authors>
77
<owners>ZKWeb.System.Drawing</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-*",
33

4-
"dependencies": {
5-
"NETStandard.Library": "1.6.0"
6-
},
4+
"dependencies": {
5+
"NETStandard.Library": "1.6.0"
6+
},
77

8-
"buildOptions": {
9-
"allowUnsafe": true
10-
},
8+
"buildOptions": {
9+
"allowUnsafe": true
10+
},
1111

12-
"frameworks": {
13-
"net45": {
14-
"imports": "portable-net45+win8"
15-
},
16-
"netstandard1.5": {
17-
"imports": "dnxcore50",
18-
"dependencies": {
19-
"System.ComponentModel.TypeConverter": "4.1.0",
20-
"System.Collections.NonGeneric": "4.0.1",
21-
"System.Collections.Specialized": "4.0.1",
22-
"System.Runtime.Serialization.Primitives": "4.1.1",
23-
"System.Runtime.InteropServices": "4.1.0",
24-
"System.Threading.Thread": "4.0.0"
25-
},
26-
"buildOptions": {
27-
"define": [ "CORECLR", "NETCORE" ]
28-
}
29-
}
30-
}
12+
"frameworks": {
13+
"net45": {
14+
"imports": "portable-net45+win8"
15+
},
16+
"netstandard1.5": {
17+
"imports": "dnxcore50",
18+
"dependencies": {
19+
"System.ComponentModel.TypeConverter": "4.1.0",
20+
"System.Collections.NonGeneric": "4.0.1",
21+
"System.Collections.Specialized": "4.0.1",
22+
"System.Runtime.Serialization.Primitives": "4.1.1",
23+
"System.Runtime.InteropServices": "4.1.0",
24+
"System.Threading.Thread": "4.0.0"
25+
},
26+
"buildOptions": {
27+
"define": [ "CORECLR", "NETCORE" ]
28+
}
29+
}
30+
}
3131
}

0 commit comments

Comments
 (0)