diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 150c58a4..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Environment (please complete the following information):** - - .net: [e.g. 4.6.2] - - IDE [e.g. vs2017] - - Version [e.g. 1.0.0] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml new file mode 100644 index 00000000..f03073b1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -0,0 +1,96 @@ +name: Bug report +description: File a bug report +title: "Bug title" +labels: [] +body: + - type: textarea + validations: + required: true + attributes: + label: Describe the bug + description: Please enter a short, clear description of the bug. + - type: textarea + validations: + required: true + attributes: + label: Steps to reproduce the bug + description: Please provide any required setup and steps to reproduce the behavior. + placeholder: | + 1. Go to '...' + 2. Click on '....' + - type: textarea + attributes: + label: Expected behavior + description: Please provide a description of what you expected to happen + - type: textarea + attributes: + label: Screenshots + description: If applicable, add screenshots here to help explain your problem + - type: dropdown + attributes: + label: NuGet package version + options: + - "HandyControl 3.4.0" + - "HandyControl 3.3.0" + - "HandyControl 3.2.0" + - "HandyControl 3.1.0" + - "HandyControl 3.0.0" + - "HandyControls (Custom version) 3.4.0" + - "HandyControls (Custom version) 3.3.11" + - "HandyControls (Custom version) 3.3.10" + - "HandyControls (Custom version) 3.3.9" + - "HandyControls (Custom version) 3.3.8.1" + - "HandyControls (Custom version) 3.3.8" + - "HandyControls (Custom version) 3.3.7" + - type: dropdown + attributes: + label: IDE + description: Which Visual Studio versions did you see the issue on? + multiple: true + options: + - "Visual Studio 2022-preview" + - "Visual Studio 2022" + - "Visual Studio 2019" + - "Visual Studio 2017" + - type: dropdown + attributes: + label: Framework type + description: please specify for which framework type you have encountered the issue. + multiple: true + options: + - ".Net 6.0" + - ".Net 5.0" + - ".Net Core 3.1" + - ".Net Core 3.0" + - ".Net Framework 4.8" + - ".Net Framework 4.7.2" + - ".Net Framework 4.7.1" + - ".Net Framework 4.7.0" + - ".Net Framework 4.6.2" + - ".Net Framework 4.6.1" + - ".Net Framework 4.6.0" + - ".Net Framework 4.5.2" + - ".Net Framework 4.5.1" + - ".Net Framework 4.5.0" + - ".Net Framework 4.0.0" + - type: dropdown + attributes: + label: Windows version + description: Which Windows versions did you see the issue on? + multiple: true + options: + - "Insider Build (xxxxx)" + - "Windows 11 (22000)" + - "May 2021 Update (19043)" + - "October 2020 Update (19042)" + - "May 2020 Update (19041)" + - "November 2019 Update (18363)" + - "May 2019 Update (18362)" + - "October 2018 Update (17763)" + - "April 2018 Update (17134)" + - "Fall Creators Update (16299)" + - "Creators Update (15063)" + - type: textarea + attributes: + label: Additional context + description: Enter any other applicable info here diff --git a/.github/workflows/push-to-myget.yml b/.github/workflows/push-to-myget.yml index 825c0df3..4d8efec4 100644 --- a/.github/workflows/push-to-myget.yml +++ b/.github/workflows/push-to-myget.yml @@ -7,6 +7,12 @@ jobs: - name: checkout uses: actions/checkout@master + - name: Setup .NET Core SDK + uses: actions/setup-dotnet@master + with: + dotnet-version: '6.0.x' + include-prerelease: true + - name: setup nuget.exe uses: NuGet/setup-nuget@v1.0.5 @@ -15,7 +21,7 @@ jobs: run: | cd build .\build.ps1 - nuget pack build-for-myget.nuspec -version 3.3.0-beta.${env:GITHUB_RUN_NUMBER} + nuget pack build-for-myget.nuspec -version 3.4.0-beta.${env:GITHUB_RUN_NUMBER} $nupkgName = @(gci *.nupkg)[0].Name $mygetSourcePath = "https://www.myget.org/F/handycontrol" nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath diff --git a/README-cn.md b/README-cn.md index 7cd2546a..ffacdc5e 100644 --- a/README-cn.md +++ b/README-cn.md @@ -3,12 +3,12 @@

- 中文 - ❤ + 中文 + ❤ English

-

+

dotnet-version csharp-version IDE-version @@ -17,13 +17,13 @@ myget-version - + Github-build-status Nuget - +

## 特别声明 @@ -48,9 +48,9 @@ HandyControl 项目已加入 [dotNET China](https://gitee.com/dotnetchina) 组 ### 赞助 -* [以HandyControl的名义为慈善事业做贡献（请联系我们上赞助墙）](http://www.chinacharityfederation.org/ConfirmDonation/0.html?zhijie=3) +* [以HandyControl的名义为慈善事业做贡献（请联系我们上赞助墙）](http://www.chinacharityfederation.org/ConfirmDonation/0.html?zhijie=3) -* 为我们购买防脱洗发水 （支付宝扫码） +* 为我们购买防脱洗发水 （支付宝扫码） ![qrcode](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/qrcode.png) ## 贡献者 @@ -85,6 +85,7 @@ HandyControl 项目已加入 [dotNET China](https://gitee.com/dotnetchina) 组 shaosu imba-tjd jhm-ciberman +musashi-miyamoto ## 赞助者 @@ -93,8 +94,8 @@ HandyControl 项目已加入 [dotNET China](https://gitee.com/dotnetchina) 组 IUpdatable maplewei sunshang-hl -yangkang326 -zmrbak +yangkang326 +zmrbak AFei19911012 wayne2006 towerDLH @@ -130,6 +131,8 @@ HandyControl 项目已加入 [dotNET China](https://gitee.com/dotnetchina) 组 icarousfff qiang9420d zhongwcool +HenJigg +MysticABC ## 鸣谢 @@ -141,13 +144,13 @@ HandyControl 项目已加入 [dotNET China](https://gitee.com/dotnetchina) 组 quicker phpenv -AutumnBox +AutumnBox 如果你的项目没有被列出，请告知我们! 😀 ## 用法 -Step 1: 添加 HandyControl 引用，或在 nuget 上搜索 HandyControl; +Step 1: 添加 HandyControl 引用，或在 nuget 上搜索 HandyControl; ```Install-Package HandyControl``` @@ -277,7 +280,7 @@ Step 4: 开始编码 ### ImageBlock -![ImageBlock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ImageBlock.gif) +![ImageBlock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ImageBlock.gif) ![ImageBlock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ImageBlock.png) diff --git a/README.md b/README.md index 30a2f535..dc4cd19f 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@

- 中文 - ❤ + 中文 + ❤ English

@@ -14,16 +14,16 @@ IDE-version nuget-version - + myget-version - + Github-build-status Nuget - +

## 面向中国 @@ -42,9 +42,9 @@ ### 赞助 -* [以HandyControl的名义为慈善事业做贡献（请联系我们上赞助墙）](http://www.chinacharityfederation.org/ConfirmDonation/0.html?zhijie=3) +* [以HandyControl的名义为慈善事业做贡献（请联系我们上赞助墙）](http://www.chinacharityfederation.org/ConfirmDonation/0.html?zhijie=3) -* 为我们购买防脱洗发水 （支付宝扫码） +* 为我们购买防脱洗发水 （支付宝扫码） ![qrcode](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/qrcode.png) ## Contributors @@ -79,6 +79,7 @@ shaosu imba-tjd jhm-ciberman +musashi-miyamoto ## Backers @@ -87,8 +88,8 @@ IUpdatable maplewei sunshang-hl -yangkang326 -zmrbak +yangkang326 +zmrbak AFei19911012 wayne2006 towerDLH @@ -124,6 +125,8 @@ icarousfff qiang9420d zhongwcool +HenJigg +MysticABC ## Special thanks to @@ -135,13 +138,13 @@ quicker phpenv -AutumnBox +AutumnBox if your project is not listed here, let us know! 😀 ## Usage -Step 1: Add a reference to HandyControl or search for HandyControl on the nuget; +Step 1: Add a reference to HandyControl or search for HandyControl on the nuget; ```Install-Package HandyControl``` @@ -271,7 +274,7 @@ Step 4: Enjoy coding ### ImageBlock -![ImageBlock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/ImageBlock.gif) +![ImageBlock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/ImageBlock.gif) ![ImageBlock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/ImageBlock.png) diff --git a/build/build-for-myget.nuspec b/build/build-for-myget.nuspec index a6377e91..a1006922 100644 --- a/build/build-for-myget.nuspec +++ b/build/build-for-myget.nuspec @@ -35,6 +35,7 @@ + @@ -47,6 +48,7 @@ + @@ -59,6 +61,7 @@ + @@ -71,6 +74,7 @@ + @@ -83,6 +87,7 @@ + @@ -95,6 +100,7 @@ + @@ -107,6 +113,7 @@ + @@ -119,6 +126,7 @@ + @@ -131,6 +139,7 @@ + @@ -143,6 +152,7 @@ + @@ -155,6 +165,7 @@ + @@ -167,6 +178,7 @@ + @@ -181,6 +193,7 @@ + @@ -195,6 +208,7 @@ + @@ -208,6 +222,7 @@ + @@ -218,4 +233,4 @@ - \ No newline at end of file + diff --git a/build/build.Lang.es.nuspec b/build/build.Lang.es.nuspec new file mode 100644 index 00000000..5c1bd8c8 --- /dev/null +++ b/build/build.Lang.es.nuspec @@ -0,0 +1,55 @@ + + + + HandyControl.Lang.es + 3.3.0 + HandyOrg + HandyOrg + HandyOrg + true + LICENSE + icon.png + https://github.com/HandyOrg/HandyControl + Contains some simple and commonly used WPF controls + Changes are detailed at https://github.com/HandyOrg/HandyControl/releases + Copyright © HandyOrg 2018-2021 + WPF C# Control + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/build.Lang.ja.nuspec b/build/build.Lang.ja.nuspec new file mode 100644 index 00000000..08ca8ff8 --- /dev/null +++ b/build/build.Lang.ja.nuspec @@ -0,0 +1,55 @@ + + + + HandyControl.Lang.ja + 3.3.0 + HandyOrg + HandyOrg + HandyOrg + true + LICENSE + icon.png + https://github.com/HandyOrg/HandyControl + Contains some simple and commonly used WPF controls + Changes are detailed at https://github.com/HandyOrg/HandyControl/releases + Copyright © HandyOrg 2018-2021 + WPF C# Control + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/build.cake b/build/build.cake index f0e90dc2..1dbec896 100644 --- a/build/build.cake +++ b/build/build.cake @@ -42,7 +42,7 @@ Task("Build") { Configuration = "Release", Framework = framework, - OutputDirectory = $"lib/{framework}" + OutputDirectory = $"lib/{framework.Split('-')[0]}" }; DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settings); diff --git a/build/build.nuspec b/build/build.nuspec index 497f7e3b..2c8b28f2 100644 --- a/build/build.nuspec +++ b/build/build.nuspec @@ -67,16 +67,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/Installers/VS2019/HandyControl_VS2019.sln b/extension/visual studio/HandyControl_VS_Templates.sln similarity index 95% rename from Installers/VS2019/HandyControl_VS2019.sln rename to extension/visual studio/HandyControl_VS_Templates.sln index 78ca7aa9..b739d7e1 100644 --- a/Installers/VS2019/HandyControl_VS2019.sln +++ b/extension/visual studio/HandyControl_VS_Templates.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28803.352 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_VS2019", "HandyControl_VS2019\HandyControl_VS2019.csproj", "{3F0F7B9E-C150-4FAA-9274-4F6F0A96B8CA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_VS_Templates", "HandyControl_VS_Templates\HandyControl_VS_Templates.csproj", "{3F0F7B9E-C150-4FAA-9274-4F6F0A96B8CA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp", "WpfApp\WpfApp.csproj", "{83C70EB1-3A3F-4812-B86C-C7D1936699EB}" EndProject diff --git a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj b/extension/visual studio/HandyControl_VS_Templates/HandyControl_VS_Templates.csproj similarity index 96% rename from Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj rename to extension/visual studio/HandyControl_VS_Templates/HandyControl_VS_Templates.csproj index 633bf020..056551c0 100644 --- a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj +++ b/extension/visual studio/HandyControl_VS_Templates/HandyControl_VS_Templates.csproj @@ -13,8 +13,8 @@ {3F0F7B9E-C150-4FAA-9274-4F6F0A96B8CA} Library Properties - HandyControl_VS2019 - HandyControl_VS2019 + HandyControl_VS_Templates + HandyControl VS Templates v4.7.2 false true @@ -56,10 +56,10 @@ - + compile; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Installers/VS2019/HandyControl_VS2019/License.txt b/extension/visual studio/HandyControl_VS_Templates/License.txt similarity index 100% rename from Installers/VS2019/HandyControl_VS2019/License.txt rename to extension/visual studio/HandyControl_VS_Templates/License.txt diff --git a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs b/extension/visual studio/HandyControl_VS_Templates/Properties/AssemblyInfo.cs similarity index 63% rename from Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs rename to extension/visual studio/HandyControl_VS_Templates/Properties/AssemblyInfo.cs index c8e705aa..9acd9636 100644 --- a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs +++ b/extension/visual studio/HandyControl_VS_Templates/Properties/AssemblyInfo.cs @@ -1,14 +1,14 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("HandyControl_VS2019")] +[assembly: AssemblyTitle("HandyControl VS Templates")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("HandyControl_VS2019")] +[assembly: AssemblyProduct("HandyControl VS Templates")] [assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("3.1.0")] -[assembly: AssemblyFileVersion("3.1.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyFileVersion("3.3.0")] diff --git a/Installers/VS2019/HandyControl_VS2019/icon_100_100.png b/extension/visual studio/HandyControl_VS_Templates/icon_100_100.png similarity index 100% rename from Installers/VS2019/HandyControl_VS2019/icon_100_100.png rename to extension/visual studio/HandyControl_VS_Templates/icon_100_100.png diff --git a/Installers/VS2019/HandyControl_VS2019/icon_300_300.png b/extension/visual studio/HandyControl_VS_Templates/icon_300_300.png similarity index 100% rename from Installers/VS2019/HandyControl_VS2019/icon_300_300.png rename to extension/visual studio/HandyControl_VS_Templates/icon_300_300.png diff --git a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest b/extension/visual studio/HandyControl_VS_Templates/source.extension.vsixmanifest similarity index 77% rename from Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest rename to extension/visual studio/HandyControl_VS_Templates/source.extension.vsixmanifest index 37afe1af..6d469c17 100644 --- a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest +++ b/extension/visual studio/HandyControl_VS_Templates/source.extension.vsixmanifest @@ -1,8 +1,8 @@  - - HandyControl for VS2019 + + HandyControl VS Templates This VSIX Project will help people initialize a HandyControl project. https://handyorg.github.io/handycontrol License.txt @@ -13,15 +13,21 @@ WPF C# Control - - - + + x86 + + + x86 + + + x86 + - + diff --git a/Installers/VS2019/WpfApp/App.xaml b/extension/visual studio/WpfApp/App.xaml similarity index 100% rename from Installers/VS2019/WpfApp/App.xaml rename to extension/visual studio/WpfApp/App.xaml diff --git a/Installers/VS2019/WpfApp/App.xaml.cs b/extension/visual studio/WpfApp/App.xaml.cs similarity index 100% rename from Installers/VS2019/WpfApp/App.xaml.cs rename to extension/visual studio/WpfApp/App.xaml.cs diff --git a/Installers/VS2019/WpfApp/AssemblyInfo.cs b/extension/visual studio/WpfApp/AssemblyInfo.cs similarity index 100% rename from Installers/VS2019/WpfApp/AssemblyInfo.cs rename to extension/visual studio/WpfApp/AssemblyInfo.cs diff --git a/Installers/VS2019/WpfApp/MainWindow.xaml b/extension/visual studio/WpfApp/MainWindow.xaml similarity index 100% rename from Installers/VS2019/WpfApp/MainWindow.xaml rename to extension/visual studio/WpfApp/MainWindow.xaml diff --git a/Installers/VS2019/WpfApp/MainWindow.xaml.cs b/extension/visual studio/WpfApp/MainWindow.xaml.cs similarity index 100% rename from Installers/VS2019/WpfApp/MainWindow.xaml.cs rename to extension/visual studio/WpfApp/MainWindow.xaml.cs diff --git a/Installers/VS2019/WpfApp/ProjectTemplate.csproj b/extension/visual studio/WpfApp/ProjectTemplate.csproj similarity index 97% rename from Installers/VS2019/WpfApp/ProjectTemplate.csproj rename to extension/visual studio/WpfApp/ProjectTemplate.csproj index fda36524..8476138f 100644 --- a/Installers/VS2019/WpfApp/ProjectTemplate.csproj +++ b/extension/visual studio/WpfApp/ProjectTemplate.csproj @@ -33,7 +33,7 @@ 4 - + diff --git a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs b/extension/visual studio/WpfApp/Properties/AssemblyInfo.cs similarity index 62% rename from Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs rename to extension/visual studio/WpfApp/Properties/AssemblyInfo.cs index 9f047401..08d246c7 100644 --- a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs +++ b/extension/visual studio/WpfApp/Properties/AssemblyInfo.cs @@ -1,14 +1,14 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("HandyControl_VS2019_WpfCoreApp")] +[assembly: AssemblyTitle("HandyControl VS Templates WpfApp")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("HandyControl_VS2019_WpfCoreApp")] +[assembly: AssemblyProduct("HandyControl VS Templates WpfApp")] [assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("3.1.0")] -[assembly: AssemblyFileVersion("3.1.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyFileVersion("3.3.0")] diff --git a/Installers/VS2019/WpfApp/WpfApp.csproj b/extension/visual studio/WpfApp/WpfApp.csproj similarity index 100% rename from Installers/VS2019/WpfApp/WpfApp.csproj rename to extension/visual studio/WpfApp/WpfApp.csproj diff --git a/Installers/VS2019/WpfApp/WpfApp.vstemplate b/extension/visual studio/WpfApp/WpfApp.vstemplate similarity index 100% rename from Installers/VS2019/WpfApp/WpfApp.vstemplate rename to extension/visual studio/WpfApp/WpfApp.vstemplate diff --git a/Installers/VS2019/WpfApp/icon.ico b/extension/visual studio/WpfApp/icon.ico similarity index 100% rename from Installers/VS2019/WpfApp/icon.ico rename to extension/visual studio/WpfApp/icon.ico diff --git a/Installers/VS2019/WpfCoreApp/App.xaml b/extension/visual studio/WpfCoreApp/App.xaml similarity index 100% rename from Installers/VS2019/WpfCoreApp/App.xaml rename to extension/visual studio/WpfCoreApp/App.xaml diff --git a/Installers/VS2019/WpfCoreApp/App.xaml.cs b/extension/visual studio/WpfCoreApp/App.xaml.cs similarity index 100% rename from Installers/VS2019/WpfCoreApp/App.xaml.cs rename to extension/visual studio/WpfCoreApp/App.xaml.cs diff --git a/Installers/VS2019/WpfCoreApp/AssemblyInfo.cs b/extension/visual studio/WpfCoreApp/AssemblyInfo.cs similarity index 100% rename from Installers/VS2019/WpfCoreApp/AssemblyInfo.cs rename to extension/visual studio/WpfCoreApp/AssemblyInfo.cs diff --git a/Installers/VS2019/WpfCoreApp/MainWindow.xaml b/extension/visual studio/WpfCoreApp/MainWindow.xaml similarity index 100% rename from Installers/VS2019/WpfCoreApp/MainWindow.xaml rename to extension/visual studio/WpfCoreApp/MainWindow.xaml diff --git a/Installers/VS2019/WpfCoreApp/MainWindow.xaml.cs b/extension/visual studio/WpfCoreApp/MainWindow.xaml.cs similarity index 100% rename from Installers/VS2019/WpfCoreApp/MainWindow.xaml.cs rename to extension/visual studio/WpfCoreApp/MainWindow.xaml.cs diff --git a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj b/extension/visual studio/WpfCoreApp/ProjectTemplate.csproj similarity index 88% rename from Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj rename to extension/visual studio/WpfCoreApp/ProjectTemplate.csproj index 0cf79316..31d34b72 100644 --- a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj +++ b/extension/visual studio/WpfCoreApp/ProjectTemplate.csproj @@ -11,7 +11,7 @@ enable - + diff --git a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs b/extension/visual studio/WpfCoreApp/Properties/AssemblyInfo.cs similarity index 61% rename from Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs rename to extension/visual studio/WpfCoreApp/Properties/AssemblyInfo.cs index 615ae4ce..c63e5480 100644 --- a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs +++ b/extension/visual studio/WpfCoreApp/Properties/AssemblyInfo.cs @@ -1,14 +1,14 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("HandyControl_VS2019_WpfApp")] +[assembly: AssemblyTitle("HandyControl VS Templates WpfCoreApp")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("HandyControl_VS2019_WpfApp")] +[assembly: AssemblyProduct("HandyControl VS Templates WpfCoreApp")] [assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("3.1.0")] -[assembly: AssemblyFileVersion("3.1.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyFileVersion("3.3.0")] diff --git a/Installers/VS2019/WpfCoreApp/WpfCoreApp.csproj b/extension/visual studio/WpfCoreApp/WpfCoreApp.csproj similarity index 100% rename from Installers/VS2019/WpfCoreApp/WpfCoreApp.csproj rename to extension/visual studio/WpfCoreApp/WpfCoreApp.csproj diff --git a/Installers/VS2019/WpfCoreApp/WpfCoreApp.vstemplate b/extension/visual studio/WpfCoreApp/WpfCoreApp.vstemplate similarity index 100% rename from Installers/VS2019/WpfCoreApp/WpfCoreApp.vstemplate rename to extension/visual studio/WpfCoreApp/WpfCoreApp.vstemplate diff --git a/Installers/VS2019/WpfCoreApp/icon.ico b/extension/visual studio/WpfCoreApp/icon.ico similarity index 100% rename from Installers/VS2019/WpfCoreApp/icon.ico rename to extension/visual studio/WpfCoreApp/icon.ico diff --git a/src/HandyControl.sln b/src/HandyControl.sln index 1459e713..bdeea6fc 100644 --- a/src/HandyControl.sln +++ b/src/HandyControl.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32228.430 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}" EndProject @@ -30,16 +30,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.Props = Directory.Build.Props EndProjectSection EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Drawing", "Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.shproj", "{E5DC7C25-6293-4660-B5FB-186496386B90}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "System.Windows.Interactivity", "Shared\System.Windows.Interactivity\System.Windows.Interactivity.shproj", "{6F0C9CFF-2269-46A7-9664-478354C582A4}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Interactions", "Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.shproj", "{3531857C-28FC-4E0F-82D9-BFBB70740E04}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{3531857c-28fc-4e0f-82d9-bfbb70740e04}*SharedItemsImports = 13 + Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{6f0c9cff-2269-46a7-9664-478354c582a4}*SharedItemsImports = 13 Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 5 Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{bbe51380-8b21-49ff-9cfc-b29447a40999}*SharedItemsImports = 13 Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 5 Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 + Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{e5dc7c25-6293-4660-b5fb-186496386b90}*SharedItemsImports = 13 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -93,6 +108,9 @@ Global {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {35E3F9C0-8924-4536-BE09-F3761FDBF066} {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} {BBE51380-8B21-49FF-9CFC-B29447A40999} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} + {E5DC7C25-6293-4660-B5FB-186496386B90} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} + {6F0C9CFF-2269-46A7-9664-478354C582A4} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} + {3531857C-28FC-4E0F-82D9-BFBB70740E04} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index 0f84bcab..158c1a2d 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -180,6 +180,9 @@ Resources\Img\Flag\fr.png + + Resources\Img\Flag\ja.png + Resources\Img\Flag\ko-KR.png @@ -533,6 +536,9 @@ Properties\Langs\Lang.fr.resx + + Properties\Langs\Lang.ja.resx + Properties\Langs\Lang.ko-KR.resx @@ -581,6 +587,7 @@ rd /s /q Langs\es rd /s /q Langs\fa rd /s /q Langs\fr + rd /s /q Langs\ja rd /s /q Langs\ko-KR rd /s /q Langs\pt-BR rd /s /q Langs\pl @@ -591,6 +598,7 @@ move es Langs move fa Langs move fr Langs + move ja Langs move ko-KR Langs move pt-BR Langs move pl Langs diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj index c88b6d26..21f318b8 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -50,6 +50,9 @@ Properties\Langs\Lang.fr.resx + + Properties\Langs\Lang.ja.resx + Properties\Langs\Lang.ko-KR.resx @@ -80,6 +83,9 @@ + + + Resources\dropper.cur diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml index 1240d09e..13b0fcf4 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml @@ -47,7 +47,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -524,6 +524,7 @@ + @@ -611,7 +612,7 @@ - - -