diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 8b7f0b66f484..77cf2a04eaef 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.25616.107 - 11.0.0-beta.25616.107 - 0.11.5-alpha.25616.107 - 11.0.0-beta.25616.107 - 11.0.0-alpha.1.25616.107 - 11.0.0-alpha.1.25616.107 - 11.0.0-alpha.1.25616.107 - 11.0.100-alpha.1.25616.107 - 11.0.0-alpha.1.25616.107 - 11.0.100-alpha.25616.107 + 11.0.0-beta.25619.109 + 11.0.0-beta.25619.109 + 0.11.5-alpha.25619.109 + 11.0.0-beta.25619.109 + 11.0.0-alpha.1.25619.109 + 11.0.0-alpha.1.25619.109 + 11.0.0-alpha.1.25619.109 + 11.0.100-alpha.1.25619.109 + 11.0.0-alpha.1.25619.109 + 11.0.100-alpha.25619.109 26.0.11017 26.2.10192 @@ -26,7 +26,7 @@ This file should be imported by eng/Versions.props 26.0.11017 26.2.10192 - 11.0.0-prerelease.25603.1 + 10.0.0-prerelease.25516.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89295b4f2f54..bfdd08477b53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe @@ -61,25 +61,25 @@ - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe https://github.com/dotnet/xharness 88399512021dfa8b5f45d91f84c8ce6f0959b127 - + https://github.com/dotnet/dotnet - 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 + 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 8abfb71f7275..9b7eede4e50f 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="13.4-RELEASE" +__FreeBSDBase="13.5-RELEASE" __FreeBSDPkg="1.21.3" __FreeBSDABI="13" __FreeBSDPackages="libunwind" @@ -383,7 +383,7 @@ while :; do ;; freebsd14) __CodeName=freebsd - __FreeBSDBase="14.2-RELEASE" + __FreeBSDBase="14.3-RELEASE" __FreeBSDABI="14" __SkipUnmount=1 ;; diff --git a/global.json b/global.json index 9b13019129f2..9548c98cd886 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-alpha.1.25616.107", + "version": "11.0.100-alpha.1.25619.109", "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-alpha.1.25616.107" + "dotnet": "11.0.100-alpha.1.25619.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25616.107" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25619.109" } } diff --git a/tests/dotnet/UnitTests/XcodeProjectTests.cs b/tests/dotnet/UnitTests/XcodeProjectTests.cs index 2d213de9203f..66583e566c70 100644 --- a/tests/dotnet/UnitTests/XcodeProjectTests.cs +++ b/tests/dotnet/UnitTests/XcodeProjectTests.cs @@ -389,15 +389,9 @@ public void InvalidSchemeErroriOS () var properties = GetDefaultProperties (); var rv = DotNet.AssertBuildFailure (proj, properties); var expectedErrorContent = $"xcodebuild: error: The project named \"{xcodeProjName}\" does not contain a scheme named \"{invaldSchemeName}\"."; - var errors = BinLog.GetBuildLogErrors (rv.BinLogPath).ToArray (); - AssertErrorMessages (errors, - new Func [] { - (msg) => msg?.Contains (expectedErrorContent) == true - }, - new Func [] { - () => expectedErrorContent - } - ); + var errors = BinLog.GetBuildMessages (rv.BinLogPath).ToArray (); + var anyExpectedError = errors.Where (v => v.Message?.Contains (expectedErrorContent) == true); + Assert.That (anyExpectedError.Any (), Is.True, "Expected error"); } } diff --git a/tests/dotnet/UnitTests/expected/iOS-CoreCLR-Interpreter-size.txt b/tests/dotnet/UnitTests/expected/iOS-CoreCLR-Interpreter-size.txt index 40389774c1af..b05525c4ab89 100644 --- a/tests/dotnet/UnitTests/expected/iOS-CoreCLR-Interpreter-size.txt +++ b/tests/dotnet/UnitTests/expected/iOS-CoreCLR-Interpreter-size.txt @@ -1,8 +1,8 @@ -AppBundleSize: 224,480,500 bytes (219,219.2 KB = 214.1 MB) +AppBundleSize: 224,480,509 bytes (219,219.2 KB = 214.1 MB) # The following list of files and their sizes is just informational / for review, and isn't used in the test: _CodeSignature/CodeResources: 46,829 bytes (45.7 KB = 0.0 MB) archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB) -Info.plist: 1,158 bytes (1.1 KB = 0.0 MB) +Info.plist: 1,167 bytes (1.1 KB = 0.0 MB) libcoreclr.dylib: 6,692,608 bytes (6,535.8 KB = 6.4 MB) libmscordaccore.dylib: 2,386,528 bytes (2,330.6 KB = 2.3 MB) libmscordbi.dylib: 1,852,576 bytes (1,809.2 KB = 1.8 MB) diff --git a/tests/dotnet/UnitTests/expected/iOS-MonoVM-interpreter-size.txt b/tests/dotnet/UnitTests/expected/iOS-MonoVM-interpreter-size.txt index 7d0827c63217..5dbd4e902e21 100644 --- a/tests/dotnet/UnitTests/expected/iOS-MonoVM-interpreter-size.txt +++ b/tests/dotnet/UnitTests/expected/iOS-MonoVM-interpreter-size.txt @@ -1,8 +1,8 @@ -AppBundleSize: 3,631,040 bytes (3,545.9 KB = 3.5 MB) +AppBundleSize: 3,631,049 bytes (3,545.9 KB = 3.5 MB) # The following list of files and their sizes is just informational / for review, and isn't used in the test: _CodeSignature/CodeResources: 3,997 bytes (3.9 KB = 0.0 MB) archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB) -Info.plist: 1,158 bytes (1.1 KB = 0.0 MB) +Info.plist: 1,167 bytes (1.1 KB = 0.0 MB) Microsoft.iOS.dll: 150,528 bytes (147.0 KB = 0.1 MB) PkgInfo: 8 bytes (0.0 KB = 0.0 MB) runtimeconfig.bin: 1,405 bytes (1.4 KB = 0.0 MB) diff --git a/tests/dotnet/UnitTests/expected/iOS-MonoVM-size.txt b/tests/dotnet/UnitTests/expected/iOS-MonoVM-size.txt index c69dc129e847..9d8afbe098b1 100644 --- a/tests/dotnet/UnitTests/expected/iOS-MonoVM-size.txt +++ b/tests/dotnet/UnitTests/expected/iOS-MonoVM-size.txt @@ -1,9 +1,9 @@ -AppBundleSize: 9,463,548 bytes (9,241.7 KB = 9.0 MB) +AppBundleSize: 9,463,557 bytes (9,241.8 KB = 9.0 MB) # The following list of files and their sizes is just informational / for review, and isn't used in the test: _CodeSignature/CodeResources: 5,229 bytes (5.1 KB = 0.0 MB) aot-instances.aotdata.arm64: 816,632 bytes (797.5 KB = 0.8 MB) archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB) -Info.plist: 1,158 bytes (1.1 KB = 0.0 MB) +Info.plist: 1,167 bytes (1.1 KB = 0.0 MB) Microsoft.iOS.aotdata.arm64: 22,880 bytes (22.3 KB = 0.0 MB) Microsoft.iOS.dll: 48,640 bytes (47.5 KB = 0.0 MB) PkgInfo: 8 bytes (0.0 KB = 0.0 MB) diff --git a/tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt b/tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt index 5c381197414d..7db974e81843 100644 --- a/tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt +++ b/tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt @@ -1,8 +1,8 @@ -AppBundleSize: 3,827,109 bytes (3,737.4 KB = 3.6 MB) +AppBundleSize: 3,827,118 bytes (3,737.4 KB = 3.6 MB) # The following list of files and their sizes is just informational / for review, and isn't used in the test: _CodeSignature/CodeResources: 3,879 bytes (3.8 KB = 0.0 MB) archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB) -Info.plist: 1,158 bytes (1.1 KB = 0.0 MB) +Info.plist: 1,167 bytes (1.1 KB = 0.0 MB) libSystem.Globalization.Native.dylib: 94,032 bytes (91.8 KB = 0.1 MB) libSystem.IO.Compression.Native.dylib: 875,296 bytes (854.8 KB = 0.8 MB) libSystem.Native.dylib: 147,168 bytes (143.7 KB = 0.1 MB)