Skip to content

Commit d10ee14

Browse files
committed
Integrate WiX v6 updates
1 parent 8512409 commit d10ee14

File tree

5 files changed

+50
-11
lines changed

5 files changed

+50
-11
lines changed

src/content/docs/wix/schema/ui/wixui.mdx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,24 @@ import BlockWrapper from '@components/BlockWrapper.astro';
66
import BlockReference from '@components/BlockReference.astro';
77
import BlockDefList from '@components/BlockDefList.astro';
88

9-
References a WixUI dialog set, either one that's included in WixToolset.UI.wixext or a
9+
References a WixUI dialog set, either one that's included in WixToolset.UI.wixext or a
1010
custom dialog set included in your authoring.
1111

1212

1313
## Attributes
1414

1515
<BlockWrapper>
1616

17+
<BlockReference
18+
content={{
19+
title: "ExtendedPathValidation",
20+
type: "wxs:YesNoTypeUnion"
21+
}}
22+
>
23+
Enable checks to test whether the package is being installed to a network share or removable
24+
disk. The default is no.
25+
</BlockReference>
26+
1727
<BlockReference
1828
content={{
1929
title: "Id",

src/content/docs/wix/schema/wxs/bundle.mdx

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,18 @@ The root element for creating bundled packages.
128128
Programs).
129129
</BlockReference>
130130

131+
<BlockReference
132+
content={{
133+
title: "Id",
134+
type: "string"
135+
}}
136+
>
137+
_New in WiX v6: WiX v6 adds this attribute to the `Package` element._
138+
A globally unique identiifer for the bundle in the world. It is recommended to use a prefix such as "CompanyName." to
139+
create a namespace of sorts. By default, higher versioned upgrade lower versioned bundles with the same Id. Use this
140+
attribute instead of the UpgradeCode attribute in new development.
141+
</BlockReference>
142+
131143
<BlockReference
132144
content={{
133145
title: "InProgressName",
@@ -218,12 +230,13 @@ The root element for creating bundled packages.
218230
title: "UpgradeCode",
219231
type: "Guid",
220232
typeLink: "../guid/",
221-
typeTitle: "Values of this type will look like: \"01234567-89AB-CDEF-0123-456789ABCDEF\" or \"{01234567-89AB-CDEF-0123-456789ABCDEF}\". Also allows \"PUT-GUID-HERE\" for use in examples.",
222-
required: true
233+
typeTitle: "Values of this type will look like: \"01234567-89AB-CDEF-0123-456789ABCDEF\" or \"{01234567-89AB-CDEF-0123-456789ABCDEF}\". Also allows \"PUT-GUID-HERE\" for use in examples."
223234
}}
224235
>
225-
Unique identifier for a family of bundles. If two bundles have the same UpgradeCode the
226-
bundle with the highest version will be installed.
236+
For new bundles, it is recommended to use the Id attribute instead. This attribute exists for
237+
backwards compatibility scenarios. Use this attribute to provide a specific unique identifier
238+
for a family of bundles. If two bundles have the same UpgradeCode the bundle with the highest
239+
version will be installed.
227240
</BlockReference>
228241

229242
<BlockReference

src/content/docs/wix/schema/wxs/mediatemplate.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ MediaTeplate element describes information to automatically assign files to cabi
3535
}}
3636
>
3737
Indicates the compression level for the Media's cabinet. This attribute can
38-
only be used in conjunction with the Cabinet attribute. The default is 'mszip'.
38+
only be used in conjunction with the Cabinet attribute. The default is 'medium'.
3939
</BlockReference>
4040

4141
<BlockReference

src/content/docs/wix/schema/wxs/package.mdx

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ The Package element is analogous to the main function in a C program. When linki
3434
Indicates whether the package files are compressed. Default is compressed packages.
3535
</BlockReference>
3636

37+
<BlockReference
38+
content={{
39+
title: "Id",
40+
type: "string"
41+
}}
42+
>
43+
_New in WiX v6: WiX v6 adds this attribute to the `Package` element._
44+
A globally unique identiifer for the package in the world. It is recommended to use a prefix such as "CompanyName." to
45+
create a namespace of sorts. By default, higher versioned upgrade lower versioned packages with the same Id. Use this
46+
attibute instead of the UpgradeCode attribute in new development.
47+
</BlockReference>
48+
3749
<BlockReference
3850
content={{
3951
title: "InstallerVersion",
@@ -99,7 +111,7 @@ The Package element is analogous to the main function in a C program. When linki
99111
typeTitle: "Use this attribute to specify the installation scope of this package: per-machine, per-user, or a choice of either."
100112
}}
101113
>
102-
Use this attribute to specify the installation scope of this package: per-machine, per-user, or a choice of either.
114+
Use this attribute to specify the installation scope of this package: per-machine, per-user, or a choice of either. The default is per-machine.
103115
</BlockReference>
104116

105117
<BlockReference
@@ -108,7 +120,7 @@ The Package element is analogous to the main function in a C program. When linki
108120
type: "yesno"
109121
}}
110122
>
111-
Indicates whether the package files are installed using 8.3 filenames.
123+
Indicates whether the package files are installed using 8.3 filenames. The default is no.
112124
</BlockReference>
113125

114126
<BlockReference
@@ -119,7 +131,9 @@ The Package element is analogous to the main function in a C program. When linki
119131
typeTitle: "Values of this type will look like: \"01234567-89AB-CDEF-0123-456789ABCDEF\" or \"{01234567-89AB-CDEF-0123-456789ABCDEF}\". Also allows \"PUT-GUID-HERE\" for use in examples."
120132
}}
121133
>
122-
The upgrade code GUID for the package. Sets the UpgradeCode property.
134+
For new packages, it is recommended to use the Id attribute instead. This attribute exists for
135+
backwards compatibility scenarios. Use this attribute to provide a specific upgrade code GUID
136+
for a MSI package. See [UpgradeCode](https://learn.microsoft.com/en-us/windows/win32/msi/upgradecode) for more information.
123137
</BlockReference>
124138

125139
<BlockReference
@@ -130,10 +144,11 @@ The Package element is analogous to the main function in a C program. When linki
130144
typeTitle: "Use this attribute to specify the upgrade strategy of this package: major upgrade or none."
131145
}}
132146
>
133-
The upgrade strategy for the package. If "none," no major upgrade is expected.
147+
_New in WiX v5: WiX v5 adds this attribute to the `Package` element._
148+
The upgrade strategy for the package. If "none," no major upgrade is expected.
134149
If "majorUpgrade," the UpgradeCode attribute is required and a major upgrade is expected.
150+
The default is "majorUpgrade."
135151
A default major upgrade is automatically provided if none is authored.
136-
_New in WiX v5: WiX v5 adds this attribute to the `Package` element._
137152
</BlockReference>
138153

139154
<BlockReference

src/content/docs/wix/schema/wxs/standarddirectorytype.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ A Windows Installer standard directory.
2525
- *ProgramFiles64Folder*
2626
- *ProgramFiles6432Folder*
2727
- *ProgramMenuFolder*
28+
- *PerUserProgramFilesFolder*
2829
- *RecentFolder*
2930
- *SendToFolder*
3031
- *StartMenuFolder*

0 commit comments

Comments
 (0)