Skip to content

Commit 1bb267f

Browse files
heschigopherbot
authored andcommitted
internal/task/releaselet: fix
I forgot to upload the latest patchset to http://go.dev/cl/478616 before submitting :( For golang/go#58028 Change-Id: Ic8c06a99341472c774ce4e44cf8f3b98b5e70a13 Reviewed-on: https://go-review.googlesource.com/c/build/+/479277 Run-TryBot: Heschi Kreinick <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Carlos Amedee <[email protected]> Auto-Submit: Heschi Kreinick <[email protected]>
1 parent f9fc598 commit 1bb267f

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

internal/task/releaselet/releaselet.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,13 +380,20 @@ var windowsData = map[string]string{
380380
<RegistrySearch Id="installed" Type="raw" Root="HKCU" Key="Software\GoProgrammingLanguage" Name="installed" />
381381
</Property>
382382
<MediaTemplate EmbedCab="yes" CompressionLevel="high" MaximumUncompressedMediaSize="10" />
383-
<?if $(var.GoMajorVersion < 21) ?>
383+
<?if $(var.GoMajorVersion) < 21 ?>
384384
<Condition Message="Windows 7 (with Service Pack 1) or greater required.">
385385
((VersionNT > 601) OR (VersionNT = 601 AND ServicePackLevel >= 1))
386386
</Condition>
387387
<?else?>
388388
<Condition Message="Windows 10 or greater required.">
389-
(VersionNT >= 1000)
389+
<!-- In true MS fashion, Windows 10 pretends to be windows 8.1.
390+
See https://learn.microsoft.com/en-us/troubleshoot/windows-client/application-management/versionnt-value-for-windows-10-server .
391+
Workarounds exist, but seem difficult/flaky.
392+
1) We could build a "bootstrapper" with wix burn, but then we'll be building .exes and there might be implications to that.
393+
2) We can try one of the things listed here: https://stackoverflow.com/q/31932646 but that takes us back to https://github.com/wixtoolset/issues/issues/5824 and needing a bootstrapper.
394+
So we're stuck with checking for 8.1.
395+
-->
396+
(VersionNT >= 603)
390397
</Condition>
391398
<?endif?>
392399
<MajorUpgrade AllowDowngrades="yes" />

0 commit comments

Comments
 (0)