Merge branch 'master' into master

HandyOrg · Jul 11, 2020 · ea8c8a9 · ea8c8a9
2 parents 62b1eb2 + 40cc0f6
commit ea8c8a9
Show file tree

Hide file tree

Showing 608 changed files with 11,261 additions and 6,199 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,31 +16,15 @@ jobs:
         uses: nuget/setup-nuget@master
 
       - name: Restore Nuget packages
-        run: nuget restore src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
-
-      - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@master
+        run: nuget restore src/HandyControl.sln
 
       - name: Setup .NET Core
         uses: actions/setup-dotnet@master
+        with:
+          dotnet-version: '5.0.100-preview.5.20279.10'
 
       - name: Build Net_40
-        run: msbuild src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj -p:Configuration=Release
+        run: dotnet build src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj -p:Configuration=Release-Net40
 
       - name: Build Net_45
-        run: msbuild src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release-Net45
-
-      - name: Build Net_462
-        run: msbuild src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release-Net462
-
-      - name: Build Net_47
-        run: msbuild src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release-Net47
-
-      - name: Build Net_48
-        run: msbuild src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release-Net48
-
-      - name: Build Core_30
-        run: dotnet build src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj --configuration Release-Core30
-
-      - name: Build Core_31
-        run: dotnet build src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj --configuration Release-Core31
+        run: dotnet build src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,7 @@ packages/
 build/*
 !build/build.cake
 !build/build.nuspec
-!build/build.ps1
+!build/build.ps1
+!build/tools/
+build/tools/*
+!build/tools/packages.config
diff --git a/Installers/VS2019/HandyControl_VS2019/icon_100_100.png b/Installers/VS2019/HandyControl_VS2019/icon_100_100.png
diff --git a/Installers/VS2019/HandyControl_VS2019/icon_300_300.png b/Installers/VS2019/HandyControl_VS2019/icon_300_300.png
diff --git a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="5949c79d-eb43-4033-8b7b-9349d34512c6" Version="2.4.0" Language="en-US" Publisher="HandyOrg" />
+        <Identity Id="5949c79d-eb43-4033-8b7b-9349d34512c6" Version="2.5.0" Language="en-US" Publisher="HandyOrg" />
         <DisplayName>HandyControl for VS2019</DisplayName>
         <Description xml:space="preserve">This VSIX Project will help people initialize a HandyControl project.</Description>
         <MoreInfo>https://handyorg.github.io/handycontrol</MoreInfo>

diff --git a/Installers/VS2019/WpfApp/ProjectTemplate.csproj b/Installers/VS2019/WpfApp/ProjectTemplate.csproj
@@ -34,8 +34,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HandyControl, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HandyControl.2.4.0\lib\net47\HandyControl.dll</HintPath>
+    <Reference Include="HandyControl, Version=2.5.0.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HandyControl.2.5.0.1\lib\net47\HandyControl.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xaml">

diff --git a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs
@@ -10,5 +10,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.4.0")]
-[assembly: AssemblyFileVersion("2.4.0")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
diff --git a/Installers/VS2019/WpfApp/packages.config b/Installers/VS2019/WpfApp/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HandyControl" version="2.4.0" targetFramework="net47" />
+  <package id="HandyControl" version="2.5.0.1" targetFramework="net47" />
 </packages>
diff --git a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj b/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj
@@ -19,6 +19,6 @@
     <DefineConstants>TRACE;Core</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="HandyControl" Version="2.4.0" />
+    <PackageReference Include="HandyControl" Version="2.5.0.1" />
   </ItemGroup>
 </Project>
diff --git a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs
@@ -10,5 +10,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.4.0")]
-[assembly: AssemblyFileVersion("2.4.0")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
diff --git a/README-cn.md b/README-cn.md
diff --git a/README.md b/README.md
diff --git a/build/build.cake b/build/build.cake
@@ -10,61 +10,71 @@ Task("Build")
     .IsDependentOn("Clean")
     .Does(() =>
 {
-    var vsLatest = VSWhereLatest();
-    var msBuildPath = vsLatest?.CombineWithFilePath("./MSBuild/Current/Bin/MSBuild.exe");
-    NuGetRestore("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj");
+    NuGetRestore("../src/HandyControl.sln");
 
-    var settingsNet40 = new MSBuildSettings
+    var settingsNet40 = new DotNetCoreBuildSettings
     {
-        Configuration = "Release",
-        ToolPath = msBuildPath,
-    }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net40")).FullPath);
+        Configuration = "Release-Net40",
+        OutputDirectory = "lib/net40"
+    };
 
-    var settingsNet45 = new MSBuildSettings
+    var settingsNet45 = new DotNetCoreBuildSettings
     {
-        Configuration = "Release-Net45",
-        ToolPath = msBuildPath,
-    }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net45")).FullPath);
+        Configuration = "Release",
+        Framework = "net45",
+        OutputDirectory = "lib/net45"
+    };
 
-    var settingsNet462 = new MSBuildSettings
+    var settingsNet462 = new DotNetCoreBuildSettings
     {
-        Configuration = "Release-Net462",
-        ToolPath = msBuildPath,
-    }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net462")).FullPath);
+        Configuration = "Release",
+        Framework = "net462",
+        OutputDirectory = "lib/net462"
+    };
 
-    var settingsNet47 = new MSBuildSettings
+    var settingsNet47 = new DotNetCoreBuildSettings
     {
-        Configuration = "Release-Net47",
-        ToolPath = msBuildPath,
-    }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net47")).FullPath);
+        Configuration = "Release",
+        Framework = "net47",
+        OutputDirectory = "lib/net47"
+    };
 
-    var settingsNet48 = new MSBuildSettings
+    var settingsNet48 = new DotNetCoreBuildSettings
     {
-        Configuration = "Release-Net48",
-        ToolPath = msBuildPath,
-    }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net48")).FullPath);
+        Configuration = "Release",
+        Framework = "net48",
+        OutputDirectory = "lib/net48"
+    };
 
     var settingsCore30 = new DotNetCoreBuildSettings
     {
+        Configuration = "Release",
         Framework = "netcoreapp3.0",
-        Configuration = "Release-Core30",
         OutputDirectory = "lib/netcoreapp3.0"
     };
 
     var settingsCore31 = new DotNetCoreBuildSettings
     {
+        Configuration = "Release",
         Framework = "netcoreapp3.1",
-        Configuration = "Release-Core31",
         OutputDirectory = "lib/netcoreapp3.1"
     };
 
-    MSBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40);
-    MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45);
-    MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462);
-    MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47);
-    MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48);
-    DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore30);
-    DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore31);
+    var settingsNet50 = new DotNetCoreBuildSettings
+    {
+        Configuration = "Release",
+        Framework = "net5.0",
+        OutputDirectory = "lib/net50"
+    };
+
+    DotNetCoreBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore30);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore31);
+    DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet50);
 });
 
 RunTarget(target);
diff --git a/build/build.nuspec b/build/build.nuspec
@@ -2,19 +2,19 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>HandyControl</id>
-    <version>2.4.0</version>
+    <version>2.5.0.2</version>
     <title>HandyOrg</title>
     <authors>HandyOrg</authors>
     <owners>HandyOrg</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="file">LICENSE</license>
+    <icon>icon.png</icon>
     <projectUrl>https://github.com/NaBian/HandyControl</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/icon.png</iconUrl>
     <description>Contains some commonly used simple WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
     <copyright>Copyright © HandyOrg 2018-2020</copyright>
-    <language></language>
     <tags>WPF C# Control</tags>
-    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="1af8ac90f497e6c65e4d596604f89f54e21cbcc6" />
+    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="be21771a17c46074df1b1a8a6da88dea8d548392" />
     <dependencies>
       <group targetFramework=".NETFramework4.0">
         <dependency id="Microsoft.Windows.Shell" version="3.0.1" />
@@ -24,47 +24,77 @@
       <group targetFramework=".NETFramework4.7" />
       <group targetFramework=".NETFramework4.8" />
       <group targetFramework=".NETCoreApp3.0" />
+      <group targetFramework=".NETCoreApp3.1" />
     </dependencies>
   </metadata>
   <files>
     <file src="lib\net40\en\HandyControl.resources.dll" target="lib\net40\en\HandyControl.resources.dll" />
     <file src="lib\net40\fa\HandyControl.resources.dll" target="lib\net40\fa\HandyControl.resources.dll" />
     <file src="lib\net40\fr\HandyControl.resources.dll" target="lib\net40\fr\HandyControl.resources.dll" />
+    <file src="lib\net40\ko-KR\HandyControl.resources.dll" target="lib\net40\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net40\ru\HandyControl.resources.dll" target="lib\net40\ru\HandyControl.resources.dll" />
+    <file src="lib\net40\tr\HandyControl.resources.dll" target="lib\net40\tr\HandyControl.resources.dll" />
     <file src="lib\net40\HandyControl.dll" target="lib\net40\HandyControl.dll" />
     <file src="lib\net40\HandyControl.pdb" target="lib\net40\HandyControl.pdb" />
     <file src="lib\net40\HandyControl.xml" target="lib\net40\HandyControl.xml" />
     <file src="lib\net40\Microsoft.Windows.Shell.dll" target="lib\net40\Microsoft.Windows.Shell.dll" />
-    <file src="lib\net40\Microsoft.Windows.Shell.pdb" target="lib\net40\Microsoft.Windows.Shell.pdb" />
     <file src="lib\net45\en\HandyControl.resources.dll" target="lib\net45\en\HandyControl.resources.dll" />
     <file src="lib\net45\fa\HandyControl.resources.dll" target="lib\net45\fa\HandyControl.resources.dll" />
     <file src="lib\net45\fr\HandyControl.resources.dll" target="lib\net45\fr\HandyControl.resources.dll" />
+    <file src="lib\net45\ko-KR\HandyControl.resources.dll" target="lib\net45\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net45\ru\HandyControl.resources.dll" target="lib\net45\ru\HandyControl.resources.dll" />
+    <file src="lib\net45\tr\HandyControl.resources.dll" target="lib\net45\tr\HandyControl.resources.dll" />
     <file src="lib\net45\HandyControl.dll" target="lib\net45\HandyControl.dll" />
     <file src="lib\net45\HandyControl.pdb" target="lib\net45\HandyControl.pdb" />
     <file src="lib\net45\HandyControl.xml" target="lib\net45\HandyControl.xml" />
     <file src="lib\net462\en\HandyControl.resources.dll" target="lib\net462\en\HandyControl.resources.dll" />
     <file src="lib\net462\fa\HandyControl.resources.dll" target="lib\net462\fa\HandyControl.resources.dll" />
     <file src="lib\net462\fr\HandyControl.resources.dll" target="lib\net462\fr\HandyControl.resources.dll" />
+    <file src="lib\net462\ko-KR\HandyControl.resources.dll" target="lib\net462\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net462\ru\HandyControl.resources.dll" target="lib\net462\ru\HandyControl.resources.dll" />
+    <file src="lib\net462\tr\HandyControl.resources.dll" target="lib\net462\tr\HandyControl.resources.dll" />
     <file src="lib\net462\HandyControl.dll" target="lib\net462\HandyControl.dll" />
     <file src="lib\net462\HandyControl.pdb" target="lib\net462\HandyControl.pdb" />
     <file src="lib\net462\HandyControl.xml" target="lib\net462\HandyControl.xml" />
     <file src="lib\net47\en\HandyControl.resources.dll" target="lib\net47\en\HandyControl.resources.dll" />
     <file src="lib\net47\fa\HandyControl.resources.dll" target="lib\net47\fa\HandyControl.resources.dll" />
     <file src="lib\net47\fr\HandyControl.resources.dll" target="lib\net47\fr\HandyControl.resources.dll" />
+    <file src="lib\net47\ko-KR\HandyControl.resources.dll" target="lib\net47\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net47\ru\HandyControl.resources.dll" target="lib\net47\ru\HandyControl.resources.dll" />
+    <file src="lib\net47\tr\HandyControl.resources.dll" target="lib\net47\tr\HandyControl.resources.dll" />
     <file src="lib\net47\HandyControl.dll" target="lib\net47\HandyControl.dll" />
     <file src="lib\net47\HandyControl.pdb" target="lib\net47\HandyControl.pdb" />
     <file src="lib\net47\HandyControl.xml" target="lib\net47\HandyControl.xml" />
     <file src="lib\net48\en\HandyControl.resources.dll" target="lib\net48\en\HandyControl.resources.dll" />
     <file src="lib\net48\fa\HandyControl.resources.dll" target="lib\net48\fa\HandyControl.resources.dll" />
     <file src="lib\net48\fr\HandyControl.resources.dll" target="lib\net48\fr\HandyControl.resources.dll" />
+    <file src="lib\net48\ko-KR\HandyControl.resources.dll" target="lib\net48\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net48\ru\HandyControl.resources.dll" target="lib\net48\ru\HandyControl.resources.dll" />
+    <file src="lib\net48\tr\HandyControl.resources.dll" target="lib\net48\tr\HandyControl.resources.dll" />
     <file src="lib\net48\HandyControl.dll" target="lib\net48\HandyControl.dll" />
     <file src="lib\net48\HandyControl.pdb" target="lib\net48\HandyControl.pdb" />
     <file src="lib\net48\HandyControl.xml" target="lib\net48\HandyControl.xml" />
     <file src="lib\netcoreapp3.0\en\HandyControl.resources.dll" target="lib\netcoreapp3.0\en\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\fa\HandyControl.resources.dll" target="lib\netcoreapp3.0\fa\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\fr\HandyControl.resources.dll" target="lib\netcoreapp3.0\fr\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\ko-KR\HandyControl.resources.dll" target="lib\netcoreapp3.0\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\ru\HandyControl.resources.dll" target="lib\netcoreapp3.0\ru\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\tr\HandyControl.resources.dll" target="lib\netcoreapp3.0\tr\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\HandyControl.deps.json" target="lib\netcoreapp3.0\HandyControl.deps.json" />
     <file src="lib\netcoreapp3.0\HandyControl.dll" target="lib\netcoreapp3.0\HandyControl.dll" />
     <file src="lib\netcoreapp3.0\HandyControl.pdb" target="lib\netcoreapp3.0\HandyControl.pdb" />
     <file src="lib\netcoreapp3.0\HandyControl.xml" target="lib\netcoreapp3.0\HandyControl.xml" />
+    <file src="lib\netcoreapp3.1\en\HandyControl.resources.dll" target="lib\netcoreapp3.1\en\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\fa\HandyControl.resources.dll" target="lib\netcoreapp3.1\fa\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\fr\HandyControl.resources.dll" target="lib\netcoreapp3.1\fr\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\ko-KR\HandyControl.resources.dll" target="lib\netcoreapp3.1\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\ru\HandyControl.resources.dll" target="lib\netcoreapp3.1\ru\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\tr\HandyControl.resources.dll" target="lib\netcoreapp3.1\tr\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\HandyControl.deps.json" target="lib\netcoreapp3.1\HandyControl.deps.json" />
+    <file src="lib\netcoreapp3.1\HandyControl.dll" target="lib\netcoreapp3.1\HandyControl.dll" />
+    <file src="lib\netcoreapp3.1\HandyControl.pdb" target="lib\netcoreapp3.1\HandyControl.pdb" />
+    <file src="lib\netcoreapp3.1\HandyControl.xml" target="lib\netcoreapp3.1\HandyControl.xml" />
+    <file src="icon.png" target="icon.png" />
+    <file src="LICENSE" target="LICENSE" />
   </files>
 </package>
diff --git a/build/tools/packages.config b/build/tools/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+    <package id="Cake" version="0.35.0" />
+</packages>