From cbbf782e0e4df7bea49ab6f906c8c5bdd165aae9 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 15 Jul 2024 10:50:23 -0500 Subject: [PATCH 1/3] [tests] fix `InvalidTargetPlatformVersion` for `net8.0` When 60dbcc9f was backported to .NET 8, the accompanying unit test was accidentally targeting .NET 9. --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index d3b2d85fa0b..b7650ea85be 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -835,7 +835,7 @@ public void IfAndroidJarDoesNotExistThrowXA5207 ([Values(true, false)] bool buil [Test] public void InvalidTargetPlatformVersion ([Values ("android33", "android99.0")] string platformVersion) { - const string targetFramework = "net9.0"; + const string targetFramework = "net8.0"; var project = new XamarinAndroidApplicationProject { TargetFramework = $"{targetFramework}-{platformVersion}", }; From 0d96085eccad0a2783011a6c141d536b97d59139 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 15 Jul 2024 13:00:55 -0500 Subject: [PATCH 2/3] Test `net8.0-android32` as invalid --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index b7650ea85be..d0307acc72d 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -833,7 +833,7 @@ public void IfAndroidJarDoesNotExistThrowXA5207 ([Values(true, false)] bool buil } [Test] - public void InvalidTargetPlatformVersion ([Values ("android33", "android99.0")] string platformVersion) + public void InvalidTargetPlatformVersion ([Values ("android32", "android99.0")] string platformVersion) { const string targetFramework = "net8.0"; var project = new XamarinAndroidApplicationProject { From c5e8998422a4c25bd668e4b48c6497362736125d Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 15 Jul 2024 16:33:20 -0500 Subject: [PATCH 3/3] Remove `android32` parameter --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index d0307acc72d..a834b567d15 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -833,7 +833,7 @@ public void IfAndroidJarDoesNotExistThrowXA5207 ([Values(true, false)] bool buil } [Test] - public void InvalidTargetPlatformVersion ([Values ("android32", "android99.0")] string platformVersion) + public void InvalidTargetPlatformVersion ([Values ("android99.0")] string platformVersion) { const string targetFramework = "net8.0"; var project = new XamarinAndroidApplicationProject {