diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 64f934ee1488..358ed489df35 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 0.11.5-preview.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-preview.6.26322.110 - 11.0.0-preview.6.26322.110 - 11.0.0-preview.6.26322.110 - 11.0.100-preview.6.26322.110 - 11.0.0-preview.6.26322.110 - 11.0.100-preview.6.26322.110 + 11.0.0-beta.26357.118 + 11.0.0-beta.26357.118 + 0.11.5-preview.26357.118 + 11.0.0-beta.26357.118 + 11.0.0-preview.6.26357.118 + 11.0.0-preview.6.26357.118 + 11.0.0-preview.6.26357.118 + 11.0.100-preview.6.26357.118 + 11.0.0-preview.6.26357.118 + 11.0.100-preview.6.26357.118 26.0.11017 26.5.10301 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cd0607d3789..196dea54a1ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f @@ -61,25 +61,25 @@ - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f https://github.com/dotnet/xharness 866707736d49c2323628744716cda2475b3af9ee - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 2461daa1d76b420ad12e4ebd73e64a4421cc365f diff --git a/global.json b/global.json index 6f0c06c2bdfc..fd47d681c1d9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-preview.6.26322.110", + "version": "11.0.100-preview.6.26357.118", "paths": [ "builds/downloads/dotnet", "$host$" @@ -8,9 +8,9 @@ "errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'." }, "tools": { - "dotnet": "11.0.100-preview.6.26322.110" + "dotnet": "11.0.100-preview.6.26357.118" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26322.110" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26357.118" } } diff --git a/tests/common/DotNet.cs b/tests/common/DotNet.cs index 926f4d86f2d0..150f29691b5b 100644 --- a/tests/common/DotNet.cs +++ b/tests/common/DotNet.cs @@ -73,7 +73,12 @@ static void IgnoreIfUnsupportedMonoRuntime (Dictionary? properti return; if (!properties.TryGetValue ("UseMonoRuntime", out var useMonoRuntime)) return; - if (!string.Equals (useMonoRuntime, "true", StringComparison.OrdinalIgnoreCase)) + IgnoreIfUnsupportedMonoRuntime (string.Equals (useMonoRuntime, "true", StringComparison.OrdinalIgnoreCase)); + } + + public static void IgnoreIfUnsupportedMonoRuntime (bool useMonoRuntime) + { + if (!useMonoRuntime) return; if (Configuration.dotnet_monovm_supported) return; diff --git a/tests/dotnet/UnitTests/DotNetWatchTest.cs b/tests/dotnet/UnitTests/DotNetWatchTest.cs index f4d9eb1de2a2..b86e4a88d979 100644 --- a/tests/dotnet/UnitTests/DotNetWatchTest.cs +++ b/tests/dotnet/UnitTests/DotNetWatchTest.cs @@ -140,6 +140,8 @@ static partial void ChangeVariable () { "RunWithOpen", "false" }, // this makes it so that the watched process is a subprocess, which means that ctrl-c in the terminal will kill everything. It also means that it'll get killed if something times out in the test. }; + DotNet.IgnoreIfUnsupportedMonoRuntime (useMonoRuntime); + var watchTask = Execution.RunWithCallbacksAsync ( DotNet.Executable, args,