diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a4130af0be..ace9f2b5381 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - fb7b9a4b9e578fa8c9f5fb67e22daf4b0d22668e + 0a73f814e19c9a239371cb732c9d1257e10fb8a2 - + https://github.com/dotnet/runtime - d40c654c274fe4f4afe66328f0599130f3eb2ea6 + dcc66a7ca25696a2326f296c3d8d3ac5a13f0524 - + https://github.com/dotnet/runtime - d40c654c274fe4f4afe66328f0599130f3eb2ea6 + dcc66a7ca25696a2326f296c3d8d3ac5a13f0524 - + https://github.com/dotnet/emsdk - 687be2a32a302aaade82380c0eaafa5af85fb4da + 258b51a8e5f5bea07766ab99d2aaa75582d1ceb9 - + https://github.com/dotnet/cecil - b8c2293cd1cbd9d0fe6f32d7b5befbd526b5a175 + 61250b0ed403b3f9b69a33f7d8f66f311338d6a1 diff --git a/eng/Versions.props b/eng/Versions.props index ea4799ef67c..c096a719b25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 9.0.100-preview.2.24106.6 - 9.0.0-preview.2.24080.1 - 9.0.0-preview.2.24080.1 + 9.0.100-preview.2.24122.3 + 9.0.0-preview.2.24122.2 + 9.0.0-preview.2.24122.2 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 9.0.0-preview.2.24076.1 + 9.0.0-preview.2.24120.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.24065.1 + 0.11.4-alpha.24119.1 $(MicrosoftNETCoreAppRefPackageVersion) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs index 0b89a082870..e1884c1c5f3 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs @@ -111,19 +111,17 @@ public void BuildBasicApplicationReleaseProfiledAotWithoutDefaultProfile () } [Test] - [TestCase ("テスト", false, false, true)] - [TestCase ("テスト", true, true, false)] - [TestCase ("テスト", true, false, true)] - [TestCase ("随机生成器", false, false, true)] - [TestCase ("随机生成器", true, true, false)] - [TestCase ("随机生成器", true, false, true)] - [TestCase ("中国", false, false, true)] - [TestCase ("中国", true, true, false)] - [TestCase ("中国", true, false, true)] - public void BuildAotApplicationWithSpecialCharactersInProject (string testName, bool isRelease, bool aot, bool expectedResult) + [TestCase ("テスト", false, false)] + [TestCase ("テスト", true, true)] + [TestCase ("テスト", true, false)] + [TestCase ("随机生成器", false, false)] + [TestCase ("随机生成器", true, true)] + [TestCase ("随机生成器", true, false)] + [TestCase ("中国", false, false)] + [TestCase ("中国", true, true)] + [TestCase ("中国", true, false)] + public void BuildAotApplicationWithSpecialCharactersInProject (string testName, bool isRelease, bool aot) { - if (!IsWindows) - expectedResult = true; var rootPath = Path.Combine (Root, "temp", TestName); var proj = new XamarinAndroidApplicationProject () { ProjectName = testName, @@ -132,13 +130,7 @@ public void BuildAotApplicationWithSpecialCharactersInProject (string testName, }; proj.SetAndroidSupportedAbis ("armeabi-v7a", "arm64-v8a", "x86", "x86_64"); using (var builder = CreateApkBuilder (Path.Combine (rootPath, proj.ProjectName))){ - builder.ThrowOnBuildFailure = false; - Assert.AreEqual (expectedResult, builder.Build (proj), "Build should have succeeded."); - if (!expectedResult) { - var aotFailed = builder.LastBuildOutput.ContainsText ("Precompiling failed"); - var aapt2Failed = builder.LastBuildOutput.ContainsText ("APT2265"); - Assert.IsTrue (aotFailed || aapt2Failed, "Error APT2265 or an AOT error should have been raised."); - } + Assert.IsTrue (builder.Build (proj), "Build should have succeeded."); } }