Skip to content

Commit

Permalink
Merge pull request #130 from WPFDevelopersOrg/dev
Browse files Browse the repository at this point in the history 
dev pull request master
  • Loading branch information
@yanjinhuagood
yanjinhuagood authored Dec 26, 2024
2 parents 96c65ae + ab44e3b commit e56925e
Show file tree
Hide file tree
Showing 98 changed files with 2,667 additions and 1,284 deletions.
120 changes: 20 additions & 100 deletions src/Resources.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,45 +22,16 @@
<HintPath>..\..\Reference\System.Windows.Interactivity.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<Resource Include="..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico">
<Link>WPFDevelopers.ico</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\发烧.png">
<Link>Resources\emoji\发烧.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\大笑.png">
<Link>Resources\emoji\大笑.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\得意.png">
<Link>Resources\emoji\得意.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\思考.png">
<Link>Resources\emoji\思考.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\生病.png">
<Link>Resources\emoji\生病.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\破涕为笑.png">
<Link>Resources\emoji\破涕为笑.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Lock.png">
<Link>Resources\Assets\Lock.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Mail.png">
<Link>Resources\Assets\Mail.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\*.png">
<Link>Resources\emoji\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\User.png">
<Link>Resources\Assets\User.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Clear.png">
<Link>Resources\Assets\Clear.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Background.png">
<Link>Resources\Assets\Background.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Logo.png">
<Link>Resources\Assets\Logo.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\*.png">
<Link>Resources\Assets\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Fonts\fixedsys.ttf">
<Link>Resources\Fonts\fixedsys.ttf</Link>
Expand All @@ -71,77 +42,26 @@
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\AnimationNavigationBar3D\background.png">
<Link>Resources\Images\AnimationNavigationBar3D\background.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\0.jpg">
<Link>Resources\Images\Breathe\0.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\1.jpg">
<Link>Resources\Images\Breathe\1.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\2.jpg">
<Link>Resources\Images\Breathe\2.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\Left.jpg">
<Link>Resources\Images\Chat\Left.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\Right.jpg">
<Link>Resources\Images\Chat\Right.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\jingtao.png">
<Link>Resources\Images\Chat\UserImages\jingtao.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\yanjinhua.png">
<Link>Resources\Images\Chat\UserImages\yanjinhua.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\1.png">
<Link>Resources\Images\CircularMenu\1.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\2.png">
<Link>Resources\Images\CircularMenu\2.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\3.png">
<Link>Resources\Images\CircularMenu\3.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\4.png">
<Link>Resources\Images\CircularMenu\4.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\5.png">
<Link>Resources\Images\CircularMenu\5.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\6.png">
<Link>Resources\Images\CircularMenu\6.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\7.png">
<Link>Resources\Images\CircularMenu\7.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\8.png">
<Link>Resources\Images\CircularMenu\8.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\0.jpg">
<Link>Resources\Images\Craouse\0.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\1.jpg">
<Link>Resources\Images\Craouse\1.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\2.jpg">
<Link>Resources\Images\Craouse\2.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\3.jpg">
<Link>Resources\Images\Craouse\3.jpg</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\*.jpg">
<Link>Resources\Images\Breathe\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\4.jpg">
<Link>Resources\Images\Craouse\4.jpg</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\*.jpg">
<Link>Resources\Images\Chat\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Crop\0.jpg">
<Link>Resources\Images\Crop\0.jpg</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\*.png">
<Link>Resources\Images\Chat\UserImages\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Eye_50px.png">
<Link>Resources\Images\Passwrod\Eye_50px.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircleMenu\*.png">
<Link>Resources\Images\CircleMenu\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Invisible_50px.png">
<Link>Resources\Images\Passwrod\Invisible_50px.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\*.jpg">
<Link>Resources\Images\Craouse\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Lock_48px.png">
<Link>Resources\Images\Passwrod\Lock_48px.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Crop\0.jpg">
<Link>Resources\Images\Crop\0.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\*.png">
<Link>Resources\Images\Passwrod\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Snow\SnowTree.png">
<Link>Resources\Images\Snow\SnowTree.png</Link>
Expand Down
35 changes: 35 additions & 0 deletions src/TargetFrameworks.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,39 @@
<PropertyGroup>
<TargetFrameworks>net45;net46;net47;net48;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
</Project>
Loading

0 comments on commit e56925e

Please sign in to comment.