Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.

Commit 549d8d6

Browse files
robmenrobmen
committed
Differentiate WiX v3 and v4 templates from each other
Fixes wixtoolset/issues#5559
1 parent 12e3fb6 commit 549d8d6

File tree

13 files changed

+26
-26
lines changed

13 files changed

+26
-26
lines changed

‎src/Templates/v3/Projects/CustomActionCPP/CustomActionCPP.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
33
<TemplateData>
4-
<Name _locID="TSDATA_DUT_Name">C++ Custom Action Project</Name>
5-
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action</Description>
4+
<Name _locID="TSDATA_DUT_Name">C++ Custom Action Project for WiX v3</Name>
5+
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action using WiX Toolset v3</Description>
66
<Icon>CustomActionCPP.ico</Icon>
77
<ProjectType>WiX</ProjectType>
88
<TemplateID>Microsoft.Deployment.WindowsInstaller.CustomActionCPP</TemplateID>

‎src/Templates/v3/Projects/CustomActionCS/CustomActionCS.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
33
<TemplateData>
4-
<Name _locID="TSDATA_DUT_Name">C# Custom Action Project</Name>
5-
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action</Description>
4+
<Name _locID="TSDATA_DUT_Name">C# Custom Action Project for WiX v3</Name>
5+
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action using WiX Toolset v3</Description>
66
<Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4547" />
77
<ProjectType>WiX</ProjectType>
88
<TemplateID>Microsoft.Deployment.WindowsInstaller.CustomActionCS</TemplateID>

‎src/Templates/v3/Projects/CustomActionVB/CustomActionVB.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
33
<TemplateData>
4-
<Name _locID="TSDATA_DUT_Name">VB Custom Action Project</Name>
5-
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action</Description>
4+
<Name _locID="TSDATA_DUT_Name">VB Custom Action Project for WiX v3</Name>
5+
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action using WiX Toolset v3</Description>
66
<Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4500" />
77
<ProjectType>WiX</ProjectType>
88
<TemplateID>Microsoft.Deployment.WindowsInstaller.CustomActionVB</TemplateID>

‎src/Templates/v3/Projects/WixBundleProject/WixBundle.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
22
<TemplateData>
3-
<Name _locID="TSDATA_DUT_Name">Bootstrapper Project</Name>
4-
<Description _locID="TSDATA_DUT_Description">A project for creating a Windows Installer XML based EXE setup layout</Description>
3+
<Name _locID="TSDATA_DUT_Name">Bootstrapper Project for WiX v3</Name>
4+
<Description _locID="TSDATA_DUT_Description">A project for creating a WiX based EXE setup layout using WiX Toolset v3</Description>
55
<Icon>WixBundle.ico</Icon>
66
<ProjectType>WiX</ProjectType>
77
<SortOrder>50</SortOrder>

‎src/Templates/v3/Projects/WixLibrary/WixLibrary.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
22
<TemplateData>
3-
<Name _locID="TSDATA_DUT_Name">Setup Library Project</Name>
4-
<Description _locID="TSDATA_DUT_Description">A project for creating a wixlib library</Description>
3+
<Name _locID="TSDATA_DUT_Name">Setup Library Project for WiX v3</Name>
4+
<Description _locID="TSDATA_DUT_Description">A project for creating a wixlib library using WiX Toolset v3</Description>
55
<Icon>WixLibrary.ico</Icon>
66
<ProjectType>WiX</ProjectType>
77
<SortOrder>40</SortOrder>

‎src/Templates/v3/Projects/WixMergeModule/WixMergeModule.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
22
<TemplateData>
3-
<Name _locID="TSDATA_DUT_Name">Merge Module Project</Name>
4-
<Description _locID="TSDATA_DUT_Description">A project for creating a Windows Installer XML based MSM file</Description>
3+
<Name _locID="TSDATA_DUT_Name">Merge Module Project for WiX v3</Name>
4+
<Description _locID="TSDATA_DUT_Description">A project for creating a WiX based MSM file using WiX Toolset v3</Description>
55
<Icon>WixMergeModule.ico</Icon>
66
<ProjectType>WiX</ProjectType>
77
<SortOrder>30</SortOrder>

‎src/Templates/v3/Projects/WixProject/WixProject.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
22
<TemplateData>
3-
<Name _locID="TSDATA_DUT_Name">Setup Project</Name>
4-
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI file</Description>
3+
<Name _locID="TSDATA_DUT_Name">Setup Project for WiX v3</Name>
4+
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI file using WiX Toolset v3</Description>
55
<Icon>WixProject.ico</Icon>
66
<ProjectType>WiX</ProjectType>
77
<SortOrder>20</SortOrder>

‎src/Templates/v4/Projects/CustomActionCS/CustomActionCS.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
33
<TemplateData>
4-
<Name _locID="TSDATA_DUT_Name">C# Custom Action Project</Name>
5-
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action</Description>
4+
<Name _locID="TSDATA_DUT_Name">C# Custom Action Project for WiX v4</Name>
5+
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action using WiX Toolset v4</Description>
66
<Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4547" />
77
<ProjectType>WiX</ProjectType>
88
<TemplateID>WixToolset.Dtf.WindowsInstaller.CustomActionCS</TemplateID>

‎src/Templates/v4/Projects/CustomActionVB/CustomActionVB.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
33
<TemplateData>
4-
<Name _locID="TSDATA_DUT_Name">VB Custom Action Project</Name>
5-
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action</Description>
4+
<Name _locID="TSDATA_DUT_Name">VB Custom Action Project for WiX v4</Name>
5+
<Description _locID="TSDATA_DUT_Description">A project for creating an MSI custom action using WiX Toolset v4</Description>
66
<Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4500" />
77
<ProjectType>WiX</ProjectType>
88
<TemplateID>WixToolset.Dtf.WindowsInstaller.CustomActionVB</TemplateID>

‎src/Templates/v4/Projects/WixBundleProject/WixBundle.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<VSTemplate Version="2.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
22
<TemplateData>
3-
<Name _locID="TSDATA_DUT_Name">Bootstrapper Project</Name>
4-
<Description _locID="TSDATA_DUT_Description">A project for creating a WiX based EXE setup layout</Description>
3+
<Name _locID="TSDATA_DUT_Name">Bootstrapper Project for WiX v4</Name>
4+
<Description _locID="TSDATA_DUT_Description">A project for creating a WiX based EXE setup layout using WiX Toolset v4</Description>
55
<Icon>WixBundle.ico</Icon>
66
<ProjectType>WiX</ProjectType>
77
<SortOrder>50</SortOrder>

0 commit comments

Comments
 (0)