diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index d6fbd9e4546fbe..103e4e4122a9f1 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -33,8 +33,8 @@
       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(PortableOS)' == 'win'">$(InnerBuildArgs) $(FlagParameterPrefix)os windows</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(PortableOS)' != 'win'">$(InnerBuildArgs) $(FlagParameterPrefix)os $(PortableOS)</InnerBuildArgs>
-      <!-- Mobile builds are never "cross" builds as they don't have a rootfs-based filesystem build. -->
-      <InnerBuildArgs Condition="'$(CrossBuild)' == 'true' or ('$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(TargetsMobile)' != 'true' and '$(PortableOS)' != 'linux-bionic')">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
+      <!-- Mobile builds and windows host (for Android-on-windows etc.) are never "cross" builds as they don't have a rootfs-based filesystem build. -->
+      <InnerBuildArgs Condition="'$(CrossBuild)' == 'true' or ('$(PortableOS)-$(TargetArchitecture)' != '$(PortableOS)-$(BuildArchitecture)' and '$(TargetsMobile)' != 'true' and '$(PortableOS)' != 'win' and '$(PortableOS)' != 'linux-bionic')">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)configuration $(Configuration)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)verbosity $(LogVerbosity)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>