installer: SxS: fix whitespace

This commit is contained in:
Bill Zissimopoulos 2022-09-05 16:46:10 +01:00
parent 7f6608cf7d
commit 2dd054087c

View File

@ -61,14 +61,14 @@
Name="SxsDir" Name="SxsDir"
Type="raw" /> Type="raw" />
</Property> </Property>
<SetProperty Id="INSTALLDIR" Value="[ProgramFilesFolder]$(var.MyProductName)\" After="CostInitialize"> <SetProperty Id="INSTALLDIR" Value="[ProgramFilesFolder]$(var.MyProductName)\" After="CostInitialize">
NOT INSTALLDIR NOT INSTALLDIR
</SetProperty> </SetProperty>
<SetProperty Id="SXSDIR" Value="[INSTALLDIR]SxS\sxs.[InstanceID]\" After="SetINSTALLDIR"> <SetProperty Id="SXSDIR" Value="[INSTALLDIR]SxS\sxs.[InstanceID]\" After="SetINSTALLDIR">
NOT SXSDIR NOT SXSDIR
</SetProperty> </SetProperty>
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder"> <Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="DYNAMIC"> <Directory Id="INSTALLDIR" Name="DYNAMIC">
<Directory Id="SXSBASEDIR" Name="SxS"> <Directory Id="SXSBASEDIR" Name="SxS">
@ -84,7 +84,7 @@
</Directory> </Directory>
</Directory> </Directory>
<DirectoryRef Id="INSTALLDIR"> <DirectoryRef Id="INSTALLDIR">
<Component Id="C.INSTALLDIR" Guid="C086521F-8552-43D1-AAE2-CDD579F66FDD"> <Component Id="C.INSTALLDIR" Guid="C086521F-8552-43D1-AAE2-CDD579F66FDD">
<RegistryValue <RegistryValue
Root="HKLM" Root="HKLM"
@ -98,18 +98,18 @@
<File Name="License.txt" Source="..\..\..\License.txt" KeyPath="yes" /> <File Name="License.txt" Source="..\..\..\License.txt" KeyPath="yes" />
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="SXSDIR"> <DirectoryRef Id="SXSDIR">
<Component Id="C.SXSDIR" Guid="0F09CD39-1137-4DB8-A783-27B1F51353D1"> <Component Id="C.SXSDIR" Guid="0F09CD39-1137-4DB8-A783-27B1F51353D1">
<RegistryValue <RegistryValue
Root="HKLM" Root="HKLM"
Key="[P.RegistryKey]" Key="[P.RegistryKey]"
Name="SxsDir" Name="SxsDir"
Type="string" Type="string"
Value="[SXSDIR]" Value="[SXSDIR]"
KeyPath="yes" /> KeyPath="yes" />
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="BINDIR" FileSource="..\build\$(var.Configuration)"> <DirectoryRef Id="BINDIR" FileSource="..\build\$(var.Configuration)">
<Component Id="C.$(var.MyProductFileName)_a64.sys"> <Component Id="C.$(var.MyProductFileName)_a64.sys">
<File Name="$(var.MyProductFileName)-a64.sys" KeyPath="yes" /> <File Name="$(var.MyProductFileName)-a64.sys" KeyPath="yes" />
</Component> </Component>
@ -941,8 +941,8 @@
Absent="disallow"> Absent="disallow">
<ComponentRef Id="C.INSTALLDIR" /> <ComponentRef Id="C.INSTALLDIR" />
<ComponentRef Id="C.License.txt" /> <ComponentRef Id="C.License.txt" />
<ComponentRef Id="C.SXSDIR" /> <ComponentRef Id="C.SXSDIR" />
<Feature <Feature
Id="F.User" Id="F.User"
Level="1" Level="1"
Title="Core" Title="Core"
@ -1031,6 +1031,6 @@
</InstallExecuteSequence> </InstallExecuteSequence>
<InstallUISequence> <InstallUISequence>
<Custom Action="Action.InstanceID" Before="AppSearch" /> <Custom Action="Action.InstanceID" Before="AppSearch" />
</InstallUISequence> </InstallUISequence>
</Product> </Product>
</Wix> </Wix>