diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b646efb5af06..fe4398f9cae6 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.26279.113 - 11.0.0-beta.26279.113 - 0.11.5-preview.26279.113 - 11.0.0-beta.26279.113 - 11.0.0-preview.5.26279.113 - 11.0.0-preview.5.26279.113 - 11.0.0-preview.5.26279.113 - 11.0.100-preview.5.26279.113 - 11.0.0-preview.5.26279.113 - 11.0.100-preview.5.26279.113 + 11.0.0-beta.26305.118 + 11.0.0-beta.26305.118 + 0.11.5-preview.26305.118 + 11.0.0-beta.26305.118 + 11.0.0-preview.5.26305.118 + 11.0.0-preview.5.26305.118 + 11.0.0-preview.5.26305.118 + 11.0.100-preview.5.26305.118 + 11.0.0-preview.5.26305.118 + 11.0.100-preview.5.26305.118 26.0.11017 26.5.10288 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ad840c629f2..4e9a44cdb464 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 @@ -61,25 +61,25 @@ - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 https://github.com/dotnet/xharness 866707736d49c2323628744716cda2475b3af9ee - + https://github.com/dotnet/dotnet - ace1806cedfe74b1a8ef14f086bf024e380e0483 + 335ad8bfd7164172977b98ce3e7c1e911aa495e4 diff --git a/global.json b/global.json index 2c3cd3980e31..caec930efc40 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-preview.5.26279.113", + "version": "11.0.100-preview.5.26305.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.5.26279.113" + "dotnet": "11.0.100-preview.5.26305.118" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26279.113" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26305.118" } } diff --git a/tests/linker/link sdk/LinkSdkRegressionTest.cs b/tests/linker/link sdk/LinkSdkRegressionTest.cs index f3ce13c3f0ff..46e8cbd9eb99 100644 --- a/tests/linker/link sdk/LinkSdkRegressionTest.cs +++ b/tests/linker/link sdk/LinkSdkRegressionTest.cs @@ -955,14 +955,14 @@ static void CheckILLinkStubbedMethod (MethodInfo? m) var reader = new ILReader (m); var il = reader.ToArray (); var actualIL = string.Join ("\n", il.Select (v => v.ToString ().Trim ())); - var releaseRet = "IL_0000 ret"; - var releaseThrow = "IL_0000 ldnull\nIL_0001 throw"; + var releaseRet = "IL_0000 ret"; // only release #if DEBUG // means some stuff in addition to the `ret` instruction - Assert.That (actualIL, Is.Not.EqualTo (releaseRet).And.Not.EqualTo (releaseThrow), $"debug il"); + Assert.That (actualIL, Is.Not.EqualTo (releaseRet), $"debug il"); #else // empty means a `ret` instruction (and that's true even if IL is stripped) - Assert.That (actualIL, Is.EqualTo (releaseRet).Or.EqualTo (releaseThrow), $"release il"); + var trimmedBody = "IL_0000 ldnull\nIL_0001 throw"; // this can happen for both release and debug + Assert.That (actualIL, Is.EqualTo (releaseRet).Or.EqualTo (trimmedBody), $"release il"); #endif }