Skip to content

Convert NSwagStudio setup to use WiX 6 #5218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lahma merged 5 commits into from
Jul 26, 2025
Merged

Convert NSwagStudio setup to use WiX 6 #5218

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
898e583
Convert to using WiX 6
lahma Jul 25, 2025
f58814c
get rid of heat
lahma Jul 25, 2025
ef75451
use Files element
lahma Jul 25, 2025
5f1ef24
cleanup
lahma Jul 25, 2025
734815b
tweak build
lahma Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
get rid of heat
  • Loading branch information
@lahma
lahma committed Jul 25, 2025
commit f58814c386f7155f7342ab2b07f826556278771e
1 change: 0 additions & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
<PackageVersion Include="WixToolset.Util.wixext" Version="6.0.1" />
<PackageVersion Include="WixToolset.UI.wixext" Version="6.0.1" />
<PackageVersion Include="WixToolset.Heat" Version="6.0.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'netstandard2.0' ">
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.3.0" />
Expand Down
31 changes: 10 additions & 21 deletions src/NSwagStudio.Installer/NSwagStudio.Installer.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

<PropertyGroup>
<OutputName>NSwagStudio</OutputName>
</PropertyGroup>

<PropertyGroup>
<SuppressIces>ICE38;ICE43;ICE57;ICE61;ICE69</SuppressIces>
<NoWarn>$(NoWarn);HEAT5149;HEAT5151</NoWarn>
<OutputPath>..\..\artifacts\bin\NSwagStudio.Installer\$(Configuration)\</OutputPath>
<IntermediateOutputPath>..\..\artifacts\obj\NSwagStudio.Installer\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>SourcePath=..\..\artifacts\bin\NSwagStudio\$(Configuration)</DefineConstants>
</PropertyGroup>

<ItemGroup>
Expand All @@ -25,24 +23,15 @@
<ItemGroup>
<PackageReference Include="WixToolset.Util.wixext" />
<PackageReference Include="WixToolset.UI.wixext" />
<PackageReference Include="WixToolset.Heat" />
</ItemGroup>

<Target Name="Heat" AfterTargets="PreBuildEvent">
<PropertyGroup>
<DefineConstants>SourcePath=..\..\artifacts\bin\NSwagStudio\$(Configuration)</DefineConstants>
</PropertyGroup>
<HeatDirectory
DirectoryRefId="RootDirectory"
VerboseOutput="true"
AutogenerateGuids="true"
GenerateGuidsNow="true"
SuppressRootDirectory="true"
OutputFile="Generated.wxs"
PreprocessorVariable="var.SourcePath"
Directory="..\..\artifacts\bin\NSwagStudio\$(Configuration)"
ComponentGroupName="SourceComponentGroup"
ToolPath="$(WixToolPath)" />
</Target>
<ItemGroup>
<HarvestDirectory Include="..\..\artifacts\bin\NSwagStudio\$(Configuration)">
<DirectoryRefId>RootDirectory</DirectoryRefId>
<SuppressRootDirectory>true</SuppressRootDirectory>
<ComponentGroupName>SourceComponentGroup</ComponentGroupName>
<PreprocessorVariable>var.SourcePath</PreprocessorVariable>
</HarvestDirectory>
</ItemGroup>

</Project>
</Project>