Merge branch 'main' into dev/mandel/bgen-ignore-rgen-types

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>

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>

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:

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 {

tests/dotnet/Windows/InstallDotNet.csproj

@@ -171,6 +171,7 @@
         Command=""$(DotNetToolPath)" workload install %(_WorkloadIds.Identity) --skip-manifest-update --verbosity diag --temp-dir "$(DotNetTempDirectory)" --configfile "$(MacIosRootDirectory)NuGet.config" --skip-sign-check"
         WorkingDirectory="$(MSBuildThisFileDirectory)"
         EnvironmentVariables="DOTNET_MULTILEVEL_LOOKUP=0"
+        IgnoreStandardErrorWarningFormat="true"
     />
     <Touch Files="$(DotNetPacksDirectory).stamp" AlwaysCreate="true" />
   </Target>

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

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 }}

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'