diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index be60333c6f..89536f162f 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -386,10 +386,12 @@
 		</PropertyGroup>
 
 		<!-- Execute the inner builds -->
+		<!-- We force AppendRuntimeIdentifierToOutputPath=true because otherwise the inner builds might end up writing to the same directory -->
 		<MSBuild
 			Projects="$(MSBuildProjectFile)"
 			Targets="_BuildRidSpecificAppBundle"
 			Properties="
+				AppendRuntimeIdentifierToOutputPath=true;
 				RuntimeIdentifier=%(_RuntimeIdentifiersAsItems.Identity);
 				_CodesignItemsPath=%(_RuntimeIdentifiersAsItems.RidSpecificCodesignItemsPath);
 				_MtouchSymbolsList=%(_RuntimeIdentifiersAsItems.RidSpecificSymbolsListPath);
diff --git a/system-dependencies.sh b/system-dependencies.sh
index e1a2253cc9..849747b2fe 100755
--- a/system-dependencies.sh
+++ b/system-dependencies.sh
@@ -314,6 +314,16 @@ function install_mono () {
 	rm -f $MONO_PKG
 }
 
+function xcodebuild_download_selected_platforms ()
+{
+	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadPlatform iOS' $1"
+	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform iOS
+	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadPlatform tvOS' $1"
+	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform tvOS
+	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadPlatform watchOS' $1"
+	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform watchOS
+}
+
 function download_xcode_platforms ()
 {
 	if test -n "$IGNORE_SIMULATORS"; then return; fi
@@ -338,10 +348,8 @@ function download_xcode_platforms ()
 
 	log "Executing '$SUDO pkill -9 -f CoreSimulator.framework'"
 	$SUDO pkill -9 -f "CoreSimulator.framework" || true
-	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadAllPlatforms'"
-	if ! "$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadAllPlatforms; then
-		pstree || true
-		ps aux
+	if ! xcodebuild_download_selected_platforms; then
+		log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/simctl runtime list -v"
 		"$XCODE_DEVELOPER_ROOT/usr/bin/simctl" runtime list -v
 		# Don't exit here, just hope for the best instead.
 		set +x
@@ -354,12 +362,9 @@ function download_xcode_platforms ()
 		"$XCODE_DEVELOPER_ROOT/usr/bin/simctl" list -v
 	fi
 
-	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadAllPlatforms' (second time)"
-	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadAllPlatforms || true
-	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadAllPlatforms' (third time)"
-	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadAllPlatforms || true
-	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadAllPlatforms' (fourth time)"
-	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadAllPlatforms || true
+	xcodebuild_download_selected_platforms "(second time)" || true
+	xcodebuild_download_selected_platforms "(third time)" || true
+	xcodebuild_download_selected_platforms "(fourth time)" || true
 
 	log "Executing '$SUDO $XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -runFirstLaunch'"
 	$SUDO "$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -runFirstLaunch
@@ -377,7 +382,7 @@ function download_xcode_platforms ()
 	pkill -9 "Xcode" || log "Xcode was not running."
 	log "Executed 'open xcpref://Xcode.PreferencePane.Platforms'"
 
-	log "Executed '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadAllPlatforms'"
+	log "Finished installing Xcode platforms"
 }
 
 function run_xcode_first_launch ()
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index 9e1b1fc039..d58934cd17 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -9,19 +9,16 @@
 		<KnownFrameworkReference Update="Microsoft.NETCore.App.Mono" RuntimeFrameworkVersion="$(CUSTOM_DOTNET_VERSION)" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TRACKING_DOTNET_RUNTIME_SEPARATELY)' != ''">
-		<KnownFrameworkReference Update="Microsoft.NETCore.App">
-			<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppRefPackageVersion)</RuntimeFrameworkVersion>
-		</KnownFrameworkReference>
-	</ItemGroup>
-
 	<Target
 			Name="UpdateKnownRuntimePackWithCustomRuntime"
 			Condition="'$(TRACKING_DOTNET_RUNTIME_SEPARATELY)' != ''"
 			BeforeTargets="ProcessFrameworkReferences">
 		<ItemGroup>
-				<KnownRuntimePack Update="Microsoft.NETCore.App">
-					<LatestRuntimeFrameworkVersion>$(MicrosoftNETCoreAppRefPackageVersion)</LatestRuntimeFrameworkVersion>
+			<KnownFrameworkReference Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net$(BundledNETCoreAppTargetFrameworkVersion)'">
+				<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppRefPackageVersion)</RuntimeFrameworkVersion>
+			</KnownFrameworkReference>
+			<KnownRuntimePack Update="Microsoft.NETCore.App"  Condition="'%(TargetFramework)' == 'net$(BundledNETCoreAppTargetFrameworkVersion)'">
+				<LatestRuntimeFrameworkVersion>$(MicrosoftNETCoreAppRefPackageVersion)</LatestRuntimeFrameworkVersion>
 			</KnownRuntimePack>
 		</ItemGroup>
 	</Target>
diff --git a/tests/dotnet/MySimpleApp/Directory.Build.props b/tests/dotnet/MySimpleApp/Directory.Build.props
new file mode 100644
index 0000000000..f35c2a50a9
--- /dev/null
+++ b/tests/dotnet/MySimpleApp/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup Condition="'$(SetAppendRuntimeIdentifierToOutputPathToFalse)' == 'true'">
+		<!-- Used by the AppendRuntimeIdentifierToOutputPath_* tests -->
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+	</PropertyGroup>
+	<Import Project="$(MSBuildThisFileDirectory)../../../Directory.Build.props" />
+</Project>
diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index c2f4318cd7..cd4001996a 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -1984,5 +1984,37 @@ namespace Xamarin.Tests {
 				ExecuteWithMagicWordAndAssert (appExecutable);
 			}
 		}
+
+		[Test]
+		[TestCase (ApplePlatform.MacOSX, "osx-arm64;osx-x64")]
+		[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64;maccatalyst-x64")]
+		public void AppendRuntimeIdentifierToOutputPath_DisableCommandLine (ApplePlatform platform, string runtimeIdentifiers)
+		{
+			var project = "MySimpleApp";
+			Configuration.IgnoreIfIgnoredPlatform (platform);
+			Configuration.AssertRuntimeIdentifiersAvailable (platform, runtimeIdentifiers);
+
+			var project_path = GetProjectPath (project, runtimeIdentifiers: runtimeIdentifiers, platform: platform, out var appPath);
+			Clean (project_path);
+			var properties = GetDefaultProperties (runtimeIdentifiers);
+			properties ["cmdline:AppendRuntimeIdentifierToOutputPath"] = "false";
+			DotNet.AssertBuild (project_path, properties);
+		}
+
+		[Test]
+		[TestCase (ApplePlatform.MacOSX, "osx-arm64;osx-x64")]
+		[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64;maccatalyst-x64")]
+		public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (ApplePlatform platform, string runtimeIdentifiers)
+		{
+			var project = "MySimpleApp";
+			Configuration.IgnoreIfIgnoredPlatform (platform);
+			Configuration.AssertRuntimeIdentifiersAvailable (platform, runtimeIdentifiers);
+
+			var project_path = GetProjectPath (project, runtimeIdentifiers: runtimeIdentifiers, platform: platform, out var appPath);
+			Clean (project_path);
+			var properties = GetDefaultProperties (runtimeIdentifiers);
+			properties ["SetAppendRuntimeIdentifierToOutputPathToFalse"] = "true";
+			DotNet.AssertBuild (project_path, properties);
+		}
 	}
 }
diff --git a/tests/dotnet/Windows/InstallDotNet.csproj b/tests/dotnet/Windows/InstallDotNet.csproj
index 78bc126d48..2f208f0f27 100644
--- a/tests/dotnet/Windows/InstallDotNet.csproj
+++ b/tests/dotnet/Windows/InstallDotNet.csproj
@@ -54,8 +54,6 @@
     </Task>
   </UsingTask>
 
-  <Import Project="$(RootSourceDirectory)/eng/Versions.props" />
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
diff --git a/tests/test-libraries/nugets/FrameworksInRuntimesNativeDirectory/FrameworksInRuntimesNativeDirectory.csproj b/tests/test-libraries/nugets/FrameworksInRuntimesNativeDirectory/FrameworksInRuntimesNativeDirectory.csproj
index e6a6de9c6e..48a7b1b683 100644
--- a/tests/test-libraries/nugets/FrameworksInRuntimesNativeDirectory/FrameworksInRuntimesNativeDirectory.csproj
+++ b/tests/test-libraries/nugets/FrameworksInRuntimesNativeDirectory/FrameworksInRuntimesNativeDirectory.csproj
@@ -12,7 +12,6 @@
     <TestFrameworksDirectory>$(RootTestDirectory)/test-libraries/frameworks</TestFrameworksDirectory>
   </PropertyGroup>
 
-  <Import Project="..\..\..\..\eng\Versions.props" />
   <!-- Code to automatically create FrameworkList.xml or RuntimeList.xml -->
 
   <ItemGroup>
diff --git a/tests/test-libraries/nugets/XCFrameworkWithStaticLibraryInRuntimesNativeDirectory/XCFrameworkWithStaticLibraryInRuntimesNativeDirectory.csproj b/tests/test-libraries/nugets/XCFrameworkWithStaticLibraryInRuntimesNativeDirectory/XCFrameworkWithStaticLibraryInRuntimesNativeDirectory.csproj
index e170001bdd..8171afed83 100644
--- a/tests/test-libraries/nugets/XCFrameworkWithStaticLibraryInRuntimesNativeDirectory/XCFrameworkWithStaticLibraryInRuntimesNativeDirectory.csproj
+++ b/tests/test-libraries/nugets/XCFrameworkWithStaticLibraryInRuntimesNativeDirectory/XCFrameworkWithStaticLibraryInRuntimesNativeDirectory.csproj
@@ -12,7 +12,6 @@
     <TestFrameworksDirectory>$(RootTestDirectory)/test-libraries</TestFrameworksDirectory>
   </PropertyGroup>
 
-  <Import Project="..\..\..\..\eng\Versions.props" />
   <!-- Code to automatically create FrameworkList.xml or RuntimeList.xml -->
 
   <ItemGroup>
diff --git a/tests/xharness/Xharness.Tests/Xharness.Tests.csproj b/tests/xharness/Xharness.Tests/Xharness.Tests.csproj
index 6477284ac1..cba5528d90 100644
--- a/tests/xharness/Xharness.Tests/Xharness.Tests.csproj
+++ b/tests/xharness/Xharness.Tests/Xharness.Tests.csproj
@@ -52,7 +52,6 @@
     <EmbeddedResource Include="Samples\NUnitV3SampleSuccess.xml" />
     <EmbeddedResource Include="Samples\NUnitV3SampleFailure.xml" />
   </ItemGroup>
-  <Import Project="../../../eng/Versions.props" />
   <ItemGroup>
     <ProjectReference Include="..\xharness.csproj">
       <Project>{e1f53f80-8399-499b-8017-c414b9cd263b}</Project>
diff --git a/tests/xharness/xharness.csproj b/tests/xharness/xharness.csproj
index 404b9173cc..6d30a585e1 100644
--- a/tests/xharness/xharness.csproj
+++ b/tests/xharness/xharness.csproj
@@ -35,7 +35,6 @@
     <StartAction>Project</StartAction>
     <StartArguments>--configure --autoconf --rootdir ../../../..</StartArguments>
   </PropertyGroup>
-  <Import Project="../../eng/Versions.props" />
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.XHarness.iOS.Shared" Version="$(MicrosoftDotNetXHarnessiOSSharedPackageVersion)" />
     <PackageReference Include="Mono.Cecil" Version="$(MonoCecilPackageVersion)" />
diff --git a/tests/xtro-sharpie/Makefile b/tests/xtro-sharpie/Makefile
index 28c5f2a3ed..349cddf6b0 100644
--- a/tests/xtro-sharpie/Makefile
+++ b/tests/xtro-sharpie/Makefile
@@ -313,7 +313,7 @@ remove-empty-files:
 
 U2TODO = u2todo/bin/Debug/u2todo.dll
 $(U2TODO): $(wildcard u2todo/*.cs u2todo/*.csproj xtro-sharpie/Filter.cs)
-	$(Q) unset MSBUILD_EXE_PATH && $(DOTNET) build $(DOTNET_BUILD_VERBOSITY) u2todo/u2todo.csproj /bl:$@.binlog
+	$(Q) unset MSBUILD_EXE_PATH && $(DOTNET) build u2todo/u2todo.csproj $(DOTNET_BUILD_VERBOSITY) /bl:$@.binlog
 	$(Q) touch $@
 
 unclassified2todo-classic: $(U2TODO)
diff --git a/tests/xtro-sharpie/xtro-sharpie/xtro-sharpie.csproj b/tests/xtro-sharpie/xtro-sharpie/xtro-sharpie.csproj
index 8f78421a30..d6105ef85f 100644
--- a/tests/xtro-sharpie/xtro-sharpie/xtro-sharpie.csproj
+++ b/tests/xtro-sharpie/xtro-sharpie/xtro-sharpie.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="../../../eng/Versions.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>