Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d135f20

Browse files
zoobazooba
authoredJan 9, 2018
bpo-32507: Change Windows install to include app-local UCRT (python#5119)
1 parent ca0c5f2 commit d135f20

31 files changed

+71
-200
lines changed
 

‎Misc/NEWS.d/next/Windows/2018-01-07-12-32-49.bpo-32507.vB4gxk.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Use app-local UCRT install rather than the proper update for old versions of
2+
Windows.

‎Misc/NEWS.d/next/Windows/2018-01-07-12-33-21.bpo-29911.ewSJKb.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Ensure separate Modify and Uninstall buttons are displayed.

‎PC/dllbase_nt.txt

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎PCbuild/_bz2.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6767
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
6868
</ClCompile>
69-
<Link>
70-
<BaseAddress>0x1D170000</BaseAddress>
71-
</Link>
7269
</ItemDefinitionGroup>
7370
<ItemGroup>
7471
<ClCompile Include="..\Modules\_bz2module.c" />

‎PCbuild/_ctypes.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<AdditionalIncludeDirectories>..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
</ClCompile>
6666
<Link>
67-
<BaseAddress>0x1D1A0000</BaseAddress>
6867
<AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
6968
</Link>
7069
</ItemDefinitionGroup>

‎PCbuild/_decimal.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
<PreprocessorDefinitions Condition="'$(Platform)' == 'x64'">CONFIG_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6767
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6868
</ClCompile>
69-
<Link>
70-
<BaseAddress>0x1D1A0000</BaseAddress>
71-
</Link>
7269
</ItemDefinitionGroup>
7370
<ItemGroup>
7471
<ClInclude Include="..\Modules\_decimal\libmpdec\basearith.h" />

‎PCbuild/_elementtree.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@
6464
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6666
</ClCompile>
67-
<Link>
68-
<BaseAddress>0x1D100000</BaseAddress>
69-
</Link>
7067
</ItemDefinitionGroup>
7168
<ItemGroup>
7269
<ClInclude Include="..\Modules\expat\ascii.h" />

‎PCbuild/_msi.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<ItemDefinitionGroup>
6363
<Link>
6464
<AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
65-
<BaseAddress>0x1D160000</BaseAddress>
6665
</Link>
6766
</ItemDefinitionGroup>
6867
<ItemGroup>

‎PCbuild/_multiprocessing.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<ItemDefinitionGroup>
6363
<Link>
6464
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
65-
<BaseAddress>0x1e1D0000</BaseAddress>
6665
</Link>
6766
</ItemDefinitionGroup>
6867
<ItemGroup>

‎PCbuild/_overlapped.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<ItemDefinitionGroup>
6363
<Link>
6464
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
65-
<BaseAddress>0x1D110000</BaseAddress>
6665
</Link>
6766
</ItemDefinitionGroup>
6867
<ItemGroup>

‎PCbuild/_socket.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<ItemDefinitionGroup>
6363
<Link>
6464
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
65-
<BaseAddress>0x1e1D0000</BaseAddress>
6665
</Link>
6766
</ItemDefinitionGroup>
6867
<ItemGroup>

‎PCbuild/_sqlite3.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@
6464
<AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
<PreprocessorDefinitions>MODULE_NAME="sqlite3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
6666
</ClCompile>
67-
<Link>
68-
<BaseAddress>0x1e180000</BaseAddress>
69-
</Link>
7067
</ItemDefinitionGroup>
7168
<ItemGroup>
7269
<ClInclude Include="..\Modules\_sqlite\cache.h" />

‎PCbuild/_testbuffer.vcxproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@
6060
<PropertyGroup>
6161
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
6262
</PropertyGroup>
63-
<ItemDefinitionGroup>
64-
<Link>
65-
<BaseAddress>0x1e1F0000</BaseAddress>
66-
</Link>
67-
</ItemDefinitionGroup>
6863
<ItemGroup>
6964
<ClCompile Include="..\Modules\_testbuffer.c" />
7065
</ItemGroup>

‎PCbuild/_testcapi.vcxproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@
6060
<PropertyGroup>
6161
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
6262
</PropertyGroup>
63-
<ItemDefinitionGroup>
64-
<Link>
65-
<BaseAddress>0x1e1F0000</BaseAddress>
66-
</Link>
67-
</ItemDefinitionGroup>
6863
<ItemGroup>
6964
<ClCompile Include="..\Modules\_testcapimodule.c" />
7065
</ItemGroup>

‎PCbuild/_testimportmultiple.vcxproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@
6060
<PropertyGroup>
6161
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
6262
</PropertyGroup>
63-
<ItemDefinitionGroup>
64-
<Link>
65-
<BaseAddress>0x1e1F0000</BaseAddress>
66-
</Link>
67-
</ItemDefinitionGroup>
6863
<ItemGroup>
6964
<ClCompile Include="..\Modules\_testimportmultiple.c" />
7065
</ItemGroup>

‎PCbuild/python.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<Link>
6363
<SubSystem>Console</SubSystem>
6464
<StackReserveSize>2000000</StackReserveSize>
65-
<BaseAddress>0x1d000000</BaseAddress>
6665
</Link>
6766
</ItemDefinitionGroup>
6867
<ItemGroup>

‎PCbuild/pythoncore.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
<Link>
7777
<AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
7878
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories>
79-
<BaseAddress>0x1e000000</BaseAddress>
8079
</Link>
8180
</ItemDefinitionGroup>
8281
<ItemGroup>

‎PCbuild/pythonw.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<ItemDefinitionGroup>
5959
<Link>
6060
<StackReserveSize>2000000</StackReserveSize>
61-
<BaseAddress>0x1d000000</BaseAddress>
6261
</Link>
6362
</ItemDefinitionGroup>
6463
<ItemGroup>

‎PCbuild/select.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
<ItemDefinitionGroup>
6262
<Link>
6363
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
64-
<BaseAddress>0x1D110000</BaseAddress>
6564
</Link>
6665
</ItemDefinitionGroup>
6766
<ItemGroup>

‎PCbuild/unicodedata.vcxproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@
5959
<PropertyGroup>
6060
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
6161
</PropertyGroup>
62-
<ItemDefinitionGroup>
63-
<Link>
64-
<BaseAddress>0x1D120000</BaseAddress>
65-
</Link>
66-
</ItemDefinitionGroup>
6762
<ItemGroup>
6863
<ClInclude Include="..\Modules\unicodedata_db.h" />
6964
<ClInclude Include="..\Modules\unicodename_db.h" />

‎PCbuild/xxlimited.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
</ClCompile>
6767
<Link>
6868
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
69-
<BaseAddress>0x1D110000</BaseAddress>
7069
</Link>
7170
</ItemDefinitionGroup>
7271
<ItemGroup>

‎Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
281281
case ID_INSTALL_BUTTON:
282282
SavePageSettings();
283283

284-
if (!WillElevate() && !QueryElevateForCrtInstall()) {
285-
break;
286-
}
287-
288284
hr = BalGetNumericVariable(L"InstallAllUsers", &installAllUsers);
289285
ExitOnFailure(hr, L"Failed to get install scope");
290286

@@ -332,10 +328,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
332328
ReleaseStr(targetDir);
333329
}
334330

335-
if (!WillElevate() && !QueryElevateForCrtInstall()) {
336-
break;
337-
}
338-
339331
OnPlan(_command.action);
340332
break;
341333

@@ -2642,30 +2634,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
26422634
return result;
26432635
}
26442636

2645-
BOOL QueryElevateForCrtInstall() {
2646-
// Called to prompt the user that even though they think they won't need
2647-
// to elevate, they actually will because of the CRT install.
2648-
if (IsCrtInstalled()) {
2649-
// CRT is already installed - no need to prompt
2650-
return TRUE;
2651-
}
2652-
2653-
LONGLONG elevated;
2654-
HRESULT hr = BalGetNumericVariable(L"WixBundleElevated", &elevated);
2655-
if (SUCCEEDED(hr) && elevated) {
2656-
// Already elevated - no need to prompt
2657-
return TRUE;
2658-
}
2659-
2660-
LOC_STRING *locStr;
2661-
hr = LocGetString(_wixLoc, L"#(loc.ElevateForCRTInstall)", &locStr);
2662-
if (FAILED(hr)) {
2663-
BalLogError(hr, "Failed to get ElevateForCRTInstall string");
2664-
return FALSE;
2665-
}
2666-
return ::MessageBoxW(_hWnd, locStr->wzText, _theme->sczCaption, MB_YESNO) != IDNO;
2667-
}
2668-
26692637
HRESULT EvaluateConditions() {
26702638
HRESULT hr = S_OK;
26712639
BOOL result = FALSE;

‎Tools/msi/bundle/bundle.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
<Package Include="..\tcltk\tcltk*.wixproj" />
7272
<Package Include="..\test\test*.wixproj" />
7373
<Package Include="..\tools\tools*.wixproj" />
74+
<Package Include="..\ucrt\ucrt*.wixproj" />
7475
</ItemGroup>
7576

7677
<PropertyGroup>

‎Tools/msi/bundle/packagegroups/crt.wxs

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,22 @@
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33
<Fragment>
44
<PackageGroup Id="crt">
5-
<PackageGroupRef Id="crt_14.0_v6.0" />
6-
<PackageGroupRef Id="crt_14.0_v6.1" />
7-
<PackageGroupRef Id="crt_14.0_v6.2" />
8-
<PackageGroupRef Id="crt_14.0_v6.3" />
9-
</PackageGroup>
10-
</Fragment>
11-
12-
<?foreach ver in v6.0;v6.1;v6.2;v6.3 ?>
13-
<?if "$(var.ver)" = "v6.0" ?>
14-
<?define msuver=6.0 ?>
15-
<?elseif "$(var.ver)" = "v6.1" ?>
16-
<?define msuver=6.1 ?>
17-
<?elseif "$(var.ver)" = "v6.2" ?>
18-
<?define msuver=8-RT ?>
19-
<?elseif "$(var.ver)" = "v6.3" ?>
20-
<?define msuver=8.1 ?>
21-
<?else ?>
22-
<?error unknown version $(var.ver) ?>
23-
<?endif ?>
24-
25-
<Fragment>
26-
<PackageGroup Id="crt_14.0_$(var.ver)">
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"
327
Compressed="$(var.CompressMSI)"
338
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+
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
12+
</MsiPackage>
13+
<MsiPackage Id="ucrt_JustForMe"
14+
SourceFile="ucrt.msi"
4115
Compressed="$(var.CompressMSI)"
4216
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+
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
20+
</MsiPackage>
4421
</PackageGroup>
4522
</Fragment>
46-
47-
<?undef msuver ?>
48-
<?endforeach ?>
4923
</Wix>

‎Tools/msi/exe/exe.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
44
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
55
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
6-
6+
77
<PropertyRef Id="UpgradeTable" />
88
<PropertyRef Id="REGISTRYKEY" />
9-
9+
1010
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
1111
<ComponentGroupRef Id="exe_python" Primary="yes" />
1212
<ComponentGroupRef Id="exe_reg" Primary="yes" />
1313
<ComponentGroupRef Id="exe_txt" />
1414
<ComponentGroupRef Id="exe_icons" />
1515
<ComponentRef Id="OptionalFeature" />
1616
</Feature>
17-
17+
1818
<Feature Id="Shortcuts" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
1919
<ComponentGroupRef Id="exe_python" />
2020
<Component Id="exe_shortcut" Directory="MenuDir" Guid="*">

‎Tools/msi/get_externals.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ set binaries=%binaries% binutils
5555
set binaries=%binaries% gpg
5656
set binaries=%binaries% htmlhelp
5757
set binaries=%binaries% nuget
58-
set binaries=%binaries% redist
58+
set binaries=%binaries% redist-1
5959
set binaries=%binaries% wix
6060

6161
for %%b in (%binaries%) do (

‎Tools/msi/msi.props

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<OutputPath Condition="!HasTrailingSlash($(OutputPath))">$(OutputPath)\</OutputPath>
5555
<OutDir>$(OutputPath)</OutDir>
5656
<ReuseCabinetCache>true</ReuseCabinetCache>
57-
<CRTRedist Condition="'$(CRTRedist)' == ''">$(ExternalsDir)\windows-installer\redist</CRTRedist>
58-
<CRTRedist Condition="!Exists($(CRTRedist))"></CRTRedist>
57+
<CRTRedist Condition="'$(CRTRedist)' == ''">$(ExternalsDir)\windows-installer\redist-1\$(Platform)</CRTRedist>
58+
<CRTRedist>$([System.IO.Path]::GetFullPath($(CRTRedist)))</CRTRedist>
5959
<DocFilename>python$(MajorVersionNumber)$(MinorVersionNumber)$(MicroVersionNumber)$(ReleaseLevelName).chm</DocFilename>
6060

6161
<InstallerVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(Field3Value).0</InstallerVersion>
@@ -123,10 +123,7 @@
123123
<LinkerBindInputPaths Include="$(tcltkDir)">
124124
<BindName>tcltk</BindName>
125125
</LinkerBindInputPaths>
126-
<LinkerBindInputPaths Include="$(CRTRedist)" Condition="'$(CRTRedist)' != ''">
127-
<BindName>redist</BindName>
128-
</LinkerBindInputPaths>
129-
<LinkerBindInputPaths Include="$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT">
126+
<LinkerBindInputPaths Include="$(CRTRedist)">
130127
<BindName>redist</BindName>
131128
</LinkerBindInputPaths>
132129
<LinkerBindInputPaths Include="$(BuildPath32)">

‎Tools/msi/ucrt/ucrt.wixproj

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<ProjectGuid>{E233091D-2EE3-49D8-A7F1-6E266CE1B6B1}</ProjectGuid>
5+
<SchemaVersion>2.0</SchemaVersion>
6+
<OutputName>ucrt</OutputName>
7+
<OutputType>Package</OutputType>
8+
</PropertyGroup>
9+
<Import Project="..\msi.props" />
10+
<ItemGroup>
11+
<Compile Include="ucrt.wxs" />
12+
</ItemGroup>
13+
<ItemGroup>
14+
<EmbeddedResource Include="*.wxl" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<InstallFiles Include="$(CRTRedist)\ucrt\*.dll">
18+
<SourceBase>$(CRTRedist)</SourceBase>
19+
<Source>!(bindpath.redist)\</Source>
20+
<TargetBase>$(CRTRedist)\ucrt</TargetBase>
21+
<Target_>InstallDirectory\</Target_>
22+
<Group>ucrt_dll</Group>
23+
<IncludeInCat>false</IncludeInCat>
24+
</InstallFiles>
25+
</ItemGroup>
26+
27+
<Import Project="..\msi.targets" />
28+
</Project>

‎Tools/msi/ucrt/ucrt.wxs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3+
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
4+
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
5+
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
6+
7+
<PropertyRef Id="UpgradeTable" />
8+
<PropertyRef Id="REGISTRYKEY" />
9+
10+
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
11+
<ComponentGroupRef Id="ucrt_dll" />
12+
</Feature>
13+
</Product>
14+
</Wix>

‎Tools/msi/ucrt/ucrt_en-US.wxl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
3+
<String Id="Descriptor">C Runtime Library</String>
4+
<String Id="ShortDescriptor">ucrt</String>
5+
</WixLocalization>

‎Tools/msi/uploadrelease.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<File Include="$(OutputPath)\*.msi;$(OutputPath)\*.msu">
24+
<File Include="$(OutputPath)\*.msi">
2525
<CopyTo>$(MSITarget)</CopyTo>
2626
</File>
2727
<File Include="$(OutputPath)\*.exe;$(OutputPath)\*.zip">

0 commit comments

Comments
 (0)
Please sign in to comment.