Skip to content

Commit 7d38d3c

Browse files
authored
Merge pull request swiftlang#7 from compnerd/product-version
Windows: correct variable reference for `ProductVersion`
2 parents 52741bf + 9b8820d commit 7d38d3c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

platforms/Windows/toolchain.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<Product Id="*" Language="1033" Manufacturer="swift.org" Name="Toolchain" UpgradeCode="9871289b-f9cb-4b39-8122-2c7ec1ab24d5" Version="$(ProductVersion)">
3+
<Product Id="*" Language="1033" Manufacturer="swift.org" Name="Toolchain" UpgradeCode="9871289b-f9cb-4b39-8122-2c7ec1ab24d5" Version="$(var.ProductVersion)">
44
<Package Comments="Copyright (c) 2021 Swift Open Source Project" Compressed="yes" Description="Toolchain" InstallScope="perMachine" Manufacturer="swift.org" />
55

66
<MediaTemplate CompressionLevel="high" EmbedCab="yes" />
@@ -23,7 +23,7 @@
2323
<Directory Id="TOOLCHAINS" Name="Toolchains">
2424
<!-- TODO(compnerd):
2525
This really should be
26-
unknown-Asserts-$(ProductVersion).xctoolchain,
26+
unknown-Asserts-$(var.ProductVersion).xctoolchain,
2727
though before changing, we should setup a
2828
`unknown-Asserts-current.xctoolchain`
2929
symlink. Additionally, beware that the environment chagnes

0 commit comments

Comments
 (0)