diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9c0d8f07d2c4..a345502ac12f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -78,9 +78,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.24509.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.24511.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>973ef6c89b67f2f746f62c413e3aeeb01a9034a3</Sha>
+      <Sha>8c6d5afd99c713777165f4378462085a5679c223</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index e186c008dee2..e56d65115684 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,7 +12,7 @@
     <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
     <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24467.1</MicrosoftDotNetCecilPackageVersion>
-    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24509.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
+    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24511.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
     <!-- Manually updated versions -->
     <Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
     <EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</EmscriptenWorkloadVersion>
diff --git a/tests/Makefile b/tests/Makefile
index f13e4860ebe9..9f9a6d770f63 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -240,14 +240,6 @@ else
 	@echo Not enabled
 endif
 
-ifdef INCLUDE_DOTNET
-dotnet-test-package.7z:
-	./package-dotnet-tests.sh
-else
-dotnet-test-package.7z:
-	@echo Not enabled
-endif
-
 #XI
 ifdef INCLUDE_IOS
 wrench-mtouch:
diff --git a/tests/common/DotNet.cs b/tests/common/DotNet.cs
index 15be67b95b77..0f1f37d81b55 100644
--- a/tests/common/DotNet.cs
+++ b/tests/common/DotNet.cs
@@ -270,7 +270,11 @@ public static ExecutionResult Execute (string verb, string project, Dictionary<s
 					Console.WriteLine (outputStr);
 					if (rv.ExitCode != 0) {
 						var msg = new StringBuilder ();
-						msg.AppendLine ($"'dotnet {verb}' failed with exit code {rv.ExitCode}");
+						if (rv.TimedOut) {
+							msg.AppendLine ($"'dotnet {verb}' timed out after {timeout}");
+						} else {
+							msg.AppendLine ($"'dotnet {verb}' failed with exit code {rv.ExitCode}");
+						}
 						msg.AppendLine ($"Full command: {Executable} {StringUtils.FormatArguments (args)}");
 #if !MSBUILD_TASKS
 						try {
diff --git a/tests/dotnet/Windows/InstallDotNet.csproj b/tests/dotnet/Windows/InstallDotNet.csproj
index 2f208f0f270d..3fdd23ec26eb 100644
--- a/tests/dotnet/Windows/InstallDotNet.csproj
+++ b/tests/dotnet/Windows/InstallDotNet.csproj
@@ -171,6 +171,7 @@
         Command="&quot;$(DotNetToolPath)&quot; workload install %(_WorkloadIds.Identity) --skip-manifest-update --verbosity diag --temp-dir &quot;$(DotNetTempDirectory)&quot; --configfile &quot;$(MacIosRootDirectory)NuGet.config&quot; --skip-sign-check"
         WorkingDirectory="$(MSBuildThisFileDirectory)"
         EnvironmentVariables="DOTNET_MULTILEVEL_LOOKUP=0"
+        IgnoreStandardErrorWarningFormat="true"
     />
     <Touch Files="$(DotNetPacksDirectory).stamp" AlwaysCreate="true" />
   </Target>
diff --git a/tests/package-dotnet-tests.sh b/tests/package-dotnet-tests.sh
deleted file mode 100755
index b22146d9a783..000000000000
--- a/tests/package-dotnet-tests.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash -ex
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-# Clone files instead of copying them on APFS file systems. Much faster.
-CP="cp"
-if df -t apfs / >/dev/null 2>&1; then
-	CP="cp -c"
-fi
-
-#git clean -xfdq
-
-rm -Rf "$(pwd)/dotnet-test-package"
-DIR=$(pwd)/dotnet-test-package/xamarin-macios
-ZIP=$DIR.7z
-mkdir -p $DIR
-mkdir -p $DIR/tests/dotnet/UnitTests/bin/Debug/net5.0/
-mkdir -p $DIR/.git
-
-make -j8
-make -C dotnet/UnitTests publish
-
-$CP -r dotnet $DIR/tests/
-rm -Rf $DIR/tests/dotnet/packages
-
-# Various files to make 'make' work
-$CP -p ../Make.config $DIR
-$CP -p ../Make.versions $DIR
-$CP -p ../Make.config $DIR
-mkdir -p $DIR/mk
-$CP -p ../Make.config $DIR
-$CP -p ../mk/subdirs.mk $DIR/mk
-$CP -p ../mk/rules.mk $DIR/mk
-$CP -p ../mk/quiet.mk $DIR/mk
-$CP -p ../mk/mono.mk "$DIR/mk"
-
-# Files to make the unit tests run
-$CP -p ../global.json $DIR
-$CP -p ../NuGet.config $DIR
-$CP -p test.config $DIR/tests
-
-# Zip it all up
-rm -f dotnet-test-package.7z
-cd dotnet-test-package
-7z a ../dotnet-test-package.7z *
diff --git a/tools/compare-commits.sh b/tools/compare-commits.sh
index ab9b7c6c337d..71b34510ba0c 100755
--- a/tools/compare-commits.sh
+++ b/tools/compare-commits.sh
@@ -221,10 +221,10 @@ mkdir -p "$(dirname "$GH_COMMENTS_FILE")"
 
 if test -z "$SKIP_DIRTY_CHECK"; then
 	if [ -n "$(git status --porcelain --ignore-submodule)" ]; then
-		report_error_line "${RED}** Error: Working directory isn't clean:${CLEAR}"
+		report_error_line "${RED}** Error: Working directory isn't clean - check build log for more information.${CLEAR}"
 		# The funny GIT_COLOR_P syntax is explained here: https://stackoverflow.com/a/61551944/183422
-		git ${GIT_COLOR_P[@]+"${GIT_COLOR_P[@]}"} status --ignore-submodules | sed 's/^/    /' | while read -r line; do report_error_line "$line"; done || true
-		git ${GIT_COLOR_P[@]+"${GIT_COLOR_P[@]}"} diff --ignore-submodules | sed 's/^/    /' | while read -r line; do report_error_line "$line"; done || true
+		git ${GIT_COLOR_P[@]+"${GIT_COLOR_P[@]}"} status --ignore-submodules | sed 's/^/    /' || true
+		git ${GIT_COLOR_P[@]+"${GIT_COLOR_P[@]}"} diff --ignore-submodules | sed 's/^/    /' || true
 		exit 1
 	fi
 fi
diff --git a/tools/devops/automation/templates/main-stage.yml b/tools/devops/automation/templates/main-stage.yml
index f8b10cb71838..9a53e3f0e5de 100644
--- a/tools/devops/automation/templates/main-stage.yml
+++ b/tools/devops/automation/templates/main-stage.yml
@@ -186,14 +186,6 @@ parameters:
 
 stages:
 
-  - ${{ if eq(parameters.runGovernanceTests, true) }}:
-      - template: ./governance/stage.yml
-        parameters:
-          isPR: ${{ parameters.isPR }}
-          repositoryAlias: ${{ parameters.repositoryAlias }}
-          commit: ${{ parameters.commit }}
-          stageDisplayNamePrefix: ${{ parameters.stageDisplayNamePrefix }}
-
   - stage: configure_build
     displayName: '${{ parameters.stageDisplayNamePrefix }}Configure'
     dependsOn: ${{ parameters.dependsOn }}
diff --git a/tools/devops/automation/templates/windows/reserve-mac.yml b/tools/devops/automation/templates/windows/reserve-mac.yml
index 8298a73c0da2..83ab5a98fb4a 100644
--- a/tools/devops/automation/templates/windows/reserve-mac.yml
+++ b/tools/devops/automation/templates/windows/reserve-mac.yml
@@ -33,7 +33,7 @@ steps:
 - checkout: maccore
   persistCredentials: true  # hugely important, else there are some scripts that check a single file from maccore that will fail
 
-- pwsh: '"$Env:SYSTEM_DEFAULTWORKINGDIRECTORY/$($Env:BUILD_REPOSITORY_NAME.Split(''/'')[1])/tools/devops/automation/scripts/show_bot_info.ps1"'
+- pwsh: '& "$Env:SYSTEM_DEFAULTWORKINGDIRECTORY/$($Env:BUILD_REPOSITORY_NAME.Split(''/'')[1])/tools/devops/automation/scripts/show_bot_info.ps1"'
   displayName: 'Show Bot Info'
 
 - bash: '$SYSTEM_DEFAULTWORKINGDIRECTORY/${BUILD_REPOSITORY_NAME/#*\//}/tools/devops/automation/scripts/bash/clean-bot.sh'