Issue 24476: Statically links vcruntime140.dll and removes it from the installer

Author: zooba

PCbuild/pyproject.props

@@ -32,7 +32,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling></ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -43,7 +43,7 @@
     <ClCompile Condition="$(Configuration) == 'Debug'">
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -53,7 +53,9 @@
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreSpecificDefaultLibraries>LIBC;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <AdditionalDependencies Condition="$(Configuration) == 'Debug'">ucrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="$(Configuration) != 'Debug'">ucrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>LIBC;libucrt.lib;libucrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <TargetMachine>MachineX86</TargetMachine>
       <TargetMachine Condition="'$(Platform)' == 'x64'">MachineX64</TargetMachine>
       <ProfileGuidedDatabase Condition="$(SupportPGO)">$(OutDir)$(TargetName).pgd</ProfileGuidedDatabase>

Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp

@@ -2402,8 +2402,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
         // Check whether at least CRT v10.0.9924.0 is available.
         // It should only be installed as a Windows Update package, which means
         // we don't need to worry about 32-bit/64-bit.
-        // However, since the WU package does not include vcruntime140.dll, we
-        // still install that ourselves.
         LPCWSTR crtFile = L"api-ms-win-crt-runtime-l1-1-0.dll";
 
         DWORD cbVer = GetFileVersionInfoSizeW(crtFile, nullptr);

Tools/msi/bundle/bundle.targets

@@ -61,7 +61,6 @@
     </ItemDefinitionGroup>
     <ItemGroup>
         <Package Include="..\core\core*.wixproj" />
-        <Package Include="..\crt\crt*.wixproj" />
         <Package Include="..\dev\dev*.wixproj" />
         <Package Include="..\doc\doc*.wixproj" />
         <Package Include="..\exe\exe*.wixproj" />

Tools/msi/bundle/packagegroups/crt.wxs

@@ -6,25 +6,6 @@
             <PackageGroupRef Id="crt_14.0_v6.1" />
             <PackageGroupRef Id="crt_14.0_v6.2" />
             <PackageGroupRef Id="crt_14.0_v6.3" />
-
-            <MsiPackage Id="crt_AllUsers"
-                        SourceFile="crt.msi"
-                        Compressed="$(var.CompressMSI)"
-                        DownloadUrl="$(var.DownloadUrl)"
-                        ForcePerMachine="yes"
-                        InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip)">
-                <!-- TARGETDIR will be ignored, but must still be provided -->
-                <MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
-            </MsiPackage>
-            
-            <MsiPackage Id="crt_JustForMe"
-                        SourceFile="crt.msi"
-                        Compressed="$(var.CompressMSI)"
-                        DownloadUrl="$(var.DownloadUrl)"
-                        ForcePerMachine="no"
-                        InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip)">
-                <MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
-            </MsiPackage>
         </PackageGroup>
     </Fragment>
 

Tools/msi/crt/crt.wixproj

@@ -5,11 +5,8 @@ Additional Conditions for this Windows binary build
 
 This program is linked with and uses Microsoft Distributable Code,
 copyrighted by Microsoft Corporation. The Microsoft Distributable Code
-includes the following files:
-
-msvcr90.dll
-msvcp90.dll
-msvcm90.dll
+is embedded in each .exe, .dll and .pyd file as a result of running
+the code through a linker.
 
 If you further distribute programs that include the Microsoft
 Distributable Code, you must comply with the restrictions on