Merge branch 'dev'

iswix-llc · Nov 20, 2023 · 09251d1 · 09251d1
2 parents 65af5e3 + de9aaf8
commit 09251d1
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 54 deletions.
diff --git a/Application/Designers/AppXDesigner/AppXDesigner.csproj b/Application/Designers/AppXDesigner/AppXDesigner.csproj
@@ -30,8 +30,4 @@
     <ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-  </Target>
-
 </Project>
diff --git a/Application/Designers/CustomTablesDesigner/CustomTablesDesigner.csproj b/Application/Designers/CustomTablesDesigner/CustomTablesDesigner.csproj
@@ -28,8 +28,5 @@
 	<ItemGroup>
 		<ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
 	</ItemGroup>
-	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-	  <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-	</Target>
 
 </Project>
diff --git a/Application/Designers/FeaturesDesigner/FeaturesDesigner.csproj b/Application/Designers/FeaturesDesigner/FeaturesDesigner.csproj
@@ -30,8 +30,4 @@
     <ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-  </Target>
-
 </Project>
diff --git a/Application/Designers/FilesAndFoldersDesigner/FilesAndFoldersDesigner.csproj b/Application/Designers/FilesAndFoldersDesigner/FilesAndFoldersDesigner.csproj
@@ -30,8 +30,5 @@
     <ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-  </Target>
 
 </Project>
diff --git a/Application/Designers/GeneralInformationDesigner/GeneralInformationDesigner.csproj b/Application/Designers/GeneralInformationDesigner/GeneralInformationDesigner.csproj
@@ -29,8 +29,5 @@
 	<ItemGroup>
 		<ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
 	</ItemGroup>
-	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-	  <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-	</Target>
 
 </Project>
diff --git a/Application/Designers/MSIXDesigner/MSIXDesigner.csproj b/Application/Designers/MSIXDesigner/MSIXDesigner.csproj
@@ -30,8 +30,4 @@
 		<ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
 	</ItemGroup>
 
-	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-	  <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-	</Target>
-
 </Project>
diff --git a/Application/Designers/NamespacesDesigner/NamespacesDesigner.csproj b/Application/Designers/NamespacesDesigner/NamespacesDesigner.csproj
@@ -30,8 +30,4 @@
     <ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-  </Target>
-
 </Project>
diff --git a/Application/Designers/NewFilesAndFoldersDesigner/NewFilesAndFoldersDesigner.csproj b/Application/Designers/NewFilesAndFoldersDesigner/NewFilesAndFoldersDesigner.csproj
@@ -30,8 +30,4 @@
     <ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-  </Target>
-
 </Project>
diff --git a/Application/Designers/PropertiesDesigner/PropertiesDesigner.csproj b/Application/Designers/PropertiesDesigner/PropertiesDesigner.csproj
@@ -28,8 +28,6 @@
 	<ItemGroup>
 		<ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
 	</ItemGroup>
-	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-	  <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-	</Target>
+
 
 </Project>
diff --git a/Application/Designers/ServicesDesigner/ServicesDesigner.csproj b/Application/Designers/ServicesDesigner/ServicesDesigner.csproj
@@ -30,8 +30,4 @@
     <ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-  </Target>
-
 </Project>
diff --git a/Application/Designers/ShortCutsDesigner/ShortCutsDesigner.csproj b/Application/Designers/ShortCutsDesigner/ShortCutsDesigner.csproj
@@ -28,8 +28,5 @@
 	<ItemGroup>
 		<ProjectReference Include="..\..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
 	</ItemGroup>
-	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-	  <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-	</Target>
 
 </Project>
diff --git a/Application/IsWiX/IsWiX.csproj b/Application/IsWiX/IsWiX.csproj
@@ -216,8 +216,4 @@
     <ProjectReference Include="..\Shared\IsWiXAutomationInterface\IsWiXAutomationInterface.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-  </Target>
-
 </Project>
diff --git a/...tion/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IISMeta.wxs b/...tion/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IISMeta.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis"  xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"  xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
   <Fragment>
     <ComponentGroup Id="webSite">
       <ComponentRef Id="webSite" />

diff --git a/Application/IsWiX2022AddIn/IsWiX2022AddIn.csproj b/Application/IsWiX2022AddIn/IsWiX2022AddIn.csproj
@@ -186,9 +186,6 @@ powershell Compress-Archive -Path * -DestinationPath '$(ProjectDir)ProjectTempla
 CD "$(ProjectDir)HeatWaveStandardBASolutionTemplate"
 powershell Compress-Archive -Path * -DestinationPath '$(ProjectDir)ProjectTemplates\HeatWaveStandardBASolutionTemplate.zip' -Force</PreBuildEvent>
   </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>IF "%25SIGN_ISWIX%25"=="TRUE" signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)</PostBuildEvent>
-  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Application/Shared/IsWiXAutomationInterface/IsWiXAutomationInterface.csproj b/Application/Shared/IsWiXAutomationInterface/IsWiXAutomationInterface.csproj
@@ -18,8 +18,4 @@
     <PackageReference Include="XmlDesignerCore" Version="5.1.2" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="IF &quot;%25SIGN_ISWIX%25&quot;==&quot;TRUE&quot; signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/?td=sha256 /td sha256 /as $(TargetPath)&#xD;&#xA;" />
-  </Target>
-
 </Project>
diff --git a/Installer/IsWiX/IsWiX.wixproj b/Installer/IsWiX/IsWiX.wixproj
@@ -34,7 +34,4 @@
     <Content Include="Resources\Icon.ico" />
   </ItemGroup>
   <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.2" />
-  <PropertyGroup>
-    <PostBuildEvent>IF "%25SIGN_ISWIX%25"=="TRUE" signtool sign /fd SHA256 /tr http://timestamp.sectigo.com/%3ftd=sha256 /td sha256  $(TargetPath)</PostBuildEvent>
-  </PropertyGroup>
 </Project>