Skip to content

Commit d135f20

Browse files
authored
bpo-32507: Change Windows install to include app-local UCRT (#5119)
1 parent ca0c5f2 commit d135f20

31 files changed

+71
-200
lines changed
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.
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>

0 commit comments

Comments
 (0)