bpo-32507: Change Windows install to include app-local UCRT (#5119) · python/cpython@d135f20 (original) (raw)
`@@ -2,48 +2,22 @@
`
2
2
`
`
3
3
`
`
4
4
`
`
5
``
`-
`
6
``
`-
`
7
``
`-
`
8
``
`-
`
9
``
`-
`
10
``
`-
`
11
``
-
12
``
`-
`
13
``
`-
`
14
``
`-
`
15
``
`-
`
16
``
`-
`
17
``
`-
`
18
``
`-
`
19
``
`-
`
20
``
`-
`
21
``
`-
`
22
``
`-
`
23
``
`-
`
24
``
-
25
``
`-
`
26
``
`-
`
27
``
`-
<MsuPackage Id="crt_14.0_$(var.ver)_x86"
`
28
``
`-
KB="2999226"
`
29
``
`-
SourceFile="!(bindpath.redist)\Windows$(var.msuver)-KB2999226-x86.msu"
`
30
``
`-
DisplayName="!(loc.CRTDescription)"
`
31
``
`-
Description="!(loc.CRTDescription)"
`
``
5
`+
<MsiPackage Id="ucrt_AllUsers"
`
``
6
`+
SourceFile="ucrt.msi"
`
32
7
`Compressed="$(var.CompressMSI)"
`
33
8
`DownloadUrl="$(var.DownloadUrl)"
`
34
``
`-
InstallCondition="not CRTInstalled and VersionNT = $(var.ver) and not VersionNT64 and (Include_core or Include_exe or Include_launcher or Include_pip) and not LauncherOnly" />
`
35
``
-
36
``
`-
<MsuPackage Id="crt_14.0_$(var.ver)_x64"
`
37
``
`-
KB="2999226"
`
38
``
`-
SourceFile="!(bindpath.redist)\Windows$(var.msuver)-KB2999226-x64.msu"
`
39
``
`-
DisplayName="!(loc.CRTDescription)"
`
40
``
`-
Description="!(loc.CRTDescription)"
`
``
9
`+
ForcePerMachine="yes"
`
``
10
`+
InstallCondition="InstallAllUsers and not CRTInstalled and (Include_core or Include_exe or Include_pip) and not LauncherOnly">
`
``
11
`+
`
``
12
`+
`
``
13
`+
<MsiPackage Id="ucrt_JustForMe"
`
``
14
`+
SourceFile="ucrt.msi"
`
41
15
`Compressed="$(var.CompressMSI)"
`
42
16
`DownloadUrl="$(var.DownloadUrl)"
`
43
``
`-
InstallCondition="not CRTInstalled and VersionNT64 = $(var.ver) and (Include_core or Include_exe or Include_launcher or Include_pip) and not LauncherOnly" />
`
``
17
`+
ForcePerMachine="no"
`
``
18
`+
InstallCondition="not InstallAllUsers and not CRTInstalled and (Include_core or Include_exe or Include_pip) and not LauncherOnly">
`
``
19
`+
`
``
20
`+
`
44
21
`
`
45
22
`
`
46
``
-
47
``
`-
`
48
``
`-
`
49
23
`
`