Skip to content

Commit 0762db0

Browse files
NaBianNaBian
committed
bump up vsix to 3.1.0
1 parent 5801931 commit 0762db0

19 files changed

+101
-156
lines changed

‎Installers/VS2019/HandyControl_VS2019.sln

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp", "WpfApp\WpfApp.csp
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfCoreApp", "WpfCoreApp\WpfCoreApp.csproj", "{2F6E9FB8-F579-40CF-A151-57F281F08E1B}"
1111
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Templates", "Project Templates", "{26BC7FA1-50F7-46C7-84FE-0D8ABAC47E07}"
13+
EndProject
1214
Global
1315
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1416
Debug|Any CPU = Debug|Any CPU
@@ -31,6 +33,10 @@ Global
3133
GlobalSection(SolutionProperties) = preSolution
3234
HideSolutionNode = FALSE
3335
EndGlobalSection
36+
GlobalSection(NestedProjects) = preSolution
37+
{83C70EB1-3A3F-4812-B86C-C7D1936699EB} = {26BC7FA1-50F7-46C7-84FE-0D8ABAC47E07}
38+
{2F6E9FB8-F579-40CF-A151-57F281F08E1B} = {26BC7FA1-50F7-46C7-84FE-0D8ABAC47E07}
39+
EndGlobalSection
3440
GlobalSection(ExtensibilityGlobals) = postSolution
3541
SolutionGuid = {A7F567D2-5FA3-4E17-A8A8-CDAFC217BFF5}
3642
EndGlobalSection

‎Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj

+8-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<RootNamespace>HandyControl_VS2019</RootNamespace>
1717
<AssemblyName>HandyControl_VS2019</AssemblyName>
1818
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
19-
<GeneratePkgDefFile>true</GeneratePkgDefFile>
19+
<GeneratePkgDefFile>false</GeneratePkgDefFile>
2020
<UseCodebase>true</UseCodebase>
2121
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
2222
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -46,7 +46,6 @@
4646
</PropertyGroup>
4747
<ItemGroup>
4848
<Compile Include="Properties\AssemblyInfo.cs" />
49-
<Compile Include="HandyControl_VS2019Package.cs" />
5049
</ItemGroup>
5150
<ItemGroup>
5251
<None Include="source.extension.vsixmanifest">
@@ -57,8 +56,13 @@
5756
<Reference Include="System" />
5857
</ItemGroup>
5958
<ItemGroup>
60-
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.9.3" ExcludeAssets="runtime" />
61-
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.0.2268" />
59+
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" ExcludeAssets="runtime">
60+
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
61+
</PackageReference>
62+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.8.3038">
63+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
64+
<PrivateAssets>all</PrivateAssets>
65+
</PackageReference>
6266
</ItemGroup>
6367
<ItemGroup>
6468
<Content Include="icon_100_100.png">

‎Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019Package.cs

-53
This file was deleted.

‎Installers/VS2019/HandyControl_VS2019/License.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018-2020 HandyOrg
3+
Copyright (c) 2018-2021 HandyOrg
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

‎Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
[assembly: AssemblyConfiguration("")]
77
[assembly: AssemblyCompany("")]
88
[assembly: AssemblyProduct("HandyControl_VS2019")]
9-
[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")]
9+
[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2021")]
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212
[assembly: ComVisible(false)]
13-
[assembly: AssemblyVersion("2.1.0")]
14-
[assembly: AssemblyFileVersion("2.1.0")]
13+
[assembly: AssemblyVersion("3.1.0")]
14+
[assembly: AssemblyFileVersion("3.1.0")]

‎Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" ?>
22
<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">
33
<Metadata>
4-
<Identity Id="5949c79d-eb43-4033-8b7b-9349d34512c6" Version="2.5.0" Language="en-US" Publisher="HandyOrg" />
4+
<Identity Id="1B6729DF-3360-48C4-86A9-68A0591FBBEB" Version="3.1.0" Language="en-US" Publisher="HandyOrg" />
55
<DisplayName>HandyControl for VS2019</DisplayName>
66
<Description xml:space="preserve">This VSIX Project will help people initialize a HandyControl project.</Description>
77
<MoreInfo>https://handyorg.github.io/handycontrol</MoreInfo>
@@ -21,10 +21,9 @@
2121
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.0,)" />
2222
</Dependencies>
2323
<Prerequisites>
24-
<Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[16.2.29003.222,17.0)" DisplayName=".NET 桌面开发工具" />
24+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
2525
</Prerequisites>
2626
<Assets>
27-
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2827
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="WpfApp" d:TargetPath="|WpfApp;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
2928
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="WpfCoreApp" d:TargetPath="|WpfCoreApp;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
3029
</Assets>

‎Installers/VS2019/WpfApp/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[assembly: AssemblyConfiguration("")]
88
[assembly: AssemblyCompany("")]
99
[assembly: AssemblyProduct("$safeprojectname$")]
10-
[assembly: AssemblyCopyright("Copyright © $username$ 2019")]
10+
[assembly: AssemblyCopyright("Copyright © $username$ $year$")]
1111
[assembly: AssemblyTrademark("")]
1212
[assembly: AssemblyCulture("")]
1313
[assembly: ComVisible(false)]

‎Installers/VS2019/WpfApp/ProjectTemplate.csproj

+5-9
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>$safeprojectname$</RootNamespace>
1010
<AssemblyName>$safeprojectname$</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1413
<WarningLevel>4</WarningLevel>
1514
<Deterministic>true</Deterministic>
1615
</PropertyGroup>
@@ -34,9 +33,9 @@
3433
<WarningLevel>4</WarningLevel>
3534
</PropertyGroup>
3635
<ItemGroup>
37-
<Reference Include="HandyControl, Version=2.5.0.1, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\HandyControl.2.5.0.1\lib\net47\HandyControl.dll</HintPath>
39-
</Reference>
36+
<PackageReference Include="HandyControl" Version="3.1" />
37+
</ItemGroup>
38+
<ItemGroup>
4039
<Reference Include="System" />
4140
<Reference Include="System.Xaml">
4241
<RequiredTargetFramework>4.0</RequiredTargetFramework>
@@ -68,8 +67,5 @@
6867
<SubType>Code</SubType>
6968
</Compile>
7069
</ItemGroup>
71-
<ItemGroup>
72-
<None Include="packages.config" />
73-
</ItemGroup>
7470
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
75-
</Project>
71+
</Project>

‎Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
[assembly: AssemblyConfiguration("")]
77
[assembly: AssemblyCompany("")]
88
[assembly: AssemblyProduct("HandyControl_VS2019_WpfApp")]
9-
[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")]
9+
[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2021")]
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212
[assembly: ComVisible(false)]
13-
[assembly: AssemblyVersion("2.5.0")]
14-
[assembly: AssemblyFileVersion("2.5.0")]
13+
[assembly: AssemblyVersion("3.1.0")]
14+
[assembly: AssemblyFileVersion("3.1.0")]

‎Installers/VS2019/WpfApp/WpfApp.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
<VSTemplate Include="WpfApp.vstemplate" />
6767
</ItemGroup>
6868
<ItemGroup>
69-
<None Include="packages.config" />
7069
<None Include="ProjectTemplate.csproj" />
7170
</ItemGroup>
7271
<ItemGroup>

‎Installers/VS2019/WpfApp/WpfApp.vstemplate

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" xmlns:sdk="http://schemas.microsoft.com/developer/vstemplate-sdkextension/2010">
3-
<TemplateData>
4-
<Name>HandyControl WPF App(.NET Framework)</Name>
5-
<Description>Creates a HandyControl WPF App(.NET Framework)</Description>
6-
<Icon>icon.ico</Icon>
7-
<ProjectType>CSharp</ProjectType>
8-
<RequiredFrameworkVersion>4.7</RequiredFrameworkVersion>
9-
<MaxFrameworkVersion>4.7.2</MaxFrameworkVersion>
10-
<TemplateID>38e0a2df-5858-4bde-b373-7c50bc982906</TemplateID>
11-
<CreateNewFolder>true</CreateNewFolder>
12-
<DefaultName>HandyControlProject</DefaultName>
13-
<ProvideDefaultName>true</ProvideDefaultName>
14-
<LanguageTag>csharp</LanguageTag>
15-
<PlatformTag>windows</PlatformTag>
16-
<ProjectTypeTag>desktop</ProjectTypeTag>
17-
<ProjectTypeTag>HandyControl</ProjectTypeTag>
18-
</TemplateData>
19-
<TemplateContent>
20-
<Project File="ProjectTemplate.csproj" ReplaceParameters="true">
21-
<ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
22-
<ProjectItem ReplaceParameters="true" TargetFileName="App.xaml">App.xaml</ProjectItem>
23-
<ProjectItem ReplaceParameters="true" TargetFileName="App.xaml.cs">App.xaml.cs</ProjectItem>
24-
<ProjectItem ReplaceParameters="true" TargetFileName="MainWindow.xaml">MainWindow.xaml</ProjectItem>
25-
<ProjectItem ReplaceParameters="true" TargetFileName="MainWindow.xaml.cs">MainWindow.xaml.cs</ProjectItem>
26-
<ProjectItem ReplaceParameters="true" TargetFileName="packages.config">packages.config</ProjectItem>
27-
</Project>
28-
</TemplateContent>
29-
</VSTemplate>
3+
<TemplateData>
4+
<Name>HandyControl WPF App (.NET Framework)</Name>
5+
<Description>Creates a HandyControl WPF App (.NET Framework)</Description>
6+
<Icon>icon.ico</Icon>
7+
<ProjectType>CSharp</ProjectType>
8+
<RequiredFrameworkVersion>4.0</RequiredFrameworkVersion>
9+
<CreateNewFolder>true</CreateNewFolder>
10+
<DefaultName>HandyControlWpfApp</DefaultName>
11+
<ProvideDefaultName>true</ProvideDefaultName>
12+
<LanguageTag>csharp</LanguageTag>
13+
<PlatformTag>windows</PlatformTag>
14+
<ProjectTypeTag>desktop</ProjectTypeTag>
15+
<ProjectTypeTag>HandyControl</ProjectTypeTag>
16+
<LocationField>Enabled</LocationField>
17+
<EnableLocationBrowseButton>true</EnableLocationBrowseButton>
18+
<CreateInPlace>true</CreateInPlace>
19+
</TemplateData>
20+
<TemplateContent>
21+
<Project File="ProjectTemplate.csproj" ReplaceParameters="true">
22+
<ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
23+
<ProjectItem ReplaceParameters="true">App.xaml</ProjectItem>
24+
<ProjectItem ReplaceParameters="true">App.xaml.cs</ProjectItem>
25+
<ProjectItem ReplaceParameters="true">MainWindow.xaml</ProjectItem>
26+
<ProjectItem ReplaceParameters="true">MainWindow.xaml.cs</ProjectItem>
27+
</Project>
28+
</TemplateContent>
29+
</VSTemplate>

‎Installers/VS2019/WpfApp/packages.config

-4
This file was deleted.

‎Installers/VS2019/WpfCoreApp/AssemblyInfo.cs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using System.Windows;
2+
3+
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]

‎Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
23
<PropertyGroup>
34
<OutputType>WinExe</OutputType>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
55
<UseWPF>true</UseWPF>
6-
<AssemblyName>$safeprojectname$</AssemblyName>
7-
<RootNamespace>$safeprojectname$</RootNamespace>
8-
<Version>1.0.0.0</Version>
9-
<Configurations>Debug;Release</Configurations>
10-
<Copyright>Copyright © $username$ 2018-2020</Copyright>
11-
<FileVersion>1.0.0.0</FileVersion>
12-
<AssemblyVersion>1.0.0.0</AssemblyVersion>
6+
<Copyright>Copyright © $username$ $year$</Copyright>
7+
<TargetFramework>netcoreapp3.0</TargetFramework>
138
<LangVersion>latest</LangVersion>
14-
</PropertyGroup>
15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
16-
<DefineConstants>TRACE;Core</DefineConstants>
17-
</PropertyGroup>
18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
19-
<DefineConstants>TRACE;Core</DefineConstants>
9+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
10+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
11+
<Nullable>enable</Nullable>
2012
</PropertyGroup>
2113
<ItemGroup>
22-
<PackageReference Include="HandyControl" Version="2.5.0.1" />
14+
<PackageReference Include="HandyControl" Version="3.1" />
2315
</ItemGroup>
24-
</Project>
16+
17+
</Project>

‎Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
[assembly: AssemblyConfiguration("")]
77
[assembly: AssemblyCompany("")]
88
[assembly: AssemblyProduct("HandyControl_VS2019_WpfCoreApp")]
9-
[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")]
9+
[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2021")]
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212
[assembly: ComVisible(false)]
13-
[assembly: AssemblyVersion("2.5.0")]
14-
[assembly: AssemblyFileVersion("2.5.0")]
13+
[assembly: AssemblyVersion("3.1.0")]
14+
[assembly: AssemblyFileVersion("3.1.0")]

‎Installers/VS2019/WpfCoreApp/WpfCoreApp.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<None Include="MainWindow.xaml.cs">
6161
<DependentUpon>MainWindow.xaml</DependentUpon>
6262
</None>
63+
<None Include="AssemblyInfo.cs" />
6364
<Compile Include="Properties\AssemblyInfo.cs" />
6465
</ItemGroup>
6566
<ItemGroup>

0 commit comments

Comments
 (0)