Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrpai committed Apr 24, 2024
2 parents 51469a5 + 240b898 commit 04c75ba
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Application/IsWiX/IsWiX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
<None Remove="Schemas\vs.xsd" />
<None Remove="Schemas\wix.xsd" />
<None Remove="Schemas\wixloc.xsd" />
<None Remove="signing-catalog.txt" />
<None Remove="Templates\WiX\Product.wxs" />
</ItemGroup>

Expand All @@ -79,6 +80,9 @@
<EmbeddedResource Include="IsWiX.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<Content Include="signing-catalog.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="License.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
Expand Down
19 changes: 19 additions & 0 deletions Application/IsWiX/signing-catalog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
IsWiX2022AddIn\IsWiXGlobalParams.dll
IsWiX2022AddIn\IsWiX2022AddIn.dll
AppXDesigner.dll
CustomTablesDesigner.dll
FeaturesDesigner.dll
FilesAndFoldersDesigner.dll
FireworksFramework.dll
GeneralInformationDesigner.dll
IsWiXAutomationInterface.dll
MSIXDesigner.dll
NamespacesDesigner.dll
NewFeaturesDesigner.dll
NewFilesAndFoldersDesigner.dll
PropertiesDesigner.dll
ServicesDesigner.dll
ShortCutsDesigner.dll
XmlDesignerCore.dll
IsWiX.dll
IsWiX.exe

0 comments on commit 04c75ba

Please sign in to comment.