diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 1afbfe1639d..d8f39e49aa3 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -32,7 +32,7 @@ true true - MultiThreadedDLL + MultiThreaded true Level3 ProgramDatabase @@ -43,7 +43,7 @@ Disabled false - MultiThreadedDebugDLL + MultiThreadedDebug $(OutDir);%(AdditionalLibraryDirectories) @@ -53,7 +53,9 @@ true true true - LIBC;%(IgnoreSpecificDefaultLibraries) + ucrtd.lib;%(AdditionalDependencies) + ucrt.lib;%(AdditionalDependencies) + LIBC;libucrt.lib;libucrtd.lib;%(IgnoreSpecificDefaultLibraries) MachineX86 MachineX64 $(OutDir)$(TargetName).pgd diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 62b9614daf7..1917937f6bf 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -2402,8 +2402,6 @@ private: // 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); diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets index cc7e4450238..363c4e3efa2 100644 --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -61,7 +61,6 @@ - diff --git a/Tools/msi/bundle/packagegroups/crt.wxs b/Tools/msi/bundle/packagegroups/crt.wxs index b0797009f63..32b063ffceb 100644 --- a/Tools/msi/bundle/packagegroups/crt.wxs +++ b/Tools/msi/bundle/packagegroups/crt.wxs @@ -6,25 +6,6 @@ - - - - - - - - - diff --git a/Tools/msi/crt/crt.wixproj b/Tools/msi/crt/crt.wixproj deleted file mode 100644 index 75295ba4209..00000000000 --- a/Tools/msi/crt/crt.wixproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - {91C99298-8E2E-4422-A5AF-CC4FFF9A58D3} - 2.0 - crt - Package - ICE71 - - - - - - - - - - - - \ No newline at end of file diff --git a/Tools/msi/crt/crt.wxs b/Tools/msi/crt/crt.wxs deleted file mode 100644 index 5b100956aff..00000000000 --- a/Tools/msi/crt/crt.wxs +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Tools/msi/crt/crt_en-US.wxl b/Tools/msi/crt/crt_en-US.wxl deleted file mode 100644 index cee3c8acf57..00000000000 --- a/Tools/msi/crt/crt_en-US.wxl +++ /dev/null @@ -1,5 +0,0 @@ - - - C Runtime - crt - diff --git a/Tools/msi/crt/crt_files.wxs b/Tools/msi/crt/crt_files.wxs deleted file mode 100644 index 46f7d6efc3c..00000000000 --- a/Tools/msi/crt/crt_files.wxs +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - ALLUSERS=1 - - - - NOT ALLUSERS=1 - - - - - diff --git a/Tools/msi/crt/crtlicense.txt b/Tools/msi/crt/crtlicense.txt deleted file mode 100644 index 1f0f1f9eff3..00000000000 --- a/Tools/msi/crt/crtlicense.txt +++ /dev/null @@ -1,47 +0,0 @@ - - -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: - -appcrt140.dll -desktopcrt140.dll -vcruntime140.dll -msvcp140.dll -concrt140.dll -vccorlib140.dll - -If you further distribute programs that include the Microsoft -Distributable Code, you must comply with the restrictions on -distribution specified by Microsoft. In particular, you must require -distributors and external end users to agree to terms that protect the -Microsoft Distributable Code at least as much as Microsoft's own -requirements for the Distributable Code. See Microsoft's documentation -(included in its developer tools and on its website at microsoft.com) -for specific details. - -Redistribution of the Windows binary build of the Python interpreter -complies with this agreement, provided that you do not: - -- alter any copyright, trademark or patent notice in Microsoft's -Distributable Code; - -- use Microsoft's trademarks in your programs' names or in a way that -suggests your programs come from or are endorsed by Microsoft; - -- distribute Microsoft's Distributable Code to run on a platform other -than Microsoft operating systems, run-time technologies or application -platforms; or - -- include Microsoft Distributable Code in malicious, deceptive or -unlawful programs. - -These restrictions apply only to the Microsoft Distributable Code as -defined above, not to Python itself or any programs running on the -Python interpreter. The redistribution of the Python interpreter and -libraries is governed by the Python Software License included with this -file, or by other licenses as marked. - diff --git a/Tools/msi/exe/crtlicense.txt b/Tools/msi/exe/crtlicense.txt index 936bc5ad532..f86841f263e 100644 --- a/Tools/msi/exe/crtlicense.txt +++ b/Tools/msi/exe/crtlicense.txt @@ -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