Merge branch 'main' into xcode13.0-accessibility-b1

xamarin · Jun 24, 2021 · 6ee7efb · 6ee7efb
2 parents 0f5b82c + 4914136
commit 6ee7efb
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 8 deletions.
diff --git a/src/uniformtypeidentifiers.cs b/src/uniformtypeidentifiers.cs
@@ -275,6 +275,10 @@ interface UTTypes {
 		[Field ("UTTypePHPScript")]
 		UTType PhpScript { get; }
 
+		[Watch (8,0), TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
+		[Field ("UTTypeMakefile")]
+		UTType Makefile { get; }
+
 		[Field ("UTTypeJSON")]
 		UTType Json { get; }
 

diff --git a/tests/common/ExecutionHelper.cs b/tests/common/ExecutionHelper.cs
@@ -78,7 +78,7 @@ public static int Execute (string fileName, IList<string> arguments, out bool ti
 			var rv = Execution.RunWithStringBuildersAsync (fileName, arguments, workingDirectory: workingDirectory, environment: environment_variables, standardOutput: stdout, standardError: stderr, timeout: timeout).Result;
 			timed_out = rv.TimedOut;
 			if (rv.TimedOut)
-				Console.WriteLine ($"Command '{fileName} {StringUtils.FormatArguments (arguments)}' didn't finish in {timeout.Value.TotalMilliseconds} minutes, and was killed.", timeout.Value.TotalMinutes);
+				Console.WriteLine ($"Command '{fileName} {StringUtils.FormatArguments (arguments)}' didn't finish in {timeout.Value.TotalMilliseconds} ms, and was killed.", timeout.Value.TotalMinutes);
 			return rv.ExitCode;
 		}
 
@@ -92,7 +92,7 @@ public static int Execute (string fileName, IList<string> arguments, out bool ti
 			var rv = Execution.RunWithCallbacksAsync (fileName, arguments, workingDirectory: workingDirectory, environment: environment_variables, standardOutput: stdout_callback, standardError: stderr_callback, timeout: timeout).Result;
 			timed_out = rv.TimedOut;
 			if (rv.TimedOut)
-				Console.WriteLine ($"Command '{fileName} {StringUtils.FormatArguments (arguments)}' didn't finish in {timeout.Value.TotalMilliseconds} minutes, and was killed.", timeout.Value.TotalMinutes);
+				Console.WriteLine ($"Command '{fileName} {StringUtils.FormatArguments (arguments)}' didn't finish in {timeout.Value.TotalMilliseconds} ms, and was killed.", timeout.Value.TotalMinutes);
 			return rv.ExitCode;
 		}
 

diff --git a/tests/xtro-sharpie/MacCatalyst-UniformTypeIdentifiers.todo b/tests/xtro-sharpie/MacCatalyst-UniformTypeIdentifiers.todo
diff --git a/tests/xtro-sharpie/iOS-UniformTypeIdentifiers.todo b/tests/xtro-sharpie/iOS-UniformTypeIdentifiers.todo
diff --git a/tests/xtro-sharpie/macOS-UniformTypeIdentifiers.todo b/tests/xtro-sharpie/macOS-UniformTypeIdentifiers.todo
diff --git a/tests/xtro-sharpie/tvOS-UniformTypeIdentifiers.todo b/tests/xtro-sharpie/tvOS-UniformTypeIdentifiers.todo
diff --git a/tests/xtro-sharpie/watchOS-UniformTypeIdentifiers.todo b/tests/xtro-sharpie/watchOS-UniformTypeIdentifiers.todo
diff --git a/tools/common/Execution.cs b/tools/common/Execution.cs
@@ -118,7 +118,7 @@ public Task<Execution> RunAsync ()
 
 						if (Timeout.HasValue) {
 							if (!p.WaitForExit ((int) Timeout.Value.TotalMilliseconds)) {
-								Log?.WriteLine ($"Command '{p.StartInfo.FileName} {p.StartInfo.Arguments}' didn't finish in {Timeout.Value.TotalMilliseconds} minutes, and will be killed.");
+								Log?.WriteLine ($"Command '{p.StartInfo.FileName} {p.StartInfo.Arguments}' didn't finish in {Timeout.Value.TotalMilliseconds} ms, and will be killed.");
 								TimedOut = true;
 								try {
 									p.Kill ();