diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da454cc9f7..34c6d92e6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,30 +1,30 @@ - + https://github.com/dotnet/installer - eee48b8da517110dcdcd100c1a36bb084abd4482 + e5bfaee3514192f2a496f8b0bdd00208ac15458d - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - ea97babd7ccfd2f6e9553093d315f26b51e4c7ac + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/aspnetcore - 40dc1466a4543921e5e124ae6f92a813cae40e83 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/emsdk - 1f68fcee45ca75a2cb780edaff1e695af4d4f787 + abfa03c97f4175d4d209435cd0e71f558e36c3fd - + https://github.com/dotnet/cecil - 1a6a83a8f50e1119f1007b1e3c211d3289ba6901 + 2f4ef297939628143389ddeea569874ded0b1c1b diff --git a/eng/Versions.props b/eng/Versions.props index d3f4264a08..9957f821f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,14 +2,14 @@ - 8.0.100-rc.1.23378.5 - 8.0.0-rc.1.23376.5 + 8.0.100-rc.1.23415.5 + 8.0.0-rc.1.23414.4 6.0.0-beta.21212.6 - 8.0.0-rc.1.23376.5 - 8.0.0-rc.1.23368.3 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23411.2 7.0.7 7.0.100-alpha.1.21601.1 - 0.11.4-alpha.23360.2 + 0.11.4-alpha.23407.2 8.0.0-prerelease.23407.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) diff --git a/global.json b/global.json index 66077f199c..a581478bff 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.100-rc.1.23378.5" + "version": "8.0.100-rc.1.23415.5" } } diff --git a/tests/dotnet/UnitTests/PostBuildTest.cs b/tests/dotnet/UnitTests/PostBuildTest.cs index 93c83066d9..1274db599a 100644 --- a/tests/dotnet/UnitTests/PostBuildTest.cs +++ b/tests/dotnet/UnitTests/PostBuildTest.cs @@ -116,9 +116,9 @@ namespace Xamarin.Tests { [TestCase (ApplePlatform.iOS, "ios-arm64;ios-arm")] [TestCase (ApplePlatform.TVOS, "tvos-arm64")] [TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")] - [TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64;maccatalyst-x64")] + // [TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64;maccatalyst-x64")] // Ignored due to https://github.com/dotnet/runtime/issues/90584 [TestCase (ApplePlatform.MacOSX, "osx-x64")] - [TestCase (ApplePlatform.MacOSX, "osx-arm64;osx-x64")] + // [TestCase (ApplePlatform.MacOSX, "osx-arm64;osx-x64")] // Ignored due to https://github.com/dotnet/runtime/issues/90584 public void PublishTest (ApplePlatform platform, string runtimeIdentifiers) { var project = "MySimpleApp"; diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs index 84cb39f672..ae5c7a27f0 100644 --- a/tests/dotnet/UnitTests/ProjectTest.cs +++ b/tests/dotnet/UnitTests/ProjectTest.cs @@ -529,10 +529,10 @@ namespace Xamarin.Tests { } [Test] - [TestCase (ApplePlatform.iOS, "win10-x86", null)] - [TestCase (ApplePlatform.TVOS, "win10-x64", null)] - [TestCase (ApplePlatform.MacOSX, "win10-arm64", null)] - [TestCase (ApplePlatform.MacCatalyst, "win10-arm64", "Unable to find package Microsoft.NETCore.App.Runtime.Mono.win-arm64. No packages exist with this id in source[(]s[)]:.*")] + [TestCase (ApplePlatform.iOS, "win10-x86", "The specified RuntimeIdentifier 'win10-x86' is not recognized.")] + [TestCase (ApplePlatform.TVOS, "win10-x64", "The specified RuntimeIdentifier 'win10-x64' is not recognized.")] + [TestCase (ApplePlatform.MacOSX, "win10-arm64", "The specified RuntimeIdentifier 'win10-arm64' is not recognized.")] + [TestCase (ApplePlatform.MacCatalyst, "win10-arm64", "The specified RuntimeIdentifier 'win10-arm64' is not recognized.")] public void InvalidRuntimeIdentifier_Restore (ApplePlatform platform, string runtimeIdentifier, string? failureMessagePattern) { var project = "MySimpleApp";