Remove ReleasePackageInstaller from Build Solution.

Add resource import batches to ReleasePackageInstaller build steps.
Together, this means that Build Solution and then building ReleasePackageInstaller from clean source should produce a working installer.
This commit is contained in:
elasota
2020-05-11 01:21:10 -04:00
parent e52735ae7f
commit e052628ed3
2 changed files with 5 additions and 5 deletions

View File

@@ -138,9 +138,7 @@ Global
{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x64.ActiveCfg = Release|x64
{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x64.Build.0 = Release|x64
{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Debug|x64.ActiveCfg = Debug|x64
{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Debug|x64.Build.0 = Debug|x64
{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Release|x64.ActiveCfg = Release|x64
{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -151,9 +151,6 @@
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
</Target>
<PropertyGroup>
<PreBuildEvent />
</PropertyGroup>
<PropertyGroup>
<DefineConstants>
ResourcesDataDir=$(SolutionDir)\Resources;
@@ -212,6 +209,11 @@ PackagedDataDir=$(SolutionDir)\Packaged;
</HarvestDirectory>
</ItemGroup>
</Target>
<PropertyGroup>
<PreBuildEvent>cd "$(SolutionDir)"
call ConvertResources.bat
call MakeRelease.bat</PreBuildEvent>
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.