Dev (#22)

* refactor addin

* cut 2

* fix

* Update azure-pipelines.yml for Azure Pipelines

* Update IsWiX2022AddInMMcustom.wxs

* Update IsWiX2022AddIn.csproj

* fix path

* Update IsWiX2022AddIn.csproj

* Update IsWiX2022AddInMMcustom.wxs

* Update Features.wxs

* build with wix 3.11.2 and reenable validation

.gitignore

@@ -337,3 +337,4 @@ Application/IsWiXNewNewAddIn/ProjectTemplates/IsWiXSetupProjectTemplate.zip
 Application/IsWiXNewNewAddIn/ProjectTemplates/IsWiXMSISolutionTemplate.zip
 Application/IsWiXNewNewAddIn/ProjectTemplates/IsWiXMergeModuleProjectTemplate.zip
 Application/IsWiXNewNewAddIn/ProjectTemplates/IsWiXBootstrapperSolutionTemplate.zip
+*.zip

Application/ApplicationAddIn.sln

@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsWiX2022AddIn", "IsWiX2022
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsWiXNewAddIn", "IsWiXNewAddIn\IsWiXNewAddIn.csproj", "{47390392-42C5-4EE6-885B-98C2E70DECD1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsWiXNewNewAddIn", "IsWiXNewNewAddIn\IsWiXNewNewAddIn.csproj", "{3A24A77E-F197-4564-AB72-308542C89463}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,14 +31,6 @@ Global
 		{47390392-42C5-4EE6-885B-98C2E70DECD1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47390392-42C5-4EE6-885B-98C2E70DECD1}.Release|x86.ActiveCfg = Release|x86
 		{47390392-42C5-4EE6-885B-98C2E70DECD1}.Release|x86.Build.0 = Release|x86
-		{3A24A77E-F197-4564-AB72-308542C89463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A24A77E-F197-4564-AB72-308542C89463}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A24A77E-F197-4564-AB72-308542C89463}.Debug|x86.ActiveCfg = Debug|x86
-		{3A24A77E-F197-4564-AB72-308542C89463}.Debug|x86.Build.0 = Debug|x86
-		{3A24A77E-F197-4564-AB72-308542C89463}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A24A77E-F197-4564-AB72-308542C89463}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A24A77E-F197-4564-AB72-308542C89463}.Release|x86.ActiveCfg = Release|x86
-		{3A24A77E-F197-4564-AB72-308542C89463}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Application/IsWiX2022AddIn/IsWiX2022AddIn.csproj

@@ -53,6 +53,10 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CreateVsixContainer>False</CreateVsixContainer>
+    <DeployExtension>False</DeployExtension>
+    <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
+    <CopyVsixExtensionLocation>..\..\Installer\Deploy\IsWiX2022AddIn</CopyVsixExtensionLocation>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CommandLaunchIsWiX.cs" />
@@ -85,10 +89,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="ProjectTemplates\IsWiXSetupProjectTemplate.zip">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -113,6 +113,10 @@
     <Content Include="Resources\CommandLaunchIsWiXPackage.ico" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="IsWiXGlobalParams, Version=4.0.0.0, Culture=neutral, PublicKeyToken=eba4e180870619ec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Externals\IsWiXGlobalParams.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -135,9 +139,6 @@ powershell Compress-Archive -Path * -DestinationPath '$(ProjectDir)ProjectTempla
 
 CD "$(ProjectDir)BootstrapperSolutionTemplate"
 powershell Compress-Archive -Path * -DestinationPath '$(ProjectDir)ProjectTemplates\IsWiXBootstrapperSolutionTemplate.zip' -Force
-
-CD "$(ProjectDir)SetupProjectTemplate"
-powershell Compress-Archive -Path * -DestinationPath '$(ProjectDir)ProjectTemplates\IsWiXSetupProjectTemplate.zip' -Force
 </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>

Application/IsWiX2022AddIn/source.extension.vsixmanifest

@@ -19,5 +19,8 @@
     </Prerequisites>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\IsWiXBootstrapperSolutionTemplate.zip" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\IsWiXMSISolutionTemplate.zip" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\IsWiXMergeModuleProjectTemplate.zip" />
     </Assets>
 </PackageManifest>