Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Address review comments
Browse files Browse the repository at this point in the history
serge-s committed Oct 4, 2023
1 parent dfd385f commit ad3b05c
Showing 3 changed files with 23 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@ File versions are determined using the [Property](../../xsd/wix/property.md), [D

```xml
<Property Id="USER32VERSION">
<DirectorySearch Id="SystemFolderDriverVersion" Path="[SystemFolder]">
<FileSearch Name="user32.dll" MinVersion="6.0.6001.1750"/>
</DirectorySearch>
<DirectorySearch Id="SystemFolderDriverVersion" Path="[SystemFolder]">
<FileSearch Name="user32.dll" MinVersion="6.0.6001.1750"/>
</DirectorySearch>
</Property>
```

@@ -26,7 +26,7 @@ Once you have determined whether the file exists with the requested version you

```xml
<Condition Message="The installed version of user32.dll is not high enough to support this installer.">
<![CDATA[Installed OR USER32VERSION]]>
<![CDATA[Installed OR USER32VERSION]]>
</Condition>
```

Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ You first need to define the parent DirectorySearch element. This is expected to

```xml
<Property Id="SHDOCVW">
<DirectorySearch Id="WinDir" Path="[WindowsFolder]">
<DirectorySearch Id="Media" Path="Media">
<FileSearch Id="Chimes" Name="chimes.wav" />
</DirectorySearch>
</DirectorySearch>
<DirectorySearch Id="WinDir" Path="[WindowsFolder]">
<DirectorySearch Id="Media" Path="Media">
<FileSearch Id="Chimes" Name="chimes.wav" />
</DirectorySearch>
</DirectorySearch>
</Property>
```

@@ -24,9 +24,9 @@ To search for another file in the Media directory, you need to reference all the

```xml
<Property Id="USER32">
<DirectorySearchRef Id="Media" Parent="WinDir" Path="Media">
<FileSearch Id="Chord" Name="chord.wav" />
</DirectorySearchRef>
<DirectorySearchRef Id="Media" Parent="WinDir" Path="Media">
<FileSearch Id="Chord" Name="chord.wav" />
</DirectorySearchRef>
</Property>
```

Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@ In the following example, the path to \[WindowsFolder\]Microsoft.NET is defined

```xml
<Property Id="NGEN2DIR">
<DirectorySearch Id="Windows" Path="[WindowsFolder]">
<DirectorySearch Id="MS.NET" Path="Microsoft.NET">
</DirectorySearch>
</DirectorySearch>
<DirectorySearch Id="Windows" Path="[WindowsFolder]">
<DirectorySearch Id="MS.NET" Path="Microsoft.NET">
</DirectorySearch>
</DirectorySearch>
</Property>
```

@@ -21,13 +21,13 @@ Under the search root, define the directory you want returned and set the Direct

```xml
<Property Id="NGEN2DIR">
<DirectorySearch Id="Windows" Path="[WindowsFolder]">
<DirectorySearch Id="MS.NET" Path="Microsoft.NET">
<DirectorySearch Id="Ngen2Dir" Depth="2" AssignToProperty="yes">
<FileSearch Id="Ngen_exe" Name="ngen.exe" MinVersion="2.0.0.0" />
</DirectorySearch>
</DirectorySearch>
</DirectorySearch>
<DirectorySearch Id="Windows" Path="[WindowsFolder]">
<DirectorySearch Id="MS.NET" Path="Microsoft.NET">
<DirectorySearch Id="Ngen2Dir" Depth="2" AssignToProperty="yes">
<FileSearch Id="Ngen_exe" Name="ngen.exe" MinVersion="2.0.0.0" />
</DirectorySearch>
</DirectorySearch>
</DirectorySearch>
</Property>
```

0 comments on commit ad3b05c

Please sign in to comment.