From 5d727b302feec5b88c93f5298dd21ddd0f57a486 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Sat, 25 Dec 2021 13:43:12 +0800 Subject: [PATCH] chore: bump version of VSIX to v3.3 --- .../HandyControl_VS_Templates.sln | 2 +- .../HandyControl_VS_Templates.csproj | 8 ++++---- .../HandyControl_VS_Templates}/License.txt | 0 .../Properties/AssemblyInfo.cs | 8 ++++---- .../icon_100_100.png | Bin .../icon_300_300.png | Bin .../source.extension.vsixmanifest | 18 ++++++++++++------ .../visual studio}/WpfApp/App.xaml | 0 .../visual studio}/WpfApp/App.xaml.cs | 0 .../visual studio}/WpfApp/AssemblyInfo.cs | 0 .../visual studio}/WpfApp/MainWindow.xaml | 0 .../visual studio}/WpfApp/MainWindow.xaml.cs | 0 .../WpfApp/ProjectTemplate.csproj | 2 +- .../WpfApp/Properties/AssemblyInfo.cs | 8 ++++---- .../visual studio}/WpfApp/WpfApp.csproj | 0 .../visual studio}/WpfApp/WpfApp.vstemplate | 0 .../visual studio}/WpfApp/icon.ico | Bin .../visual studio}/WpfCoreApp/App.xaml | 0 .../visual studio}/WpfCoreApp/App.xaml.cs | 0 .../visual studio}/WpfCoreApp/AssemblyInfo.cs | 0 .../visual studio}/WpfCoreApp/MainWindow.xaml | 0 .../WpfCoreApp/MainWindow.xaml.cs | 0 .../WpfCoreApp/ProjectTemplate.csproj | 2 +- .../WpfCoreApp/Properties/AssemblyInfo.cs | 8 ++++---- .../WpfCoreApp/WpfCoreApp.csproj | 0 .../WpfCoreApp/WpfCoreApp.vstemplate | 0 .../visual studio}/WpfCoreApp/icon.ico | Bin 27 files changed, 31 insertions(+), 25 deletions(-) rename Installers/VS2019/HandyControl_VS2019.sln => extension/visual studio/HandyControl_VS_Templates.sln (95%) rename Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj => extension/visual studio/HandyControl_VS_Templates/HandyControl_VS_Templates.csproj (96%) rename {Installers/VS2019/HandyControl_VS2019 => extension/visual studio/HandyControl_VS_Templates}/License.txt (100%) rename {Installers/VS2019/HandyControl_VS2019 => extension/visual studio/HandyControl_VS_Templates}/Properties/AssemblyInfo.cs (63%) rename {Installers/VS2019/HandyControl_VS2019 => extension/visual studio/HandyControl_VS_Templates}/icon_100_100.png (100%) rename {Installers/VS2019/HandyControl_VS2019 => extension/visual studio/HandyControl_VS_Templates}/icon_300_300.png (100%) rename {Installers/VS2019/HandyControl_VS2019 => extension/visual studio/HandyControl_VS_Templates}/source.extension.vsixmanifest (77%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/App.xaml (100%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/App.xaml.cs (100%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/AssemblyInfo.cs (100%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/MainWindow.xaml (100%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/MainWindow.xaml.cs (100%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/ProjectTemplate.csproj (97%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/Properties/AssemblyInfo.cs (62%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/WpfApp.csproj (100%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/WpfApp.vstemplate (100%) rename {Installers/VS2019 => extension/visual studio}/WpfApp/icon.ico (100%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/App.xaml (100%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/App.xaml.cs (100%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/AssemblyInfo.cs (100%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/MainWindow.xaml (100%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/MainWindow.xaml.cs (100%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/ProjectTemplate.csproj (88%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/Properties/AssemblyInfo.cs (61%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/WpfCoreApp.csproj (100%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/WpfCoreApp.vstemplate (100%) rename {Installers/VS2019 => extension/visual studio}/WpfCoreApp/icon.ico (100%) 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/WpfApp/Properties/AssemblyInfo.cs b/extension/visual studio/WpfApp/Properties/AssemblyInfo.cs similarity index 62% rename from Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs rename to extension/visual studio/WpfApp/Properties/AssemblyInfo.cs index 615ae4ce..08d246c7 100644 --- a/Installers/VS2019/WpfApp/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_WpfApp")] +[assembly: AssemblyTitle("HandyControl VS Templates WpfApp")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("HandyControl_VS2019_WpfApp")] +[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/WpfCoreApp/Properties/AssemblyInfo.cs b/extension/visual studio/WpfCoreApp/Properties/AssemblyInfo.cs similarity index 61% rename from Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs rename to extension/visual studio/WpfCoreApp/Properties/AssemblyInfo.cs index 9f047401..c63e5480 100644 --- a/Installers/VS2019/WpfCoreApp/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_WpfCoreApp")] +[assembly: AssemblyTitle("HandyControl VS Templates WpfCoreApp")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("HandyControl_VS2019_WpfCoreApp")] +[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