Merge branch 'master' into pr/623

This commit is contained in:
NaBian committed 2021-01-19 23:44:17 +08:00
commit 43569dde83
65 files changed
+2122 -1560

No files matched your search

@@ -8,6 +8,11 @@
<NoWarn>0108;MSB3026;MSB3061</NoWarn>
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
<UseWPF>true</UseWPF>
<Copyright>Copyright © HandyOrg 2018-2021</Copyright>
<AssemblyVersion>3.1.0.0</AssemblyVersion>
<FileVersion>3.1.0.0</FileVersion>
<Version>3.1.0.0</Version>
<RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
</PropertyGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
<Reference Include="Microsoft.CSharp" />
@@ -10,8 +10,15 @@
<NoWarn>0067;0649;1591;MSB3061;SYSLIB0003;SYSLIB0004</NoWarn>
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
<UseWPF>true</UseWPF>
<AssemblyOriginatorKeyFile>..\..\Shared\HandyControl_Shared\key.snk</AssemblyOriginatorKeyFile>
<Copyright>Copyright © HandyOrg 2018-2021</Copyright>
<AssemblyVersion>3.1.0.0</AssemblyVersion>
<FileVersion>3.1.0.0</FileVersion>
<Version>3.1.0.0</Version>
<RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<SignAssembly>true</SignAssembly>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\HandyControl.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>