diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ce102f3f63e097..b161f32faf492d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.23611.1", + "version": "9.0.0-prerelease.24066.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cef0e251bb632..c4af0ef4940ddf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 https://github.com/dotnet/runtime-assets @@ -321,21 +321,21 @@ https://github.com/dotnet/runtime 6f9d6569684cc17015aa6fc5f9d9a5f7580ade97 - + https://github.com/dotnet/xharness - a855ee8bf3e90a5baef9de25ccff5be597390087 + fa3b643cc0b028ae875546b7527927adcfcd9348 - + https://github.com/dotnet/xharness - a855ee8bf3e90a5baef9de25ccff5be597390087 + fa3b643cc0b028ae875546b7527927adcfcd9348 - + https://github.com/dotnet/xharness - a855ee8bf3e90a5baef9de25ccff5be597390087 + fa3b643cc0b028ae875546b7527927adcfcd9348 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + abddd0bd5145578246dcadda264c7557f2a935a9 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 9ababb1f455110..c19121336f3b19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,24 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 2.5.3-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 2.6.7-beta.24069.2 + 9.0.0-beta.24069.2 + 2.6.7-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + 9.0.0-beta.24069.2 + + 1.4.0 6.0.0-preview.1.102 @@ -179,9 +181,9 @@ 1.4.0 17.4.0-preview-20220707-01 - 9.0.0-prerelease.23611.1 - 9.0.0-prerelease.23611.1 - 9.0.0-prerelease.23611.1 + 9.0.0-prerelease.24066.3 + 9.0.0-prerelease.24066.3 + 9.0.0-prerelease.24066.3 9.0.0-alpha.0.24065.1 3.12.0 4.1.0 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9b2791cf568aae..9fa764e78b0434 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -8,7 +8,7 @@ usage() echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" echo " for alpine can be specified with version: alpineX.YY or alpineedge" - echo " for FreeBSD can be: freebsd12, freebsd13" + echo " for FreeBSD can be: freebsd13, freebsd14" echo " for illumos can be: illumos" echo " for Haiku can be: haiku." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" @@ -71,9 +71,9 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="12.4-RELEASE" -__FreeBSDPkg="1.17.0" -__FreeBSDABI="12" +__FreeBSDBase="13.2-RELEASE" +__FreeBSDPkg="1.20.0" +__FreeBSDABI="13" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" @@ -334,14 +334,14 @@ while :; do __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" fi ;; - freebsd12) + freebsd13) __CodeName=freebsd __SkipUnmount=1 ;; - freebsd13) + freebsd14) __CodeName=freebsd - __FreeBSDBase="13.2-RELEASE" - __FreeBSDABI="13" + __FreeBSDBase="14.0-RELEASE" + __FreeBSDABI="14" __SkipUnmount=1 ;; illumos) diff --git a/eng/testing/xunit/xunit.props b/eng/testing/xunit/xunit.props index 64286ff55ea100..457c4f402bf78b 100644 --- a/eng/testing/xunit/xunit.props +++ b/eng/testing/xunit/xunit.props @@ -6,12 +6,15 @@ - - - - + + + + + + + + + true + + + + + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj index 9e332f12609925..a07418861d50d8 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj @@ -67,7 +67,6 @@ - \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs b/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs index a7ffda68b113aa..8a7acf0800596e 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs @@ -1211,9 +1211,9 @@ public static void DCS_JaggedArrayAsRoot() string[][] jaggedStringArray = new string[][] { new string[] { "1", "3", "5", "7", "9" }, new string[] { "0", "2", "4", "6" }, new string[] { "11", "22" } }; var actualJaggedStringArray = DataContractSerializerHelper.SerializeAndDeserialize(jaggedStringArray, @"1357902461122"); - Assert.Equal(jaggedStringArray[0], actualJaggedStringArray[0]); - Assert.Equal(jaggedStringArray[1], actualJaggedStringArray[1]); - Assert.Equal(jaggedStringArray[2], actualJaggedStringArray[2]); + Assert.Equal(jaggedStringArray[0], actualJaggedStringArray[0]); + Assert.Equal(jaggedStringArray[1], actualJaggedStringArray[1]); + Assert.Equal(jaggedStringArray[2], actualJaggedStringArray[2]); object[] objectArray = new object[] { 1, 1.0F, 1.0, "string", Guid.Parse("2054fd3e-e118-476a-9962-1a882be51860"), new DateTime(2013, 1, 2) }; var actualObjectArray = DataContractSerializerHelper.SerializeAndDeserialize(objectArray, @"111string2054fd3e-e118-476a-9962-1a882be518602013-01-02T00:00:00"); diff --git a/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs index 75c76c34c69615..ffbae381f5ad97 100644 --- a/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs +++ b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs @@ -801,7 +801,9 @@ public static void TryCatchFinally() } Assert.True(threwException); - Assert.Equal(new int?[] { null, null, null }, result); + int?[] resultIntegers = result; + // Assert.Equal doesn't allow to build collections with nulls in anymore. Use Assert.Collection instead. + Assert.Collection(resultIntegers, (a) => Assert.Null(a), (b) => Assert.Null(b), (c) => Assert.Null(c)); Assert.Equal(1, MemberClass.t_status); } } diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/AppDomainTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/AppDomainTests.cs index f473d1dec82762..1ef1c6557a749d 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/AppDomainTests.cs +++ b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/AppDomainTests.cs @@ -512,9 +512,14 @@ public void AssemblyLoad() { RemoteExecutor.Invoke(() => { bool AssemblyLoadFlag = false; + bool isMono = PlatformDetection.IsMonoRuntime; AssemblyLoadEventHandler handler = (sender, args) => { - Assert.Equal(AppDomain.CurrentDomain, sender); + if (isMono) + Assert.True(AppDomain.CurrentDomain == sender); + else + Assert.Equal(AppDomain.CurrentDomain, sender); + Assert.NotNull(args); Assert.NotNull(args.LoadedAssembly); diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeTests.Get.CornerCases.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeTests.Get.CornerCases.cs index 67c99cce94312e..5adab84fcc60e4 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeTests.Get.CornerCases.cs +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/TypeTests.Get.CornerCases.cs @@ -244,7 +244,7 @@ public static void GetPropertyHidesPropertiesByNameAndSigAndCallingConventionCom names.Sort(); string[] expected = { "Item", nameof(Base.MyInstanceThenStaticProp), nameof(Base.MyStaticThenInstanceProp), nameof(Base.MyStringThenDoubleProp) }; - Assert.Equal(expected, names.ToArray()); + Assert.Equal(expected, names.ToArray()); } private abstract class Base diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringComparerTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringComparerTests.cs index 3027c870855b5d..35514e9c381fac 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringComparerTests.cs +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringComparerTests.cs @@ -68,10 +68,10 @@ public void Compare_ViaSort_SortsAsExpected() string[] strings = new[] { "a", "b", "AB", "A", "cde", "abc", "f", "123", "ab" }; Array.Sort(strings, StringComparer.OrdinalIgnoreCase); - Assert.Equal(strings, new[] { "123", "a", "A", "AB", "ab", "abc", "b", "cde", "f" }); + Assert.Equal(strings, new[] { "123", "a", "A", "AB", "ab", "abc", "b", "cde", "f" }); Array.Sort(strings, StringComparer.Ordinal); - Assert.Equal(strings, new[] { "123", "A", "AB", "a", "ab", "abc", "b", "cde", "f" }); + Assert.Equal(strings, new[] { "123", "A", "AB", "a", "ab", "abc", "b", "cde", "f" }); } [Fact] diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs b/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs index a9d532d6722f5f..2d4c1b8ac21931 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs +++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs @@ -132,7 +132,7 @@ private static void VerifyRecipients3(byte[] encodedMessage) col.CopyTo(recipients, 0); string[] actualIssuers = recipients.Select(r => r.RecipientIdentifier.Value).Cast().Select(xis => xis.IssuerName).OrderBy(s => s).ToArray(); - Assert.Equal(expectedIssuers, actualIssuers); + Assert.Equal(expectedIssuers, actualIssuers); } [Fact] diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/CustomConverterTests/CustomConverterTests.Dynamic.Sample.Tests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/CustomConverterTests/CustomConverterTests.Dynamic.Sample.Tests.cs index 3e0f7c2de9b758..69c53e91e37d37 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/CustomConverterTests/CustomConverterTests.Dynamic.Sample.Tests.cs +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/CustomConverterTests/CustomConverterTests.Dynamic.Sample.Tests.cs @@ -314,7 +314,7 @@ public static void DynamicObject_MissingProperty() dynamic obj = JsonSerializer.Deserialize("{}", options); // We return null here; ExpandoObject throws for missing properties. - Assert.Equal(null, obj.NonExistingProperty); + Assert.Null(obj.NonExistingProperty); } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsReflectionEmitSupported))] diff --git a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/PrecompiledRegexScenarioTest.cs b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/PrecompiledRegexScenarioTest.cs index a22c493303b632..264abb8ef567d0 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/PrecompiledRegexScenarioTest.cs +++ b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/PrecompiledRegexScenarioTest.cs @@ -70,8 +70,8 @@ public void PrecompiledRegex_SplitTest() { RegexTestClass testClass = new RegexTestClass(); - Assert.Equal(["", "4", "success", "\n", "5", "success", "\n", "6", "success", "\n", "7", "success", ""], testClass.Split(textWithMultipleMatches)); - Assert.Equal(["", "4", "success", $"\nbsdf135success1245somethingelse{Environment.NewLine}csdf136success2245somethingnew{Environment.NewLine}dsdf137success3245somethingold"], testClass.Split(textWithMultipleMatches, 2)); + Assert.Equal(["", "4", "success", "\n", "5", "success", "\n", "6", "success", "\n", "7", "success", ""], testClass.Split(textWithMultipleMatches)); + Assert.Equal(["", "4", "success", $"\nbsdf135success1245somethingelse{Environment.NewLine}csdf136success2245somethingnew{Environment.NewLine}dsdf137success3245somethingold"], testClass.Split(textWithMultipleMatches, 2)); } [Fact] @@ -97,8 +97,8 @@ public void PrecompiledRegex_Groups() RegexTestClass testClass = new RegexTestClass(); Assert.Equal(text, testClass.Match(text).Groups[0].Value); - Assert.Equal([0, 1, 2], testClass.GetGroupNumbers()); - Assert.Equal(["0", "1", "output"], testClass.GetGroupNames()); + Assert.Equal(new int[] { 0, 1, 2 }, testClass.GetGroupNumbers()); + Assert.Equal(["0", "1", "output"], testClass.GetGroupNames()); } } } diff --git a/src/mono/wasm/symbolicator/WasmSymbolicator.csproj b/src/mono/wasm/symbolicator/WasmSymbolicator.csproj index 7b715fc9e3fbdf..6d290842a3080e 100644 --- a/src/mono/wasm/symbolicator/WasmSymbolicator.csproj +++ b/src/mono/wasm/symbolicator/WasmSymbolicator.csproj @@ -9,7 +9,9 @@ + +