Copy UCRT from versioned directory as fallback and fully incremental (#33209)

1 files changed, 15 insertions, 8 deletions

diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd
index 4237227514e..c13348b2f09 100644
--- a/src/coreclr/build-runtime.cmd
+++ b/src/coreclr/build-runtime.cmd
@@ -540,16 +540,23 @@ if %__BuildNative% EQU 1 (
         goto ExitWithCode
     )
 
-    if not "%__BuildArch%" == "arm64" (
-        if not exist "%__BinDir%\Redist\ucrt\DLLs\%__BuildArch%" mkdir "%__BinDir%\Redist\ucrt\DLLs\%__BuildArch%"
-        xcopy /F /Y "%UniversalCRTSDKDIR%Redist\ucrt\DLLs\%__BuildArch%\*.dll" "%__BinDir%\Redist\ucrt\DLLs\%__BuildArch%"
-        if not !errorlevel! == 0 (
-            set __exitCode=!errorlevel!
-            echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to copy the CRT to the output.
-            goto ExitWithCode
-        )
+    if /i "%__BuildArch%" == "arm64" goto SkipCopyUcrt
+
+    set "__UCRTDir=%UniversalCRTSDKDIR%Redist\ucrxxxt\DLLs\%__BuildArch%\"
+    if not exist "!__UCRTDir!" set "__UCRTDir=%UniversalCRTSDKDIR%Redist\%UCRTVersion%\ucrt\DLLs\%__BuildArch%\"
+    if not exist "!__UCRTDir!" (
+        echo %__ErrMsgPrefix%%__MsgPrefix%Error: Please install the Redistributable Universal C Runtime.
+        goto ExitWithError
+    )
+
+    xcopy /Y/I/E/D/F "!__UCRTDir!*.dll" "%__BinDir%\Redist\ucrt\DLLs\%__BuildArch%"
+    if not !errorlevel! == 0 (
+        set __exitCode=!errorlevel!
+        echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to copy the CRT to the output.
+        goto ExitWithCode
     )
 
+:SkipCopyUcrt
     if %__EnforcePgo% EQU 1 (
         "%PYTHON%" "%__ProjectDir%\src\scripts\pgocheck.py" "%__BinDir%\coreclr.dll" "%__BinDir%\clrjit.dll"
     )