From 66659aa229abb192a49319ff8be6b3fdf187c6de Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Fri, 19 Apr 2024 14:08:34 -0400 Subject: [PATCH 1/2] [Xamarin.Android.Build.Tasks] Remove "Xamarin" from messages Context: https://dotnet.microsoft.com/platform/support/policy/xamarin Context: ab3773cf439ab620934b04e1bd01f0d9cf61a6ae Support for Xamarin.Android ends on 2024-May-1. Update error and warning messages to minimize use of "Xamarin". Remaining messages which contain "xamarin" are: * XA0030: Building with JDK version `{0}` is not supported. Please install JDK version `{1}`. See https://aka.ms/xamarin/jdk9-errors * XA1005: If basic type name matching fails, please add a `xamarin:managedType` attribute to the element to specify the fully qualified managed type name of the element XA0030 Should Not Happen with .NET 6+, as JDK 11+ is required. XA0030 is thus moot. XA1005 is related to Layout Code Behind (ab3773cf), and replacing `xamarin` would (1) be a source breaking change (so we can't *remove* support for `xamarin`), and (2) while we could add an alternate XML namespace to use for layout code behind, that's a larger change. --- src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx | 2 +- src/Xamarin.Android.Build.Tasks/Properties/Resources.resx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx b/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx index 0e3f8e775d4..eae7f8f3c13 100644 --- a/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx +++ b/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released. + Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will is no longer be available. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx index 390cd9272da..22a332c4a07 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx @@ -562,11 +562,11 @@ Either change the value in the AndroidManifest.xml to match the $(SupportedOSPla {0} - The assembly name - This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details. + This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/en-us/dotnet/android/messages/apt2264 for details. The following are literal names and should not be translated: - This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details. + This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/en-us/dotnet/android/messages/apt2265 for details. The following are literal names and should not be translated: @@ -1010,7 +1010,7 @@ To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MS {1} - The numeric version of .NET - The Android Support libraries are not supported in .NET 9 and later, please migrate to AndroidX. See https://aka.ms/xamarin/androidx for more details. + The Android Support libraries are not supported in .NET 9 and later, please migrate to AndroidX. See https://aka.ms/net-android/androidx for more details. The following are literal names and should not be translated: Android Support, AndroidX, .NET. From 2cb4d7b8ff3c8567d275957ffb138db558253153 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Mon, 22 Apr 2024 13:18:37 -0400 Subject: [PATCH 2/2] Address feedback --- src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx | 2 +- src/Xamarin.Android.Build.Tasks/Properties/Resources.resx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx b/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx index eae7f8f3c13..de3c1688804 100644 --- a/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx +++ b/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will is no longer be available. + Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher only supports a single AppDomain, so this API is no longer available. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx index 22a332c4a07..50ff07099ef 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx @@ -562,11 +562,11 @@ Either change the value in the AndroidManifest.xml to match the $(SupportedOSPla {0} - The assembly name - This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/en-us/dotnet/android/messages/apt2264 for details. + This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/dotnet/android/messages/apt2264 for details. The following are literal names and should not be translated: - This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/en-us/dotnet/android/messages/apt2265 for details. + This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/dotnet/android/messages/apt2265 for details. The following are literal names and should not be translated: