'win' means 'win10' for fallback

dotnet · Feb 15, 2023 · c490ee5 · c490ee5
1 parent 34ab6ea
commit c490ee5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd
@@ -332,7 +332,10 @@ REM ============================================================================
 :: When the host runs on an unknown rid, it falls back to the output rid
 :: Strip the architecture
 for /f "delims=-" %%i in ("%__OutputRid%") do set __FallbackOS=%%i
-if "%__FallbackOS%" == "" set __FallbackOS=win10
+:: The "win" host build is Windows 10 compatible
+if "%__FallbackOS%" == "win"       (set __FallbackOS=win10)
+:: Default to "win10" fallback
+if "%__FallbackOS%" == ""          (set __FallbackOS=win10)
 
 if %__BuildNative% EQU 1 (
     REM Scope environment changes start {

diff --git a/src/native/corehost/build.cmd b/src/native/corehost/build.cmd
@@ -105,6 +105,8 @@ echo "Computed RID for native build is %cm_BaseRid%"
 :: When the host runs on an unknown rid, it falls back to the output rid
 :: Strip the architecture
 for /f "delims=-" %%i in ("%__OutputRid%") do set __FallbackOS=%%i
+:: The "win" host build is Windows 10 compatible
+if "%__FallbackOS%" == "win"       (set __FallbackOS=win10)
 
 set __ExtraCmakeParams=%__ExtraCmakeParams% "-DCLI_CMAKE_HOST_VER=%__HostVersion%" "-DCLI_CMAKE_COMMON_HOST_VER=%__AppHostVersion%" "-DCLI_CMAKE_HOST_FXR_VER=%__HostFxrVersion%"
 set __ExtraCmakeParams=%__ExtraCmakeParams% "-DCLI_CMAKE_HOST_POLICY_VER=%__HostPolicyVersion%" "-DCLI_CMAKE_PKG_RID=%cm_BaseRid%" "-DCLI_CMAKE_FALLBACK_RID=%__FallbackOS%" "-DCLI_CMAKE_COMMIT_HASH=%__CommitSha%"