Skip to content

Commit e56925e

Browse files
yanjinhuagoodyanjinhuagood
authored
Merge pull request #130 from WPFDevelopersOrg/dev
dev pull request master
2 parents 96c65ae + ab44e3b commit e56925e

File tree

98 files changed

+2667
-1284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+2667
-1284
lines changed

‎src/Resources.props

+20-100
Original file line numberDiff line numberDiff line change
@@ -22,45 +22,16 @@
2222
<HintPath>..\..\Reference\System.Windows.Interactivity.dll</HintPath>
2323
</Reference>
2424
</ItemGroup>
25+
2526
<ItemGroup>
2627
<Resource Include="..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico">
2728
<Link>WPFDevelopers.ico</Link>
2829
</Resource>
29-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\发烧.png">
30-
<Link>Resources\emoji\发烧.png</Link>
31-
</Resource>
32-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\大笑.png">
33-
<Link>Resources\emoji\大笑.png</Link>
34-
</Resource>
35-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\得意.png">
36-
<Link>Resources\emoji\得意.png</Link>
37-
</Resource>
38-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\思考.png">
39-
<Link>Resources\emoji\思考.png</Link>
40-
</Resource>
41-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\生病.png">
42-
<Link>Resources\emoji\生病.png</Link>
43-
</Resource>
44-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\破涕为笑.png">
45-
<Link>Resources\emoji\破涕为笑.png</Link>
46-
</Resource>
47-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Lock.png">
48-
<Link>Resources\Assets\Lock.png</Link>
49-
</Resource>
50-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Mail.png">
51-
<Link>Resources\Assets\Mail.png</Link>
30+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\*.png">
31+
<Link>Resources\emoji\%(Filename)%(Extension)</Link>
5232
</Resource>
53-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\User.png">
54-
<Link>Resources\Assets\User.png</Link>
55-
</Resource>
56-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Clear.png">
57-
<Link>Resources\Assets\Clear.png</Link>
58-
</Resource>
59-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Background.png">
60-
<Link>Resources\Assets\Background.png</Link>
61-
</Resource>
62-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Logo.png">
63-
<Link>Resources\Assets\Logo.png</Link>
33+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\*.png">
34+
<Link>Resources\Assets\%(Filename)%(Extension)</Link>
6435
</Resource>
6536
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Fonts\fixedsys.ttf">
6637
<Link>Resources\Fonts\fixedsys.ttf</Link>
@@ -71,77 +42,26 @@
7142
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\AnimationNavigationBar3D\background.png">
7243
<Link>Resources\Images\AnimationNavigationBar3D\background.png</Link>
7344
</Resource>
74-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\0.jpg">
75-
<Link>Resources\Images\Breathe\0.jpg</Link>
76-
</Resource>
77-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\1.jpg">
78-
<Link>Resources\Images\Breathe\1.jpg</Link>
79-
</Resource>
80-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\2.jpg">
81-
<Link>Resources\Images\Breathe\2.jpg</Link>
82-
</Resource>
83-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\Left.jpg">
84-
<Link>Resources\Images\Chat\Left.jpg</Link>
85-
</Resource>
86-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\Right.jpg">
87-
<Link>Resources\Images\Chat\Right.jpg</Link>
88-
</Resource>
89-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\jingtao.png">
90-
<Link>Resources\Images\Chat\UserImages\jingtao.png</Link>
91-
</Resource>
92-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\yanjinhua.png">
93-
<Link>Resources\Images\Chat\UserImages\yanjinhua.png</Link>
94-
</Resource>
95-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\1.png">
96-
<Link>Resources\Images\CircularMenu\1.png</Link>
97-
</Resource>
98-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\2.png">
99-
<Link>Resources\Images\CircularMenu\2.png</Link>
100-
</Resource>
101-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\3.png">
102-
<Link>Resources\Images\CircularMenu\3.png</Link>
103-
</Resource>
104-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\4.png">
105-
<Link>Resources\Images\CircularMenu\4.png</Link>
106-
</Resource>
107-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\5.png">
108-
<Link>Resources\Images\CircularMenu\5.png</Link>
109-
</Resource>
110-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\6.png">
111-
<Link>Resources\Images\CircularMenu\6.png</Link>
112-
</Resource>
113-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\7.png">
114-
<Link>Resources\Images\CircularMenu\7.png</Link>
115-
</Resource>
116-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\8.png">
117-
<Link>Resources\Images\CircularMenu\8.png</Link>
118-
</Resource>
119-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\0.jpg">
120-
<Link>Resources\Images\Craouse\0.jpg</Link>
121-
</Resource>
122-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\1.jpg">
123-
<Link>Resources\Images\Craouse\1.jpg</Link>
124-
</Resource>
125-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\2.jpg">
126-
<Link>Resources\Images\Craouse\2.jpg</Link>
127-
</Resource>
128-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\3.jpg">
129-
<Link>Resources\Images\Craouse\3.jpg</Link>
45+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\*.jpg">
46+
<Link>Resources\Images\Breathe\%(Filename)%(Extension)</Link>
13047
</Resource>
131-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\4.jpg">
132-
<Link>Resources\Images\Craouse\4.jpg</Link>
48+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\*.jpg">
49+
<Link>Resources\Images\Chat\%(Filename)%(Extension)</Link>
13350
</Resource>
134-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Crop\0.jpg">
135-
<Link>Resources\Images\Crop\0.jpg</Link>
51+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\*.png">
52+
<Link>Resources\Images\Chat\UserImages\%(Filename)%(Extension)</Link>
13653
</Resource>
137-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Eye_50px.png">
138-
<Link>Resources\Images\Passwrod\Eye_50px.png</Link>
54+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircleMenu\*.png">
55+
<Link>Resources\Images\CircleMenu\%(Filename)%(Extension)</Link>
13956
</Resource>
140-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Invisible_50px.png">
141-
<Link>Resources\Images\Passwrod\Invisible_50px.png</Link>
57+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\*.jpg">
58+
<Link>Resources\Images\Craouse\%(Filename)%(Extension)</Link>
14259
</Resource>
143-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Lock_48px.png">
144-
<Link>Resources\Images\Passwrod\Lock_48px.png</Link>
60+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Crop\0.jpg">
61+
<Link>Resources\Images\Crop\0.jpg</Link>
62+
</Resource>
63+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\*.png">
64+
<Link>Resources\Images\Passwrod\%(Filename)%(Extension)</Link>
14565
</Resource>
14666
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Snow\SnowTree.png">
14767
<Link>Resources\Images\Snow\SnowTree.png</Link>

‎src/TargetFrameworks.props

+35
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,39 @@
22
<PropertyGroup>
33
<TargetFrameworks>net45;net46;net47;net48;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;netcoreapp3.0</TargetFrameworks>
44
</PropertyGroup>
5+
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
6+
<PackageReference Include="System.Drawing.Common">
7+
<Version>7.0.0</Version>
8+
</PackageReference>
9+
</ItemGroup>
10+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
11+
<PackageReference Include="System.Drawing.Common">
12+
<Version>7.0.0</Version>
13+
</PackageReference>
14+
</ItemGroup>
15+
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
16+
<PackageReference Include="System.Drawing.Common">
17+
<Version>7.0.0</Version>
18+
</PackageReference>
19+
</ItemGroup>
20+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
21+
<PackageReference Include="System.Drawing.Common">
22+
<Version>7.0.0</Version>
23+
</PackageReference>
24+
</ItemGroup>
25+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
26+
<PackageReference Include="System.Drawing.Common">
27+
<Version>7.0.0</Version>
28+
</PackageReference>
29+
</ItemGroup>
30+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
31+
<PackageReference Include="System.Drawing.Common">
32+
<Version>7.0.0</Version>
33+
</PackageReference>
34+
</ItemGroup>
35+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
36+
<PackageReference Include="System.Drawing.Common">
37+
<Version>7.0.0</Version>
38+
</PackageReference>
39+
</ItemGroup>
540
</Project>

0 commit comments

Comments
 (0)