diff --git a/.gdn/tsaoptions-v2.json b/.gdn/tsaoptions-v2.json index 21ad8c31a7d..c2d6d4c1a1f 100644 --- a/.gdn/tsaoptions-v2.json +++ b/.gdn/tsaoptions-v2.json @@ -1,5 +1,5 @@ { - "codebaseName": "xamarin.android_main", + "codebaseName": "dotnet.android_main", "notificationAliases": [ "dotnet-android-eng@microsoft.com" ], diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4b652be3076..9fad48fb186 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ "version": "2.0.0", "tasks": [ { - "label": "Build All Xamarin.Android", + "label": "Build All .NET for Android", "type": "shell", "windows":{ "command": ".\\build.cmd ${input:buildtype}"}, "linux":{"command": "./build.sh ${input:buildtype}"}, @@ -231,4 +231,4 @@ ] }, ] -} \ No newline at end of file +} diff --git a/Documentation/README.md b/Documentation/README.md index 65dc258de6e..7e5375a0f31 100644 --- a/Documentation/README.md +++ b/Documentation/README.md @@ -2,9 +2,9 @@ # Getting Started - * [Installing the Xamarin.Android SDK](https://developer.xamarin.com/guides/android/getting_started/installation/) - * [Xamarin.Android Documentation](https://developer.xamarin.com/guides/android/) - * [Xamarin.Android API Documentation](https://developer.xamarin.com/api/root/MonoAndroid-lib/) + * [Installing the .NET for Android SDK](https://developer.xamarin.com/guides/android/getting_started/installation/) + * [.NET for Android Documentation](https://learn.microsoft.com/dotnet/android/) + * [.NET for Android API Documentation](https://learn.microsoft.com/en-us/dotnet/api/?preserve-view=true&view=net-android-34.0) # Project Docs @@ -30,9 +30,9 @@ * [Build System Configuration](building/configuration.md) * [Build Dependencies for Linux and macOS](building/unix/dependencies.md) - * [Building Xamarin.Android on Linux and macOS](building/unix/instructions.md) + * [Building .NET for Android on Linux and macOS](building/unix/instructions.md) * [Build Dependencies for Windows](building/windows/dependencies.md) - * [Building Xamarin.Android on Windows](building/windows/instructions.md) + * [Building .NET for Android on Windows](building/windows/instructions.md) # Development Workflow @@ -50,4 +50,4 @@ # Other Information - * [Wikipedia Entry for Xamarin.Android](https://en.wikipedia.org/wiki/Mono_(software)#Xamarin.Android) + * [Wikipedia Entry for .NET for Android](https://en.wikipedia.org/w/index.php?title=.NET_for_Android&redirect=yes) diff --git a/Documentation/binfmt_misc-warning-Linux.txt b/Documentation/binfmt_misc-warning-Linux.txt index 0e774bae26d..6ab5b60327f 100644 --- a/Documentation/binfmt_misc-warning-Linux.txt +++ b/Documentation/binfmt_misc-warning-Linux.txt @@ -4,11 +4,11 @@ Your Linux appears to have support for binfmt_misc kernel module enabled. The module makes it possible to execute non-Linux binaries if the appropriate interpreter for the given format is available. Your machine is configured to handle Windows PE executables either via Mono or -Wine. It will make the Xamarin.Android build fail IF you choose to build the +Wine. It will make the .NET for Android build fail IF you choose to build the Windows cross-compilers by enabling the 'mxe-Win32' or 'mxe-Win64' host targets. You can disable the binfmt_misc module by issuing the following command as root -before building Xamarin.Android: +before building .NET for Android: echo 0 > /proc/sys/fs/binfmt_misc/status diff --git a/Documentation/building/configuration.md b/Documentation/building/configuration.md index 8114776ba72..aca9e72f359 100644 --- a/Documentation/building/configuration.md +++ b/Documentation/building/configuration.md @@ -9,7 +9,7 @@ # Build Configuration -The Xamarin.Android build is heavily dependent on MSBuild, with the *intention* +The .NET for Android build is heavily dependent on MSBuild, with the *intention* that it should (eventually?) be possible to build the project simply by checking out the repo, loading `Xamarin.Android.sln` into an IDE, and Building the solution. (This isn't currently possible, and may never be, but it's diff --git a/Documentation/building/unix/dependencies.md b/Documentation/building/unix/dependencies.md index 652135f8d8f..c0bec3cd3b5 100644 --- a/Documentation/building/unix/dependencies.md +++ b/Documentation/building/unix/dependencies.md @@ -1,6 +1,6 @@ # Build Dependencies for Linux and macOS -Building Xamarin.Android requires: +Building .NET for Android requires: * [Homebrew](#homebrew) * [Latest Mono](#mono-sdk) diff --git a/Documentation/building/unix/instructions.md b/Documentation/building/unix/instructions.md index fb86e45e031..263fc54dc3d 100644 --- a/Documentation/building/unix/instructions.md +++ b/Documentation/building/unix/instructions.md @@ -1,10 +1,10 @@ -# Building Xamarin.Android on Linux and macOS +# Building .NET for Android on Linux and macOS -Building Xamarin.Android on Linux and macOS relies on GNU make and +Building .NET for Android on Linux and macOS relies on GNU make and MSBuild via the `msbuild` command (within Mono). MSBuild via `xbuild` can also be used by setting the `$(MSBUILD)` make variable to `xbuild`. -# Building Xamarin.Android +# Building .NET for Android 1. Install the [build dependencies](dependencies.md). @@ -58,11 +58,11 @@ can also be used by setting the `$(MSBUILD)` make variable to `xbuild`. 2019][xamdevsummit] with a full walkthrough. Even though the demo was on Windows, many of the concepts should still apply: -[![Build Xamarin.Android](https://img.youtube.com/vi/8qaQleb6Tbk/maxresdefault.jpg)][xamdevsummit] +[![Build .NET for Android](https://img.youtube.com/vi/8qaQleb6Tbk/maxresdefault.jpg)][xamdevsummit] [xamdevsummit]: https://youtu.be/8qaQleb6Tbk -# Creating a local .NET android Workload +# Creating a local .NET for Android Workload `make prepare` provisions a specific build of .NET to `bin/$(Configuration)/dotnet`. @@ -95,12 +95,12 @@ See the [One .NET Documentation](../../guides/OneDotNet.md) for further details. # Creating installers Once `make all` or `make jenkins` have completed, macOS (.pkg), -Windows (.vsix), and .NET android workload .nupkg files +Windows (.vsix), and .NET for Android workload .nupkg files can be built with: make create-installers -Alternatively, .NET android workload packs can be built with: +Alternatively, .NET for Android workload packs can be built with: make create-nupkgs # -or- @@ -351,23 +351,3 @@ For example, to rebuild Mono for armeabi-v7a: $ msbuild /t:_InstallRuntimes src/mono-runtimes/mono-runtimes.csproj -# How do I rebuild BCL assemblies? - -The Xamarin.Android Base Class Library assemblies, such as `mscorlib.dll`, -are built within `external/mono`, using Mono's normal build system: - - # This updates external/mono/mcs/class/lib/monodroid/ASSEMBLY.dll - $ make -C external/mono/mcs/class/ASSEMBLY PROFILE=monodroid - -Alternatively, if you want to rebuild *all* the assemblies, the "host" -Mono needs to be rebuilt. Note that the name of the "host" directory -varies based on the operating system you're building from: - - $ make -C src/mono-runtimes/obj/Debug/host-Darwin - -Once the assemblies have been rebuilt, they can be copied into the appropriate -Xamarin.Android SDK directory by using the `_InstallBcl` target: - - # This updates bin/$(Configuration)/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/ASSEMBLY.dll - $ msbuild src/mono-runtimes/mono-runtimes.csproj /t:_InstallBcl - diff --git a/Documentation/building/windows/dependencies.md b/Documentation/building/windows/dependencies.md index a4ed06f5723..19ad1e679d3 100644 --- a/Documentation/building/windows/dependencies.md +++ b/Documentation/building/windows/dependencies.md @@ -1,8 +1,8 @@ # Build Dependencies for Windows -Building Xamarin.Android requires: +Building .NET for Android requires: - * An existing installation of the Xamarin.Android SDK and the Android SDK + * An existing installation of the .NET for Android SDK and the Android SDK * The .NET Framework 3.5 – 4.7 development tools * Git for Windows * The Java Development Kit (JDK) diff --git a/Documentation/building/windows/instructions.md b/Documentation/building/windows/instructions.md index 04d146ac2fa..f46313966b4 100644 --- a/Documentation/building/windows/instructions.md +++ b/Documentation/building/windows/instructions.md @@ -1,12 +1,12 @@ -# Building Xamarin.Android on Windows +# Building .NET for Android on Windows -Building Xamarin.Android on Windows requires .NET and the `msbuild` command +Building .NET for Android on Windows requires .NET and the `msbuild` command be available within the Command-Line environment. (The **Developer Command Prompt** that Visual Studio installs is sufficient.) MSBuild version 15 or later is required. -# Building Xamarin.Android +# Building .NET for Android 1. Install the [build dependencies](dependencies.md). @@ -80,13 +80,13 @@ So for example: [windows_path]: https://www.java.com/en/download/help/path.xml [set_alias]: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.utility/set-alias?view=powershell-6 -# Creating a local .NET android Workload +# Creating a local .NET for Android Workload `dotnet msbuild Xamarin.Android.sln -t:Prepare` provisions a specific build of .NET to `bin\$(Configuration)\dotnet`. Once the prepare target is complete, you can set up a local -.NET android workload install with: +.NET for Android workload install with: dotnet-local.cmd build Xamarin.Android.sln -t:BuildDotNet -m:1 @@ -121,7 +121,7 @@ See the [One .NET Documentation](../../guides/OneDotNet.md) for further details. # Creating installers Once `dotnet msbuild Xamarin.Android.sln -t:Prepare` is complete, -.NET android workload packs can be built with: +.NET for Android workload packs can be built with: dotnet-local.cmd build Xamarin.Android.sln -t:BuildDotNet,PackDotNet -m:1 diff --git a/Documentation/guides/AndroidAssetPacks.md b/Documentation/guides/AndroidAssetPacks.md index 920bc2d5959..2f67f5820f7 100644 --- a/Documentation/guides/AndroidAssetPacks.md +++ b/Documentation/guides/AndroidAssetPacks.md @@ -11,7 +11,7 @@ as required. There are two types of `pack`: Feature packs and Asset packs. *Feature* pack contains *non-native* Java code and other resources. Code in these types of `pack` can be launched via the `Context.StartActivity()` -API call. At this time due to various constraints .NET Android cannot support +API call. At this time due to various constraints .NET for Android cannot support Feature packs. *Asset* packs contain *only* @@ -232,4 +232,4 @@ issues though. 2. There is no IDE support for building this type of project. Having the user go through a number of hoops to implement this for -.NET Android or .NET MAUI is not ideal. +.NET for Android or .NET MAUI is not ideal. diff --git a/Documentation/guides/D8andR8.md b/Documentation/guides/D8andR8.md index e12b3599891..56dfbf6d309 100644 --- a/Documentation/guides/D8andR8.md +++ b/Documentation/guides/D8andR8.md @@ -1,4 +1,4 @@ -This is the D8 and R8 integration specification for Xamarin.Android. +This is the D8 and R8 integration specification for .NET for Android. # What is D8? What is R8? @@ -89,7 +89,7 @@ Usage: r8 [options] --help # Print this message. ``` -# What did Xamarin.Android do *before* D8/R8? +# What did .NET for Android do *before* D8/R8? In other words, what is currently happening *before* we introduce D8/R8 support? @@ -116,7 +116,7 @@ In other words, what is currently happening *before* we introduce D8/R8 support? # What does this process look like with D8 / R8 enabled? -Xamarin.Android now has two new MSBuild tasks: `` and ``. +.NET for Android now has two new MSBuild tasks: `` and ``. 1. The [Javac](https://github.com/xamarin/xamarin-android/blob/221a2190ebb3aaec9ecd9b1cf8f7f6174c43153a/src/Xamarin.Android.Build.Tasks/Tasks/Javac.cs) MSBuild task will remain unchanged. diff --git a/Documentation/guides/InstallBuildsFromMain.md b/Documentation/guides/InstallBuildsFromMain.md index 04b9c4fd334..95068e8712c 100644 --- a/Documentation/guides/InstallBuildsFromMain.md +++ b/Documentation/guides/InstallBuildsFromMain.md @@ -42,7 +42,7 @@ If you get the error: error XA5207: Could not find android.jar for API level 32. This means the Android SDK platform for API level 32 is not installed. Either install it in the Android SDK Manager (Tools > Android > Android SDK Manager...), -or change the Xamarin.Android project to target an API version that is installed. +or change your .NET for Android project to target an API version that is installed. ``` On Windows, if your Android SDK is located in `C:\Program Files diff --git a/Documentation/guides/MSBuildBestPractices.md b/Documentation/guides/MSBuildBestPractices.md index 69c1b49d057..9bbcd187c2c 100644 --- a/Documentation/guides/MSBuildBestPractices.md +++ b/Documentation/guides/MSBuildBestPractices.md @@ -3,7 +3,7 @@ This guide is a work-in-progress, but really has two main goals: - What are good MSBuild practices, in general? - What are good MSBuild practice in relation to what we already have - going on in Xamarin.Android MSBuild targets? + going on in .NET for Android MSBuild targets? ## Debugging MSBuild Tasks @@ -19,7 +19,7 @@ Waiting for debugger to attach (dotnet PID 13001). Press enter to continue... You can then use VS or VSCode to attach to this process and debug you tasks. -In the case of .NET Android we need to do a couple of thing first though. Firstly +In the case of .NET for Android we need to do a couple of thing first though. Firstly we need to disable the use of `ILRepacker` on the `Xamarin.Android.Build.Tasks` assembly. This is because `ILRepacker` does NOT handle debug symbols very well. Assemblies it generates seem to be JIT optimized so the debugger will not load @@ -65,7 +65,7 @@ Once MSBuild starts it will print the following Waiting for debugger to attach (dotnet PID xxxx). Press enter to continue... ``` -You need to copy the PID value so we can use this in the IDE. For Visual Studio you can use the `Attach to Process` menu option, while you have the Xamarin.Android.sln solution open. For VSCode open the workspace then use the `Attach to Process` Run and Debug option. You will be prompted for the PID and it will then connect. +You need to copy the PID value so we can use this in the IDE. For Visual Studio you can use the `Attach to Process` menu option, while you have the `Xamarin.Android.sln` solution open. For VSCode open the workspace then use the `Attach to Process` Run and Debug option. You will be prompted for the PID and it will then connect. Once connected go back to your command prompt and press ENTER so that the MSBuild process can continue. @@ -378,7 +378,7 @@ evaluates `$(MSBuildAllProjects)` since [MSBuild 16.0][allprojects]. > NOTE: You might consider using `@(_AndroidMSBuildAllProjects)` > instead of `$(MSBuildAllProjects)` when working on the -> Xamarin.Android MSBuild targets. We have excluded the `*.csproj.user` +> .NET for Android MSBuild targets. We have excluded the `*.csproj.user` > file for performance reasons. One pitfall, is this `_GenerateDocumentation` example *must* touch the @@ -540,7 +540,7 @@ Or if you want to cache across multiple-builds, use > Use `as` for casts to avoid any unexpected `InvalidCastException`'s. > Use the `RegisterTaskObjectAssemblyLocal()` or > `GetRegisteredTaskObjectAssemblyLocal()` extension methods within -> the Xamarin.Android codebase. +> the .NET for Android codebase. To *test* and validate your MSBuild task's use of `RegisteredTaskObjectLifetime.AppDomain` you have two choices: @@ -571,9 +571,9 @@ an implementation of MSBuild out-of-process nodes yet._ [static_csharp]: https://softwareengineering.stackexchange.com/questions/161222/dont-use-static-in-c [project_system]: https://marketplace.visualstudio.com/items?itemName=VisualStudioProductTeam.ProjectSystemTools -# Best Practices for Xamarin.Android MSBuild targets +# Best Practices for .NET for Android MSBuild targets -## Naming in Xamarin.Android targets +## Naming in .NET for Android targets As mentioned [above](/MSBuildBestPractices.md#naming), a good amount of consideration should be done before adding new public-facing @@ -583,11 +583,11 @@ since an obvious feature flag will be needed to enable it. The main thing to keep in mind here is that almost all of our public-facing MSBuild properties should be prefixed with `Android`. This is a good convention so it is easy to know which properties are -specific to Xamarin.Android, and this will prevent them from +specific to .NET for Android, and this will prevent them from conflicting with MSBuild properties from other products. All MSBuild properties are effectively "global variables"... -## Xamarin.Android MSBuild Task base classes +## .NET for Android MSBuild Task base classes We have a few base classes to simplify error handling, `async` / `await` usage, etc. diff --git a/Documentation/guides/MSBuildReferenceAssemblies.md b/Documentation/guides/MSBuildReferenceAssemblies.md index 3fed6c5aed9..bedffb5c825 100644 --- a/Documentation/guides/MSBuildReferenceAssemblies.md +++ b/Documentation/guides/MSBuildReferenceAssemblies.md @@ -15,7 +15,7 @@ The developer makes a change to something within `Referenced.csproj`. Question: Does `Referencer.csproj` need to be rebuilt? -In the "original" MSBuild world -- the world that Xamarin.Android +In the "original" MSBuild world -- the world that .NET for Android still lives in -- the answer is *yes*, `Referencer.csproj` *must **always*** be rebuilt, because the change to `Referenced.csproj` *may* contain an API breaking change which would prevent diff --git a/Documentation/guides/OneDotNet.md b/Documentation/guides/OneDotNet.md index 20944275451..acdd9fbecfe 100644 --- a/Documentation/guides/OneDotNet.md +++ b/Documentation/guides/OneDotNet.md @@ -1,9 +1,9 @@ -# .NET 6 and Xamarin.Android +# .NET for Android _NOTE: this document is very likely to change, as the requirements for .NET 6 are better understood._ -A .NET 6 project for a Xamarin.Android application will look something +A .NET 6 project for a .NET for Android application will look something like: ```xml @@ -31,7 +31,7 @@ Changes for bindings projects are documented [here][binding]. ## .NET Configuration Files No support for [configuration files][config] such as `Foo.dll.config` -or `Foo.exe.config` is available in Xamarin.Android projects targeting +or `Foo.exe.config` is available in .NET for Android projects targeting .NET 6. [``][dllmap] configuration elements are not supported in .NET Core at all, and other element types for compatibility packages like [System.Configuration.ConfigurationManager][nuget] have @@ -201,7 +201,7 @@ turn these settings off: ## dotnet cli There are currently a few "verbs" we are aiming to get working in -Xamarin.Android: +.NET for Android: dotnet new dotnet build @@ -250,12 +250,12 @@ to produce a self-contained "app" happens: https://docs.microsoft.com/en-us/dotnet/core/whats-new/dotnet-core-3-0#readytorun-images -However, for Xamarin.Android, `dotnet build` should produce something +However, for .NET for Android, `dotnet build` should produce something that is runnable. This basically means we need to create an `.apk` or `.aab` file during `build`. We will need to reorder any MSBuild tasks from the dotnet SDK, so that they will run during `build`. -This means Xamarin.Android would run: +This means .NET for Android would: * Run `aapt` to generate `Resource.designer.cs` and potentially emit build errors for issues in `@(AndroidResource)` files. @@ -275,7 +275,7 @@ copy the output to a `publish` directory on disk. _NOTE: Behavior inside IDEs will differ. The `Build` target will not produce an `.apk` file if `$(BuildingInsideVisualStudio)` is `true`. IDEs will call the `Install` target for deployment, which will produce -the `.apk` file. This behavior matches "legacy" Xamarin.Android._ +the `.apk` file. [illink]: https://github.com/mono/linker/blob/master/src/linker/README.md diff --git a/Documentation/guides/OneDotNetEmbeddedResources.md b/Documentation/guides/OneDotNetEmbeddedResources.md index ba980ed7444..84f4336630e 100644 --- a/Documentation/guides/OneDotNetEmbeddedResources.md +++ b/Documentation/guides/OneDotNetEmbeddedResources.md @@ -1,6 +1,6 @@ # One .NET: Embedded Resources and `.nupkg` Files -Traditionally, a Xamarin.Android class library can contain many types +Traditionally, a .NET for Android class library can contain many types of Android-specific files: * `@(AndroidAsset)` files in `Assets/` @@ -65,7 +65,7 @@ There is not a great place where all Android file types would fit following this pattern. In Android Studio, Android libraries are packaged as [`.aar`][aar] -files. A Xamarin.Android library, `Foo.csproj`, could also generate an +files. A .NET for Android library, `Foo.csproj`, could also generate an [`.aar`][aar] file in its `$(OutputPath)`: Foo.aar @@ -75,7 +75,7 @@ files. A Xamarin.Android library, `Foo.csproj`, could also generate an libs/*.jar jni/[arch]/*.so -Additionally, there is a need for Xamarin.Android-specific files +Additionally, there is a need for .NET for Android-specific files within the [`.aar`][aar]. These are placed in a `.net` directory: Foo.aar @@ -95,7 +95,7 @@ projects that consuming the class library. The name `.net` would be unlikely to collide with anything Google creates in the `.aar` file format in the future. These folders should also be completely ignored by Android tooling. The `.net` folder could -also be used for other Xamarin.Android specific files down the road. +also be used for other .NET for Android specific files down the road. So the output of `Foo.csproj` would look like: @@ -114,7 +114,7 @@ If you ran the `Pack` target, you would get a `.nupkg` file with: net6.0-android30/Foo.dll net6.0-android30/Foo.aar -When consuming the `.nupkg` files, Xamarin.Android will still have to +When consuming the `.nupkg` files, .NET for Android will still have to extract [`.aar`][aar] files on disk for command-line tooling such as `javac`, `d8/r8` and `manifestmerger`. If users want to copy around loose build output and consume it, there will only be 1 additional @@ -144,8 +144,8 @@ The `baz.jar` file would be included in the above `Foo.aar` file at: ### Native Libraries Since both `.aar` and `.nupkg` files support native libraries, -Xamarin.Android should support consuming native libraries from both -locations. A Xamarin.Android class library, `Foo.csproj` will place +.NET for Android should support consuming native libraries from both +locations. A .NET for Android class library, `Foo.csproj` will place native libraries in the `Foo.aar` file by default. Collisions encountered on the same native library should be ignored. @@ -223,7 +223,7 @@ Things we need for the first public release: * Item group support for `@(AndroidLibrary)` and `%(Bind)=true`. * Support for packing `.aar` files in `$(OutputPath)` for - Xamarin.Android class libraries. + .NET for Android class libraries. * Support for consuming `.nupkg` files that contain `.aar` files. These should enable us to compile AndroidX for `net6.0-android`. Then @@ -246,7 +246,7 @@ Things that could happen sometime after .NET 6 Preview 1: * `` performance * `.aar` files contain `AndroidManifest.xml` files. We could add - support for developers to add their own manifest to Xamarin.Android + support for developers to add their own manifest to .NET for Android class libraries. * We could also generate the `AndroidManifest.xml` so attributes like `[assembly:UsesPermission]` are done ahead of time. diff --git a/Documentation/guides/OneDotNetSingleProject.md b/Documentation/guides/OneDotNetSingleProject.md index babdac788af..8b1cd01fbb8 100644 --- a/Documentation/guides/OneDotNetSingleProject.md +++ b/Documentation/guides/OneDotNetSingleProject.md @@ -10,12 +10,12 @@ to create item templates for `AndroidManifest.xml` and `Info.plist` when (and if) they are removed from project templates. The concepts for a Xamarin "single project" go much beyond this. This -document is a starting point for what needs to go in the .NET Android +document is a starting point for what needs to go in the .NET for Android and Apple SDKs, while much of the remaining features would be in the -Xamarin.Forms/MAUI MSBuild targets. +MAUI MSBuild targets. For starters, we can add the following MSBuild properties to the -Xamarin.Android and Xamarin.iOS/Mac SDKs: +.NET for Android and .NET for iOS/etc. SDKs: * `$(ApplicationId)` maps to `/manifest/@package` and `CFBundleIdentifier` @@ -180,7 +180,7 @@ it. One can imagine supporting a `.resx` key via a new `$(LocalizedApplicationTitle)` property. This would likely need to be -implemented in Xamarin.Forms/MAUI MSBuild tasks as a way to provide a +implemented in .NET for Android/MAUI MSBuild tasks as a way to provide a single `.resx` file to be translated to the appropriate format for iOS and Android. This is a consideration for the future. diff --git a/Documentation/guides/WindowsOnArm64.md b/Documentation/guides/WindowsOnArm64.md index 6b29630b058..a7025447f60 100644 --- a/Documentation/guides/WindowsOnArm64.md +++ b/Documentation/guides/WindowsOnArm64.md @@ -108,7 +108,7 @@ other commands. ## Set the Path to the Android SDK -The .NET Android workload doesn't know how to locate Android Studio's +The .NET for Android workload doesn't know how to locate Android Studio's Android SDK by default. This is because it is normally managed by Visual Studio. diff --git a/Documentation/guides/app-bundles.md b/Documentation/guides/app-bundles.md index f70dc57c9a1..9d09ab3fec2 100644 --- a/Documentation/guides/app-bundles.md +++ b/Documentation/guides/app-bundles.md @@ -1,5 +1,5 @@ This is the Android App Bundle and `bundletool` integration -specification for Xamarin.Android. +specification for .NET for Android. # What are "app bundles"? @@ -23,11 +23,11 @@ Google Play that has a wide array of benefits. > devices. These first two features of Android App Bundles are a natural fit for -Xamarin.Android apps. The first version of `bundletool` support in -Xamarin.Android will focus on these two benefits. +.NET for Android apps. The first version of `bundletool` support in +.NET for Android will focus on these two benefits. *Unfortunately* the next two features will be more involved. We could -perhaps support them in Xamarin.Android down the road. +perhaps support them in .NET for Android down the road. * Support for "Instant Apps": @@ -35,7 +35,7 @@ perhaps support them in Xamarin.Android down the road. > an instant app entry point module from the Try Now button on > Google Play and web links without installation. -Xamarin.Android does not yet have full support for [Instant +.NET for Android does not yet have full support for [Instant Apps][instant_apps], in general. There would likely be some changes needed to the runtime, and there is a file size limit on the base APK size. App Bundles won't necessarily help anything for this. @@ -48,7 +48,7 @@ size. App Bundles won't necessarily help anything for this. > Android Studio 3.2 to build apps with dynamic features, and join > the beta program to publish them on Google Play. -For Xamarin.Android to implement this feature, I believe Instant App +For .NET for Android to implement this feature, I believe Instant App support is needed first. For more information on App Bundles, visit the [getting @@ -64,7 +64,7 @@ started][getting_started] guide. gradle, Android Studio, and Google Play use for working with Android App Bundles. -Xamarin.Android will need to run `bundletool` for the following cases: +.NET for Android will need to run `bundletool` for the following cases: * Create an Android App Bundle from a "base" zip file * Create an APK Set (`.apks` file) from an Android App Bundle @@ -127,7 +127,7 @@ To enable app bundles, a new MSBuild property is needed: ``` `$(AndroidPackageFormat)` will default to `apk` for the current -Xamarin.Android behavior. +.NET for Android behavior. Due to the various requirements for Android App Bundles, here are a reasonable set of defaults for `bundletool`: @@ -153,7 +153,7 @@ commonly be enabled in `Release` builds for submission to Google Play: Using `$(AndroidPackageFormat)` could impact build times, since it takes some time for `bundletool` to generate an app bundle and device-specific APK set to be deployed. It would make sense, in a -given Xamarin.Android `.csproj` file to use `apk` for `Debug` builds +given .NET for Android `.csproj` file to use `apk` for `Debug` builds and `aab` for `Release` builds. ## aapt2 @@ -177,7 +177,7 @@ Suitable as input to the bundle tool for generating an App Bundle. This command-line switch is new in `aapt2` and can only be used with the version of `aapt2` from Maven. We are now shipping this new -version in Xamarin.Android. +version in .NET for Android. ## Generate a base ZIP file @@ -190,7 +190,7 @@ file][zip_format] of the following structure: * `assets/`: all Android assets * `lib/`: all native libraries (`.so` files) * `root/`: any arbitrary files that need to go in the root of the - final APK on-device. Xamarin.Android will need to put .NET + final APK on-device. .NET for Android will need to put .NET assemblies in `root/assemblies`. * `resources.pb`: the resource table in protobuf format @@ -202,7 +202,7 @@ See the [.aab format spec][aab_format] for further detail. ## BundleConfig.json Since .NET assemblies and typemap files must remain uncompressed in -Xamarin.Android apps, we will also need to specify a +.NET for Android apps, we will also need to specify a `BundleConfig.json` file: ```json @@ -257,13 +257,13 @@ See [bundletool's source code][nativelibs] for details. ## Signing App Bundles can only be signed with `jarsigner` (not `apksigner`). App -Bundles do not need to use `zipalign`. Xamarin.Android should go ahead +Bundles do not need to use `zipalign`. .NET for Android should go ahead and sign the `.aab` file the same as it currently does for `.apk` files. A `com.company.app-Signed.aab` file will be generated in `$(OutputPath)`, to match our current behavior with APK files. Google Play has recently added support for [doing the final, -production signing][app_signing], but Xamarin.Android should sign App +production signing][app_signing], but .NET for Android should sign App Bundles with what is configured in the existing MSBuild properties. [app_signing]: https://developer.android.com/studio/publish/app-signing diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md index 234f69fd9ac..3b8d684541d 100644 --- a/Documentation/guides/internals/JavaJNI_Interop.md +++ b/Documentation/guides/internals/JavaJNI_Interop.md @@ -19,13 +19,13 @@ # Introduction -At the core of `.NET Android` is its ability to interoperate with +At the core of `.NET for Android` is its ability to interoperate with the Java/Kotlin APIs implemented in the Android system. To make it work, it is necessary to "bridge" the two separate worlds of Java VM (`ART` in the Android OS) and the Managed VM (`MonoVM`). Application developers expect to be able to call native Android APIs and receive calls (or react to events) from the Android side using code written in -one of the .NET managed languages. To make it work, `.NET Android` +one of the .NET managed languages. To make it work, `.NET for Android` employs a number of techniques, both at build and at run time, which are described in the sections below. @@ -41,7 +41,7 @@ process resources, they don't "naturally" communicate with each other. There is no direct way to call Java/Kotlin from .NET a'la the `p/invoke` mechanism which allows calling native code APIs. Nor there exists a way for Java/Kotlin code to invoke managed methods. To make -it possible, `.NET Android` takes advantage of the Java's [JNI](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/jniTOC.html) +it possible, `.NET for Android` takes advantage of the Java's [JNI](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/jniTOC.html) (`Java Native Interface`), a mechanism that allows native code (.NET managed code being "native" in this context) to register implementations of Java methods, written outside the Java VM and in @@ -79,7 +79,7 @@ sections. ## Java Callable Wrappers (JCW) -`.NET Android` wraps the entire Android API by generating +`.NET for Android` wraps the entire Android API by generating appropriate C# code which mirrors the Java/Kotlin code (classes, interfaces, methods, properties etc). Each generated class that corresponds to a Java/Kotlin type, is derived from the @@ -89,7 +89,7 @@ implement or override virtual Java methods. To make registration and invoking of such methods possible, it is necessary to generate a Java class which mirrors the Managed one and provides an entry point to the Java <-> Managed transition. The Java classes are generated -during application (as well as `.NET Android`) build and we call +during application (as well as `.NET for Android`) build and we call them **Java Callable Wrappers** (or **JCW** for short). For instance, the following managed class: @@ -226,7 +226,7 @@ public class MainActivity : AppCompatActivity ``` The above code is actually generated in the `Android.App.Activity` -class while .NET Android is built, from which our example +class while .NET for Android is built, from which our example `MainActivity` eventually derives. What happens with the above code depends on the registration mechanism @@ -234,7 +234,7 @@ and is described in the sections below. ## Dynamic registration -This registration mechanism has been used by `.NET Android` since +This registration mechanism has been used by `.NET for Android` since the beginning and it will remain in use for the foreseeable future when the application is built in the `Debug` configuration or when [Marshal Methods](#marshal-methods) are turned off. @@ -297,12 +297,12 @@ methods registered with JNI: 1. `mono.android.Runtime.register` is itself a native method, declared in the [`Runtime`](../../src/java-runtime/java/mono/android/Runtime.java) - class of .NET Android's Java runtime code, and implemented in - the native .NET Android + class of .NET for Android's Java runtime code, and implemented in + the native .NET for Android [runtime](../../src/monodroid/jni/monodroid-glue.cc) (the `MonodroidRuntime::Java_mono_android_Runtime_register` method). Purpose of this method is to prepare a call into the - .NET Android managed runtime code, the + .NET for Android managed runtime code, the [`Android.Runtime.JNIEnv::RegisterJniNatives`](../../src/Mono.Android/Android.Runtime/JNIEnv.cs) method. 2. `Android.Runtime.JNIEnv::RegisterJniNatives` is passed name of @@ -532,7 +532,7 @@ JNICALL Java_helloandroid_MainActivity_n_1onCreate__Landroid_os_Bundle_2 (JNIEnv ``` The `xamarin_app_init` function is output only once and is called by -the `.NET Android` runtime twice during application startup - once +the `.NET for Android` runtime twice during application startup - once to pass `get_function_pointer_fn` which does **not** use any locks (as we know that until a certain point during startup we are in a single lock, so no data access races can happen) and the other time just @@ -571,7 +571,7 @@ Managed assemblies (including `Mono.Android.dll`) which contain Java types need to be usable in two contexts: with the "traditional" dynamic registration and with marshal methods. Both of these mechanisms, however, have different requirements. We cannot assume -that any assembly (either from .NET Android or a third party nuget) +that any assembly (either from .NET for Android or a third party nuget) will have "marshal methods friendly" code and thus we need to make sure that the code meets our requirements. diff --git a/Documentation/guides/internals/debug-jni-objrefs.md b/Documentation/guides/internals/debug-jni-objrefs.md index 6932d92dc5a..5b0b4fb3eaa 100644 --- a/Documentation/guides/internals/debug-jni-objrefs.md +++ b/Documentation/guides/internals/debug-jni-objrefs.md @@ -4,7 +4,7 @@ How to debug and diagnose app crashes due to invalid JNI Object References. ## Overview -Xamarin.Android apps and .NET SDK for Android apps make heavy use of the +.NET for Android apps apps make heavy use of the [Java Native Interface (JNI)](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/jniTOC.html) to create Java instances, invoke methods on those Java instances, and allow Java interfaces to be implemented and Java methods to be overridden. When dealing with Java instances, diff --git a/Documentation/guides/profiling.md b/Documentation/guides/profiling.md index cd2c121c30f..db6d86a2291 100644 --- a/Documentation/guides/profiling.md +++ b/Documentation/guides/profiling.md @@ -1,7 +1,7 @@ # Profiling Startup There are currently a few different ways at getting timing information -from Xamarin.Android & Mono. This document aims to demystify the +from .NET for Android & Mono. This document aims to demystify the command-line commands involved in retrieving this data from Android devices. @@ -68,7 +68,7 @@ After launching the app, we get additional information: 09-04 14:44:12.561 9126 9126 I monodroid-timing: JNIEnv.RegisterJniNatives total time: 1567626252561.82 [elapsed: 2.182 ms] 09-04 14:44:12.561 9126 9126 I monodroid-timing: Runtime.register: end time; elapsed: 0s:2::244636 -These are timings taken at different points during Xamarin.Android +These are timings taken at different points during .NET for Android startup: across native and managed code. In case you have the XA build tree by hand, it is possible to process diff --git a/Documentation/guides/tracing.md b/Documentation/guides/tracing.md index 285df67f49f..830e4c03721 100644 --- a/Documentation/guides/tracing.md +++ b/Documentation/guides/tracing.md @@ -1,6 +1,6 @@ -# Tracing .NET Android Applications +# Tracing .NET for Android Applications -Attaching `dotnet-trace` to a .NET Android application, allows you to +Attaching `dotnet-trace` to a .NET for Android application, allows you to get profiling information in formats like `.nettrace` and `.speedscope`. These give you CPU sampling information about the time spent in each method in your application. This is quite useful for @@ -161,7 +161,7 @@ Unix by uploading them to [https://speedscope.app/][speedscope]. [speedscope]: https://speedscope.app/ -### Running the .NET Android Application +### Running the .NET for Android Application `$(AndroidEnableProfiler)` must be set to `true` as it includes the Mono diagnostic component in the application. This component is the diff --git a/Documentation/guides/vscode-support.md b/Documentation/guides/vscode-support.md index a15908b52b0..38ceb27b73d 100644 --- a/Documentation/guides/vscode-support.md +++ b/Documentation/guides/vscode-support.md @@ -1,28 +1,28 @@ # VSCode Support -Xamarin.Android itself can be developed within +.NET for Android itself can be developed within [Visual Studio Code (VSCode)](https://code.visualstudio.com/). There is a workspace included in the repo `Xamarin.Android.code-workspace`. The required extensions should be installed when you open the workspace. -## Building Xamarin.Android +## Building .NET for Android Open the `Xamarin.Android.code-workspace` in VSCode. Then use the Build Command Pallette (Ctrl+Shift+B in Windows, Cmd+Shift+B on Mac) to list the available build commands. -Select **Build All Xamarin.Android**. You will then be presented with a +Select **Build All .NET for Android**. You will then be presented with a list of options: * `Prepare` - Installs the required Dependencies. * `PrepareExternal` - Installs the required Commercial Dependencies (Xamarin Team Members Only) -* `Build` - Build Xamarin.Android. +* `Build` - Build .NET for Android. * `Pack` - Create the NuGet Packages. * `Everything` - Calls Prepare, Build and Pack. The normal order is `Prepare`, `Build` then `Pack`. This will result in -a usable copy of Xamarin.Android. You can now use it to build apps +a usable copy of .NET for Android. You can now use it to build apps and run the unit tests. Note: `PrepareExternal` is for internal Xamarin Team members only, this sets up @@ -49,7 +49,7 @@ global nuget cache, usually in `$HOME/.nuget` or `%USERPROFILE%/.nuget`. The setting you need to set is `nxunitExplorer.nunit`. This will need to be done in your **Preferences** > **Settings** in VSCode. This will save the setting globally so it will be available when ever you open -Xamarin.Android. +.NET for Android. Alternatively you can add something like the following to the `Xamarin.Android.code-workspace`: @@ -87,19 +87,19 @@ tests. The upstream pull request is ### derivitec-ltd.vscode-dotnet-adapter This should work out of the box as long as you have `dotnet` installed. This is -a dependency for Xamarin.Android so it should be installed as soon as you -build Xamarin.Android. +a dependency for .NET for Android so it should be installed as soon as you +build .NET for Android. ### Running the Sample -Xamarin.Android provides a few Debug configurations in VSCode to debug the +.NET for Android provides a few Debug configurations in VSCode to debug the sample applications `HelloWorld` and `VSAndroidApp`. You can select the `Debug Sample` Run and Debug config to run and debug the samples under `mono` or you can use `Debug Sample Under DotNet` to debug this under the .net 6 system. In order to use the `Debug Sample Under DotNet` you will need to have built -Xamarin.Android for .net 6 using the `Pack` command mentioned earlier. +.NET for Android for .net 6 using the `Pack` command mentioned earlier. See the [windows documentation](../building/windows/instructions.md) or [\*nix documentation](../building/unix/instructions.md) for additional details on working with .net 6. @@ -126,7 +126,7 @@ in `.vscode/tasks.json`. }, ``` -you can add your own projects here and they will run with the Xamarin.Android +you can add your own projects here and they will run with the .NET for Android you have built locally. diff --git a/Documentation/project-docs/AssemblyStores.md b/Documentation/project-docs/AssemblyStores.md index 57be490322b..a908dc93e7c 100644 --- a/Documentation/project-docs/AssemblyStores.md +++ b/Documentation/project-docs/AssemblyStores.md @@ -27,7 +27,7 @@ the device/emulator filesystem) ## Rationale -During native startup, the Xamarin.Android runtime looks inside the +During native startup, the .NET for Android runtime looks inside the application APK file for the managed assemblies (and their associated pdb and config files, if applicable) in order to map them (using the `mmap(2)` call) into memory so that they can be given to the Mono @@ -36,7 +36,7 @@ the memory mapping is that, as far as Android is concerned, managed assembly files are just data/resources and, thus, aren't extracted to the filesystem. As a result, Mono wouldn't be able to find the assemblies by scanning the filesystem - the host application -(Xamarin.Android) must give it a hand in finding them. +(.NET for Android) must give it a hand in finding them. Applications can contain hundreds of assemblies (for instance a Hello World MAUI application currently contains over 120 assemblies) and @@ -58,7 +58,7 @@ architecture-specific stores. dotnet ships with a handful of assemblies that **are** architecture-specific - those assemblies are placed in an architecture specific store, one per architecture supported by and enabled for the application. On the execution time, -the Xamarin.Android runtime will always map the architecture-agnostic +the .NET for Android runtime will always map the architecture-agnostic store and one, and **only** one, of the architecture-specific stores. Stores are placed in the same location in the APK/AAB archive where the @@ -72,8 +72,8 @@ Each APK in the application (e.g. the future Feature APKs) **may** contain the above two assembly store files (some APKs may contain only resources, other may contain only native libraries etc) -Currently, Xamarin.Android applications will produce only one set of -stores but when Xamarin.Android adds support for Android Features, each +Currently, .NET for Android applications will produce only one set of +stores but when .NET for Android adds support for Android Features, each feature APK will contain its own set of stores. All of the APKs will follow the location, format and naming conventions described above. diff --git a/Documentation/project-docs/ExploringSources.md b/Documentation/project-docs/ExploringSources.md index 85c8be77959..3fe0b04bd2a 100644 --- a/Documentation/project-docs/ExploringSources.md +++ b/Documentation/project-docs/ExploringSources.md @@ -1,4 +1,4 @@ -# Xamarin.Android Directory Structure +# .NET for Android Directory Structure There are two project configurations, `Debug` and `Release`. The project configuration is controlled by the `$(Configuration)` MSBuild property. diff --git a/Documentation/project-docs/InstantApps.md b/Documentation/project-docs/InstantApps.md index 4322583b921..083a03cd868 100644 --- a/Documentation/project-docs/InstantApps.md +++ b/Documentation/project-docs/InstantApps.md @@ -40,7 +40,7 @@ base + feature apk size. Instant App developers are encouraged to put as few assets in the .apk as possible and download the rest when the app is first started. -**Impact on Xamarin.Android**: XA nearly pushes the size limit with a simple "Hello World" application +**Impact on .NET for Android**: .NET for Android nearly pushes the size limit with a simple "Hello World" application where, in Release build, the Mono runtime is nearly 3MB in size - not including the BCL, SDK and application assemblies. While it would be possible to download the Mono runtime and the assemblies on the app startup (XA app include a small Java stub responsible for launching of the managed application), @@ -54,9 +54,9 @@ Instant Apps are not allowed to contain and run any arbitrary native code/librar exists most probably for security reasons. It is also disallowed to dynamically load any code other than the Instant Apps runtime. -**Impact on Xamarin.Android**: it prevents XA applications from running since both -the Mono and the Xamarin.Android runtimes are implemented as shared libraries (we also need, depending -on application, the Sqlite and Boring TLS libraries). In order to support Instant Apps in Xamarin.Android, +**Impact on .NET for Android**: it prevents .NET for Android applications from running since both +the Mono and the .NET for Android runtimes are implemented as shared libraries (we also need, depending +on application, the Sqlite library). In order to support Instant Apps in .NET for Android, its runtime as well as the Mono runtime would have to be included in the set of allowed native code libraries by Google/Android. diff --git a/Documentation/release-notes/README.md b/Documentation/release-notes/README.md index c2c626a1008..229d7ba4d52 100644 --- a/Documentation/release-notes/README.md +++ b/Documentation/release-notes/README.md @@ -88,7 +88,7 @@ any custom release notes. - `### Android API bindings` - `### Bindings projects` - `### Design-time build process` - - `### Xamarin.Android SDK installation` + - `### .NET for Android SDK installation` - `### IDE compatibility` - Write a list item to go under the heading. Start the item with one of the diff --git a/Documentation/release-notes/manifest-merger-30.2.2.md b/Documentation/release-notes/manifest-merger-30.2.2.md index 4fcc6d2fb56..a4c7a145316 100644 --- a/Documentation/release-notes/manifest-merger-30.2.2.md +++ b/Documentation/release-notes/manifest-merger-30.2.2.md @@ -1,6 +1,6 @@ ### manifestmerger.jar version update to 30.2.2 -The version of the [manifest merger][0] included in Xamarin.Android +The version of the [manifest merger][0] included in .NET for Android has been updated from 30.1.3 to 30.2.2 [0]: https://developer.android.com/studio/build/manifest-merge.html diff --git a/Documentation/release-notes/r8-3.3.75.md b/Documentation/release-notes/r8-3.3.75.md index 6dcdd698289..385e2cd88e9 100644 --- a/Documentation/release-notes/r8-3.3.75.md +++ b/Documentation/release-notes/r8-3.3.75.md @@ -1,4 +1,4 @@ ### D8/R8 version update to 3.3.75 The version of the [D8 dexer and R8 shrinker](https://r8.googlesource.com/r8) -included in Xamarin.Android has been updated from 3.3.28 to 3.3.75. +included in .NET for Android has been updated from 3.3.28 to 3.3.75. diff --git a/Documentation/workflow/DevelopmentTips.md b/Documentation/workflow/DevelopmentTips.md index 1ea7c172781..768cc60a55f 100644 --- a/Documentation/workflow/DevelopmentTips.md +++ b/Documentation/workflow/DevelopmentTips.md @@ -1,6 +1,6 @@ # Development tips and native debugging -Tips and tricks while developing Xamarin.Android. +Tips and tricks while developing .NET for Android. # Run MSBuild-Based On-Device Unit Tests @@ -16,7 +16,7 @@ If you need to run only *one* `[Test]` method, you can use # Update directory -When a Xamarin.Android app launches on an Android device, and the app was +When a .NET for Android app launches on an Android device, and the app was built in the `Debug` configuration, it will create an "update" directory during process startup, printing the created directory to `adb logcat`: @@ -85,10 +85,10 @@ that, run the `xa-lldb` script as described in README.md. First, you'll need to get a version of `libmonosgen-2.0.so` that includes debug symbols. You can either use a custom local build or download the debug version -of `libmonosgen-2.0.so` for a published Xamarin.Android version: +of `libmonosgen-2.0.so` for a published .NET for Android version: 1. Go to and click on the - Xamarin.Android version you are debugging. + .NET for Android version you are debugging. 2. Find the **OSS core** section at the bottom of the release information and click the link to the open-source build. @@ -136,7 +136,7 @@ versions of `libmonosgen-2.0.so`. 3. Rename the file to `libmonosgen-2.0.so`. ![libmonosgen-2.0.so added to the lib/arm64-v8a directory of the - Xamarin.Android app project in the Visual Studio Solution + .NET for Android app project in the Visual Studio Solution Explorer](../images/lib-arm64-v8a-libmonosgen.png) 4. Set the **Build Action** of the file to **AndroidNativeLibrary**. @@ -210,7 +210,7 @@ the symbols by hand might be useful in some cases. # Attaching GDB using Visual Studio on Windows -Visual Studio can attach GDB to Xamarin.Android for native debugging. The +Visual Studio can attach GDB to .NET for Android for native debugging. The integration includes the usual features like the graphical thread and call stack windows and the ability to set breakpoints using the source code editor. @@ -267,7 +267,7 @@ are more familiar with LLDB than GDB or if you already have Android Studio installed and don't currently have the Android NDK installed. 1. Install [Android Studio][android-studio]. If you already have an Android - SDK installation for Xamarin.Android, you can click **Cancel** on the **Android + SDK installation for .NET for Android, you can click **Cancel** on the **Android Studio Setup Wizard** when you launch Android Studio. 2. Open the signed debuggable APK for the application in Android Studio via @@ -284,7 +284,7 @@ installed and don't currently have the Android NDK installed. ![New SDK in the Android Studio Project Structure Modules Dependencies window](../images/android-studio-modules-dependencies.png) - Select the Android SDK folder you're using with Xamarin.Android, and then + Select the Android SDK folder you're using with .NET for Android, and then under **Build target**, pick the appropriate Android API to match the APK. ![Create New Android SDK window in Android diff --git a/Documentation/workflow/HowToBumpMono.md b/Documentation/workflow/HowToBumpMono.md index 5ac32a795f1..0324fe4d5d9 100644 --- a/Documentation/workflow/HowToBumpMono.md +++ b/Documentation/workflow/HowToBumpMono.md @@ -47,7 +47,7 @@ Within [`.external`](../../.external) indicate the mono branch and commit. For ### Ensure it *builds* -`make all` only builds a subset of the full Xamarin.Android SDK: support +`make all` only builds a subset of the full .NET for Android SDK: support for only select ABIs (host OS, x86, armeabi-v7a), only one `Mono.Android.dll` version, and *no* builds for Windows support. diff --git a/Documentation/workflow/Localization.md b/Documentation/workflow/Localization.md index a94b2bbc461..191d86d3acb 100644 --- a/Documentation/workflow/Localization.md +++ b/Documentation/workflow/Localization.md @@ -1,6 +1,6 @@ # Localization -All new Xamarin.Android MSBuild error or warning messages should be localizable, +All new .NET for Android MSBuild error or warning messages should be localizable, so when adding a new message, follow these steps: 1. Add the new message to diff --git a/Documentation/workflow/SystemProperties.md b/Documentation/workflow/SystemProperties.md index 999be78d620..8fc1e6ba188 100644 --- a/Documentation/workflow/SystemProperties.md +++ b/Documentation/workflow/SystemProperties.md @@ -1,7 +1,7 @@ **Table of Contents** -- [Custom Android system properties used by Xamarin.Android](#custom-android-system-properties-used-by-xamarinandroid) +- [Custom Android system properties used by .NET for Android](#custom-android-system-properties-used-by-xamarinandroid) - [Introduction](#introduction) - [Known properties](#known-properties) - [debug.mono.connect](#debugmonoconnect) @@ -19,11 +19,11 @@ - [debug.mono.wref](#debugmonowref) -# Custom Android system properties used by Xamarin.Android +# Custom Android system properties used by .NET for Android ## Introduction -Xamarin.Android uses a number of custom Android system properties to +.NET for Android uses a number of custom Android system properties to communicate settings to application at the run time. Each property value can be no longer than 91 characters (as per Android OS limits) and can be set from the command line using the following syntax: @@ -60,7 +60,7 @@ value doesn't matter, only its presence is checked. ### debug.mono.env Specifies a list of environment properties to set. Property is only -used in Debug builds of Xamarin.Android applications. Its value +used in Debug builds of .NET for Android applications. Its value is a list of `NAME=VALUE` pairs separated with the pipe character (`|`), without any whitespace surrounding each of the pipe separators. @@ -72,11 +72,11 @@ arguments to pass to the Mono runtime initialization function. ### debug.mono.gc Enable GC logging if set to any non-empty value. Property is only -used in Debug builds of Xamarin.Android applications. +used in Debug builds of .NET for Android applications. ### debug.mono.gdb -Set additional parameters when starting a Xamarin.Android application +Set additional parameters when starting a .NET for Android application under GDB. Each argument follows the `NAME:VALUE` format. Supported arguments: @@ -88,7 +88,7 @@ arguments: ### debug.mono.log -Configure the Xamarin.Android runtime categories. By default only the +Configure the .NET for Android runtime categories. By default only the `default` category is enabled, which logs a handful of messages during application startup and operation. This property enables all the messages logged below the `info` level for any of the categories. @@ -277,7 +277,7 @@ adb logcat -d > logcat.txt ``` Technically, the broadcast can be sent to all applications running on -the device, but in event there are more Xamarin.Android applications +the device, but in event there are more .NET for Android applications which happen to have timing enabled, the output could be confusing so it's better to send the broadcast to a specific application/package only. diff --git a/Documentation/workflow/UnitTests.md b/Documentation/workflow/UnitTests.md index 02be11036ca..2694ceda356 100644 --- a/Documentation/workflow/UnitTests.md +++ b/Documentation/workflow/UnitTests.md @@ -1,6 +1,6 @@ # Unit Tests -Unit test infrastructure for .NET Android. +Unit test infrastructure for .NET for Android. # Tools @@ -76,7 +76,7 @@ If no Android device is attached, then the emulator will be created. The `ADB_TARGET` environment variable can be used to explicitly specify which Android device should be used when running Device Integration Tests. -NOTE: Not all tests work under .NET Android yet. So we need to filter +NOTE: Not all tests work under .NET for Android yet. So we need to filter them on the `DotNetIgnore` category. To run a specific test you can use the `Name=Value` argument for `--filter`, @@ -119,7 +119,7 @@ If no Android device is attached, then the emulator will be created. The `ADB_TARGET` environment variable can be used to explicitly specify which Android device should be used when running Device Integration Tests. -NOTE: Not all tests work under .NET Android yet. So we need to filter +NOTE: Not all tests work under .NET for Android yet. So we need to filter them on the `DotNetIgnore` category. To run a specific test you can use the `Name=Value` argument for the `--filter`, @@ -260,7 +260,7 @@ task and return a `bool`. Assert.IsTrue (task.Execute (), "Task should succeed."); ``` -NOTE: It is common practice in .NET Android to provide a text description on +NOTE: It is common practice in .NET for Android to provide a text description on an `Assert` call. This makes it easier to track down where a particular test is failing. diff --git a/Documentation/workflow/commit-messages.md b/Documentation/workflow/commit-messages.md index 0ecbba9f56e..dce81389aeb 100644 --- a/Documentation/workflow/commit-messages.md +++ b/Documentation/workflow/commit-messages.md @@ -306,7 +306,7 @@ the bump. `Fixes: ` is used to indicate that a bug located at a specific URL is fixed by the commit. *Full* URLs are to be used, *not* GitHub abbreviations, as just because GitHub is used this week doesn't mean it will continue to use GitHub -for the infinite future. (GitHub is already Xamarin.Android's *third* bug +for the infinite future. (GitHub is already .NET for Android's *third* bug repo, after `bugzilla.novell.com` and `bugzilla.xamarin.com`...) Links to private bugs may be used. diff --git a/Localize/loc/cs/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/cs/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 52b0107a572..16081ae2044 100644 --- a/Localize/loc/cs/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/cs/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/cs/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/cs/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index acac682f49e..b36127d73b7 100644 --- a/Localize/loc/cs/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/cs/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/cs/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/cs/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index e052c5844d3..720a7b33233 100644 --- a/Localize/loc/cs/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/cs/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/cs/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/cs/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index 93330274d28..11cf1030864 100644 --- a/Localize/loc/cs/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/cs/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 4f72adfa211..dfba70110a6 100644 --- a/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,7 +647,7 @@ - + @@ -677,7 +677,7 @@ - + @@ -809,7 +809,7 @@ - + @@ -1163,7 +1163,7 @@ - + @@ -1175,7 +1175,7 @@ - + @@ -1463,7 +1463,7 @@ - + @@ -1604,7 +1604,7 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> Android > Správce sady Android SDK…), nebo změňte projekt .NET pro Android tak, aby cílil na nainstalovanou verzi rozhraní API.]]> diff --git a/Localize/loc/de/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/de/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index ccc38b17ce8..85c31f56368 100644 --- a/Localize/loc/de/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/de/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/de/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/de/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index 4554e57d70d..4101e2e8015 100644 --- a/Localize/loc/de/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/de/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/de/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/de/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index 07263d14e26..1e5bdf18b0c 100644 --- a/Localize/loc/de/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/de/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/de/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/de/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index 051354519f1..d3a6fde5d26 100644 --- a/Localize/loc/de/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/de/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 9a067d7be4b..7ff6d576d3b 100644 --- a/Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,9 +647,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,9 +1604,9 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> - Android > Android SDK-Manager...), oder ändern Sie das .NET Android-Projekt so, dass es auf eine installierte API-Version abzielt.]]> + Android > Android SDK-Manager...), oder ändern Sie das .NET for Android-Projekt so, dass es auf eine installierte API-Version abzielt.]]> Android > Android SDK Manager...]]> diff --git a/Localize/loc/es/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/es/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 245bbc81f49..bbab22f6338 100644 --- a/Localize/loc/es/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/es/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/es/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/es/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index 071d051ee7e..1904d36ac93 100644 --- a/Localize/loc/es/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/es/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/es/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/es/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index 0b714eb2013..208e3625e8e 100644 --- a/Localize/loc/es/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/es/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/es/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/es/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index 4cf212127e0..f41c587538c 100644 --- a/Localize/loc/es/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/es/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index a922f38e6c9..21f68ad78f1 100644 --- a/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,9 +647,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,9 +1604,9 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> - Android > Android SDK Manager...) o cambie el proyecto .NET Android para que se dirija a una versión de la API que esté instalada.]]> + Android > Android SDK Manager...) o cambie el proyecto .NET for Android para que se dirija a una versión de la API que esté instalada.]]> Android > Android SDK Manager...]]> diff --git a/Localize/loc/fr/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/fr/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 7cd426dd8c6..c9097dc1491 100644 --- a/Localize/loc/fr/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/fr/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/fr/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/fr/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index 20c7e57e550..9d9f0d3f3b7 100644 --- a/Localize/loc/fr/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/fr/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/fr/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/fr/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index c528655f4da..10348f86b8d 100644 --- a/Localize/loc/fr/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/fr/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/fr/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/fr/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index 7cc72f920be..e84ddb3df8b 100644 --- a/Localize/loc/fr/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/fr/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 408add91f0c..3db2318e9a1 100644 --- a/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,7 +647,7 @@ - + @@ -677,7 +677,7 @@ - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,7 +1604,7 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> Android > Gestionnaire SDK Android...), ou modifiez le projet Android .NET pour cibler une version d’API installée.]]> diff --git a/Localize/loc/it/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/it/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 8d36ce10737..dab1dc57615 100644 --- a/Localize/loc/it/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/it/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/it/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/it/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index d8af08002c1..24c480aecef 100644 --- a/Localize/loc/it/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/it/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/it/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/it/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index 0bd53710f19..16f7b0149ee 100644 --- a/Localize/loc/it/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/it/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/it/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/it/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index 69d1ecebe53..25b39d07115 100644 --- a/Localize/loc/it/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/it/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index c29ad147311..5d366d9aabd 100644 --- a/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,9 +647,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,7 +1604,7 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> Android > Gestione Android SDK...) oppure modifica il progetto Android .NET in modo che sia destinato a una versione API installata.]]> diff --git a/Localize/loc/ja/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ja/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 33bf4ab0ddc..ee38bedac82 100644 --- a/Localize/loc/ja/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ja/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/ja/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ja/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index d9cbd362e92..7c3a40812d9 100644 --- a/Localize/loc/ja/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ja/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/ja/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ja/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index 38e3d73d4bf..a4d773d9d71 100644 --- a/Localize/loc/ja/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ja/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/ja/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ja/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index ce06d746d99..d364ccd33d2 100644 --- a/Localize/loc/ja/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ja/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 059b9b5fd86..17ce130f0fb 100644 --- a/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,9 +647,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,9 +1604,9 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> - [Android]5D; > [Android SDK マネージャー]5D;...) にインストールするか、インストールされている API バージョンを対象とするように .NET Android プロジェクトを変更してください。]]> + [Android]5D; > [Android SDK マネージャー]5D;...) にインストールするか、インストールされている API バージョンを対象とするように .NET for Android プロジェクトを変更してください。]]> Android > Android SDK Manager...]]> diff --git a/Localize/loc/ko/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ko/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index adfec74199d..2061df50acc 100644 --- a/Localize/loc/ko/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ko/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/ko/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ko/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index 4d4b5301fa5..40c8be1b3b9 100644 --- a/Localize/loc/ko/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ko/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/ko/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ko/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index 72ea85ed523..87ce30590c3 100644 --- a/Localize/loc/ko/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ko/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/ko/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ko/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index f937f117a09..308a8c98357 100644 --- a/Localize/loc/ko/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ko/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 53100b85d09..09add6f3cad 100644 --- a/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,9 +647,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,9 +1604,9 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> - Android > Android SDK 관리자...) 설치된 API 버전을 대상으로 하도록 .NET Android 프로젝트를 변경합니다.]]> + Android > Android SDK 관리자...) 설치된 API 버전을 대상으로 하도록 .NET for Android 프로젝트를 변경합니다.]]> Android > Android SDK Manager...]]> diff --git a/Localize/loc/pl/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/pl/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 5511eaf6841..172af532103 100644 --- a/Localize/loc/pl/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/pl/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/pl/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/pl/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index 2017bd08902..e730f2a14f9 100644 --- a/Localize/loc/pl/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/pl/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/pl/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/pl/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index 795efba7211..f7cd759e9f3 100644 --- a/Localize/loc/pl/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/pl/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/pl/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/pl/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index 73500ddff20..2678ca9f4be 100644 --- a/Localize/loc/pl/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/pl/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 58c4816cd3c..e5c612cb56c 100644 --- a/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,7 +647,7 @@ - + @@ -677,7 +677,7 @@ - + @@ -809,7 +809,7 @@ - + @@ -1163,7 +1163,7 @@ - + @@ -1175,7 +1175,7 @@ - + @@ -1463,7 +1463,7 @@ - + @@ -1604,7 +1604,7 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> Android > Menedżer zestawów Android SDK...) lub zmień projekt platformy .NET dla systemu Android, tak aby był przeznaczony dla zainstalowanej wersji interfejsu API.]]> diff --git a/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 003c2c4f2c4..c6172bc98fc 100644 --- a/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index 16a30a08685..c1ea4044c6e 100644 --- a/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index bfd7a2171bf..c743b674063 100644 --- a/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/pt-BR/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/pt-BR/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/pt-BR/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index d5350adb1ec..72b92330479 100644 --- a/Localize/loc/pt-BR/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/pt-BR/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 2885eae782c..b6d770643f6 100644 --- a/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,7 +647,7 @@ - + @@ -677,7 +677,7 @@ - + @@ -809,7 +809,7 @@ - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,7 +1604,7 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> Android > Gerenciador de SDK Android...) ou altere o projeto do Android .NET para direcionar a uma versão de API instalada.]]> diff --git a/Localize/loc/ru/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ru/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index afe33e53302..f0d12afb5af 100644 --- a/Localize/loc/ru/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ru/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/ru/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ru/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index 3121a135fe2..5815415b3a6 100644 --- a/Localize/loc/ru/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ru/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/ru/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ru/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index db682415e81..58a0f548c90 100644 --- a/Localize/loc/ru/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ru/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/ru/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/ru/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index 3116d85f05d..fb4ffafeebd 100644 --- a/Localize/loc/ru/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/ru/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,7 +20,7 @@ - + diff --git a/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 7021ebf5dc7..e116369282a 100644 --- a/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,9 +647,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,9 +1604,9 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> - Android > Диспетчер SDK Android...) или измените проект .NET Android, выбрав для него в качестве цели установленную версию API.]]> + Android > Диспетчер SDK Android...) или измените проект .NET for Android, выбрав для него в качестве цели установленную версию API.]]> Android > Android SDK Manager...]]> diff --git a/Localize/loc/tr/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/tr/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 5a7c26ba404..2e73d370e23 100644 --- a/Localize/loc/tr/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/tr/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/tr/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/tr/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index c117a339495..0fea9f63a2a 100644 --- a/Localize/loc/tr/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/tr/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/tr/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/tr/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index 4b6f88d48c1..5e9cd9cbe16 100644 --- a/Localize/loc/tr/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/tr/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/tr/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/tr/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index 689c9319afc..21f18eb647c 100644 --- a/Localize/loc/tr/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/tr/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 219d22c07b5..0f5884571da 100644 --- a/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,9 +647,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,9 +1604,9 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> - Android > Android SDK Yöneticisi...) veya .NET Android projesini, yüklü bir API sürümünü hedefleyecek şekilde değiştirin.]]> + Android > Android SDK Yöneticisi...) veya .NET for Android projesini, yüklü bir API sürümünü hedefleyecek şekilde değiştirin.]]> Android > Android SDK Manager...]]> diff --git a/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 3ef3b544b4f..e8f6c532522 100644 --- a/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index 73afe8dcb4b..448448d5d5b 100644 --- a/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index cec93a93ccf..f448e0b4373 100644 --- a/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index fbe60394f69..dfb2e30f559 100644 --- a/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/zh-Hans/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 403aa1b0888..81d583a8e46 100644 --- a/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,9 +647,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,9 +1604,9 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> - Android > Android SDK 管理器...)，要么将 .NET Android 项目更改为面向已安装的 API 版本。]]> + Android > Android SDK 管理器...)，要么将 .NET for Android 项目更改为面向已安装的 API 版本。]]> Android > Android SDK Manager...]]> diff --git a/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl index 0fdb8439e19..841b20e0343 100644 --- a/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl index 78cb09b0a8d..8dd2943c076 100644 --- a/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl index c2422aba96c..62bbbfc100c 100644 --- a/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl index 565cb8d570c..25f6e4ef72a 100644 --- a/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl +++ b/Localize/loc/zh-Hant/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl @@ -20,9 +20,9 @@ - + - + diff --git a/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 0fd0ba603af..70ad62783da 100644 --- a/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -647,9 +647,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -809,9 +809,9 @@ - + - + @@ -1163,9 +1163,9 @@ - + - + @@ -1175,9 +1175,9 @@ - + - + @@ -1463,9 +1463,9 @@ - + - + @@ -1604,9 +1604,9 @@ - Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]> + Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]> - Android > Android SDK 管理員...)，或將 .NET Android 專案變更為針對已安裝的 API 版本為目標。]]> + Android > Android SDK 管理員...)，或將 .NET for Android 專案變更為針對已安裝的 API 版本為目標。]]> Android > Android SDK Manager...]]> diff --git a/SECURITY.md b/SECURITY.md index 18a83015c7e..868cc8e536b 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,7 +2,8 @@ ## Supported Versions -The Xamarin.Android support policy, including supported versions, can be found at the [Xamarin Support Policy](https://dotnet.microsoft.com/platform/support/policy/xamarin). +The .NET for Android support policy, including supported versions, can be found at +[.NET Multi-platform App UI (.NET MAUI) Support Policy](https://dotnet.microsoft.com/en-us/platform/support/policy/maui). ## Reporting a Vulnerability diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/JdkInfo.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/JdkInfo.cs index 2095f5b21c4..2b5d28ba39c 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/JdkInfo.cs +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/JdkInfo.cs @@ -47,7 +47,7 @@ public override bool Execute () .FirstOrDefault (); if (jdk == null) { - Log.LogError ($"Could not determine a valid JavaSdkPath, `{androidSdk.JavaSdkPath}` was not compatible with the Xamarin.Android build."); + Log.LogError ($"Could not determine a valid JavaSdkPath, `{androidSdk.JavaSdkPath}` was not compatible with the .NET for Android build."); return false; } else { Log.LogMessage (MessageImportance.Low, $" {nameof (jdk.HomePath)}: {jdk.HomePath}"); diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index ba9400f54fb..1718b39ba17 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -1,4 +1,4 @@ -# Xamarin.Android Nightly Pipeline +# .NET for Android Nightly Pipeline name: $(Build.SourceBranchName)-$(Build.SourceVersion)-$(Rev:r) diff --git a/build-tools/automation/azure-pipelines-release-trigger.yaml b/build-tools/automation/azure-pipelines-release-trigger.yaml index 8e197d55709..4a93bf90129 100644 --- a/build-tools/automation/azure-pipelines-release-trigger.yaml +++ b/build-tools/automation/azure-pipelines-release-trigger.yaml @@ -1,4 +1,4 @@ -# Xamarin.Android Release Definition Trigger +# .NET for Android Release Definition Trigger name: $(Build.SourceBranchName)-$(Build.SourceVersion)-$(Rev:r) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 4cedf139685..ec9f674a79c 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -1,4 +1,4 @@ -# Xamarin.Android Pipeline +# .NET for Android Pipeline name: $(Build.SourceBranchName)-$(Build.SourceVersion)-$(Rev:r) diff --git a/build-tools/automation/onelocbuild.yaml b/build-tools/automation/onelocbuild.yaml index 9cf98d07f20..446991d0b22 100644 --- a/build-tools/automation/onelocbuild.yaml +++ b/build-tools/automation/onelocbuild.yaml @@ -1,4 +1,4 @@ -# Xamarin.Android OneLocBuild +# .NET for Android OneLocBuild name: $(Build.SourceBranchName)-$(Build.SourceVersion)-$(Rev:r) diff --git a/build-tools/debian-metadata/control b/build-tools/debian-metadata/control index 753b1f60406..4b8c193ba73 100644 --- a/build-tools/debian-metadata/control +++ b/build-tools/debian-metadata/control @@ -11,10 +11,10 @@ Vcs-Browser: https://github.com/xamarin/xamarin-android Package: xamarin.android-oss Architecture: amd64 Depends: msbuild, java8-sdk, ${cli:Depends}, ${misc:Depends}, ${shlibs:Depends} -Description: Xamarin.Android libraries and runtime (host component) +Description: .NET for Android libraries and runtime (host component) The best way to build native Android apps. . - * Ship native Android packages. Xamarin.Android uses just-in-time + * Ship native Android packages. .NET for Android uses just-in-time compilation for sophisticated runtime optimization of your app’s performance, meaning your app is a native Android APK. * Access any Android API, including new form factors. We bring 100% of diff --git a/build-tools/scripts/generate-pinvoke-tables.sh b/build-tools/scripts/generate-pinvoke-tables.sh index e0136d126f1..9e9e26aa05e 100755 --- a/build-tools/scripts/generate-pinvoke-tables.sh +++ b/build-tools/scripts/generate-pinvoke-tables.sh @@ -23,7 +23,7 @@ Usage: ${MY_NAME} [OPTIONS] where OPTIONS are one or more of: - -c|--ci indicates that the script runs on one of the Xamarin.Android CI build + -c|--ci indicates that the script runs on one of the .NET for Android CI build servers. This affects selection of the compiler -t|--test-only indicate that the script should not replace the target file but merely test whether the file is different to the newly generated one diff --git a/build-tools/xaprepare/README.md b/build-tools/xaprepare/README.md index f7b14c52635..1d0fc5452e2 100644 --- a/build-tools/xaprepare/README.md +++ b/build-tools/xaprepare/README.md @@ -1,7 +1,7 @@ **Table of Contents** -- [Xamarin.Android build preparation utility](#xamarinandroid-build-preparation-utility) +- [.NET for Android build preparation utility](#xamarinandroid-build-preparation-utility) - [Introduction](#introduction) - [Why?](#why) - [Supported operating systems](#supported-operating-systems) @@ -18,11 +18,11 @@ - [Log files](#log-files) -# Xamarin.Android build preparation utility +# .NET for Android build preparation utility ## Introduction -The task and purpose of this utility is to prepare the `Xamarin.Android` source tree for build by +The task and purpose of this utility is to prepare the .NET for Android source tree for build by performing a number of steps which need to be done only once (or very few and far between) mostly after the repository is freshly cloned. @@ -32,7 +32,7 @@ The utility is written in C# as a .NET 4.7 console app and does not depend on an ## Why? The utility replaces older system which was implemented using a vast collection of MSBuild projects, -target files, property files distributed around the `Xamarin.Android` source tree which caused the following, +target files, property files distributed around the .NET for Android source tree which caused the following, but not limited to, problems: - MSBuild doesn't very well interface with 3rd party build systems, which caused the need to employ a number @@ -72,7 +72,7 @@ The utility requires that the following is present on the host system: ## Build configuration -The utility is designed to make it easy(-ier) to change all aspects of `Xamarin.Android` build preparation process including, +The utility is designed to make it easy(-ier) to change all aspects of .NET for Android build preparation process including, but not limited to: - Android API levels @@ -97,15 +97,15 @@ utility is built on that particular operating system. The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndData) directory and are briefly described below. - [AbiNames.cs](xaprepare/ConfigAndData/AbiNames.cs) - Rarely modified, contains all the target ABI names as used throughout the `Xamarin.Android` source as well as a number of + Rarely modified, contains all the target ABI names as used throughout the .NET for Android source as well as a number of helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may break the build! - [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs) Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API - identifiers and `Xamarin.Android` framework names corresponding to specific API levels. The file also contains specification + identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification of minimum NDK API levels used for all the Android device targets. - [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs) - A file with constants containing paths to licenses commonly used by software `Xamarin.Android` uses. The licenses are used + A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used when generating Third Party Notices. - [Configurables](xaprepare/ConfigAndData/Configurables.cs) The file (and its OS-specific companions) contain all of the tunable bits and pieces of configuration that affect various @@ -113,7 +113,7 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa `Configurables.Defaults` - [Runtimes.cs](xaprepare/ConfigAndData/Runtimes.cs) This file defines **all** of the Mono runtimes, BCL (Base Class Library) assemblies, utilities and components used by - `Xamarin.Android` in the build as well as generated as part of the build for inclusion in bundles and installers. + .NET for Android in the build as well as generated as part of the build for inclusion in bundles and installers. - [Dependencies/*.cs](xaprepare/ConfigAndData/Dependencies) Files in this directory contain dependencies (program and package names + versions) for all the supported operating systems. @@ -123,7 +123,7 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa The utility employs the abstraction of "scenarios" which are collections of various steps to perform in order to achieve a specific goal. The main scenario is named `Standard` and is the default one if no other scenario is named on the command line -(by using the `-s NAME` parameter). You can list all the scenarios by issuing the following command from the root of `Xamarin.Android` +(by using the `-s NAME` parameter). You can list all the scenarios by issuing the following command from the root of .NET for Android source tree: ``` @@ -133,7 +133,7 @@ make PREPARE_ARGS=--ls ### Invocation In order to run the preparation utility on your development machine, all you need to do is to invoke the following command from -the root of the `Xamarin.Android` source tree: +the root of the .NET for Android source tree: ``` make prepare diff --git a/build-tools/xaprepare/xaprepare/Application/Context.cs b/build-tools/xaprepare/xaprepare/Application/Context.cs index 97b948a6f1e..c69daa66c5b 100644 --- a/build-tools/xaprepare/xaprepare/Application/Context.cs +++ b/build-tools/xaprepare/xaprepare/Application/Context.cs @@ -183,7 +183,7 @@ partial class Context : AppObject public Characters Characters => characters ?? throw new InvalidOperationException ("Context not initialized properly (was .Init called?)"); /// - /// Xamarin.Android version + /// .NET for Android version /// public string ProductVersion => productVersion; @@ -259,14 +259,14 @@ public bool UseColor { } /// - /// Prefix where Xamarin.Android is installed + /// Prefix where .NET for Android is installed /// public string XAInstallPrefix { get { if (String.IsNullOrEmpty (xaInstallPrefix)) { xaInstallPrefix = Properties.GetRequiredValue (KnownProperties.XAInstallPrefix); if (String.IsNullOrEmpty (xaInstallPrefix)) - throw new InvalidOperationException ("Xamarin.Android install prefix property has an empty value or is absent"); + throw new InvalidOperationException (".NET for Android install prefix property has an empty value or is absent"); } return xaInstallPrefix!; } diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs index 983403a1cfb..3166791081f 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs @@ -7,7 +7,7 @@ namespace Xamarin.Android.Prepare // This class exists so that nobody has to jump around the source in order to find an URL to modify, a setting to // tweak etc. Code that uses those configurables is all over the place, but the source of the data is here and only // here it has to be changed if need be. The entries should be something that might have to be changed by somebody - // not familiar with the entirety of Xamarin.Android or a developer not usually involved in build system + // not familiar with the entirety of .NET for Android or a developer not usually involved in build system // maintenance/development. // // When adding entries here, try to make their names clear and unambiguous. Don't hesitate using comments (doc diff --git a/build-tools/xaprepare/xaprepare/Main.cs b/build-tools/xaprepare/xaprepare/Main.cs index a989f64d8f6..3233633feb4 100644 --- a/build-tools/xaprepare/xaprepare/Main.cs +++ b/build-tools/xaprepare/xaprepare/Main.cs @@ -85,7 +85,7 @@ static async Task Run (string[] args) var opts = new OptionSet { "Usage: xaprepare [OPTIONS]", - $"Xamarin.Android v{BuildInfo.XAVersion} preparation utility", + $".NET for Android v{BuildInfo.XAVersion} preparation utility", "", {"p|property={=}", "Set a {PROPERTY} to a {VALUE}", (string p, string v) => Context.Instance.Properties.Set (p, v) }, {"d|dump-properties", "Dump values of all the defined properties to the screen", v => parsedOptions.DumpProps = true }, @@ -101,7 +101,7 @@ static async Task Run (string[] args) {"c|configuration=", $"Build {{CONFIGURATION}}. Default: {Context.Instance.Configuration}", v => parsedOptions.Configuration = v?.Trim ()}, {"refresh:", "[sdk,ndk] Comma separated list of components which should be reinstalled. Defaults to all supported components if no value is provided.", v => parsedOptions.RefreshList = ParseRefreshableComponents (v?.Trim () ?? String.Empty)}, "", - {"auto-provision=", $"Automatically install software required by Xamarin.Android", v => parsedOptions.AutoProvision = ParseBoolean (v)}, + {"auto-provision=", $"Automatically install software required by .NET for Android", v => parsedOptions.AutoProvision = ParseBoolean (v)}, {"auto-provision-uses-sudo=", $"Allow use of sudo(1) when provisioning", v => parsedOptions.AutoProvisionUsesSudo = ParseBoolean (v)}, {"ignore-max-mono-version=", $"Ignore the maximum supported Mono version restriction", v => parsedOptions.IgnoreMaxMonoVersion = ParseBoolean (v)}, {"ignore-min-mono-version=", $"Ignore the minimum supported Mono version restriction", v => parsedOptions.IgnoreMinMonoVersion = ParseBoolean (v)}, diff --git a/build-tools/xaprepare/xaprepare/OperatingSystems/Linux.cs b/build-tools/xaprepare/xaprepare/OperatingSystems/Linux.cs index 24fcb94851f..6cba23c958e 100644 --- a/build-tools/xaprepare/xaprepare/OperatingSystems/Linux.cs +++ b/build-tools/xaprepare/xaprepare/OperatingSystems/Linux.cs @@ -12,11 +12,11 @@ abstract partial class Linux : Unix The module makes it possible to execute non-Linux binaries if the appropriate interpreter for the given format is available. Your machine is configured to handle Windows PE executables either via Mono or -Wine. It will make the Xamarin.Android build fail IF you choose to build the +Wine. It will make the .NET for Android build fail IF you choose to build the Windows cross-compilers by enabling the 'mxe-Win32' or 'mxe-Win64' host targets. You can disable the binfmt_misc module by issuing the following command as root -before building Xamarin.Android: +before building .NET for Android: echo 0 > /proc/sys/fs/binfmt_misc/status diff --git a/build-tools/xaprepare/xaprepare/OperatingSystems/OS.cs b/build-tools/xaprepare/xaprepare/OperatingSystems/OS.cs index 370b798fdf4..91c4247851f 100644 --- a/build-tools/xaprepare/xaprepare/OperatingSystems/OS.cs +++ b/build-tools/xaprepare/xaprepare/OperatingSystems/OS.cs @@ -17,7 +17,7 @@ abstract class OS : AppObject public abstract string Type { get; } /// - /// List of programs Xamarin.Android depends on when running on the particular OS + /// List of programs .NET for Android depends on when running on the particular OS /// public abstract List Dependencies { get; } diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs index 5ffb59a67c9..a0de8256a5d 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs @@ -199,19 +199,19 @@ bool OpenJDKExistsAndIsValid (string installDir, out string? installedVersion) string xaVersionFile = Path.Combine (installDir, XAVersionInfoFile); if (!File.Exists (xaVersionFile)) { installedVersion = cv; - Log.DebugLine ($"Unable to find Xamarin.Android version file {xaVersionFile}"); + Log.DebugLine ($"Unable to find .NET for Android version file {xaVersionFile}"); return false; } lines = File.ReadAllLines (xaVersionFile); if (lines == null || lines.Length == 0) { - Log.DebugLine ($"Xamarin.Android version file {xaVersionFile} is empty, cannot determine release version"); + Log.DebugLine ($".NET for Android version file {xaVersionFile} is empty, cannot determine release version"); return false; } string rv = lines[0].Trim (); if (String.IsNullOrEmpty (rv)) { - Log.DebugLine ($"Xamarin.Android version file {xaVersionFile} does not contain release version information"); + Log.DebugLine ($".NET for Android version file {xaVersionFile} does not contain release version information"); return false; } diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs index 48f3bf38e94..e819576574f 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs @@ -8,10 +8,10 @@ namespace Xamarin.Android.Prepare partial class Step_InstallGNUBinutils : StepWithDownloadProgress { static readonly string[]? WindowsExtensions = {".exe", ".cmd"}; - static readonly string ProductName = $"Xamarin.Android Toolchain {Configurables.Defaults.BinutilsVersion}"; + static readonly string ProductName = $".NET for Android Toolchain {Configurables.Defaults.BinutilsVersion}"; public Step_InstallGNUBinutils () - : base ("Install Xamarin.Android Toolchain") + : base ("Install .NET for Android Toolchain") {} protected override async Task Execute (Context context) diff --git a/build-tools/xaprepare/xaprepare/ToolRunners/ToolRunner.cs b/build-tools/xaprepare/xaprepare/ToolRunners/ToolRunner.cs index c93da4ac55c..b55c7337bad 100644 --- a/build-tools/xaprepare/xaprepare/ToolRunners/ToolRunner.cs +++ b/build-tools/xaprepare/xaprepare/ToolRunners/ToolRunner.cs @@ -44,7 +44,7 @@ protected ToolRunner (Context context, Log? log = null, string? toolPath = null) Log.DebugLine ($"{ToolName} executable path is rooted, using verbatim"); FullToolPath = toolPath; } else { - Log.DebugLine ($"{ToolName} executable path is relative to Xamarin.Android repository root"); + Log.DebugLine ($"{ToolName} executable path is relative to .NET for Android repository root"); FullToolPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, toolPath); } } diff --git a/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs b/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs index f1dd7856e35..0455fce2d6a 100644 --- a/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs +++ b/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs @@ -36,7 +36,7 @@ void GenerateJava (Package package) writer.WriteLine ("/* AUTO-GENERATED FILE. DO NOT MODIFY."); writer.WriteLine (" *"); writer.WriteLine (" * This class was automatically generated by"); - writer.WriteLine (" * Xamarin.Android from the resource data it found."); + writer.WriteLine (" * .NET for Android from the resource data it found."); writer.WriteLine (" * It should not be modified by hand."); writer.WriteLine (" */"); diff --git a/src-ThirdParty/bionic/bionic_futex.hh b/src-ThirdParty/bionic/bionic_futex.hh index 094ec5028ff..50e8ef125c7 100644 --- a/src-ThirdParty/bionic/bionic_futex.hh +++ b/src-ThirdParty/bionic/bionic_futex.hh @@ -1,5 +1,5 @@ /* - * Ported to Xamarin.Android from: https://android.googlesource.com/platform/bionic/+/refs/tags/android-11.0.0_r31/libc/private/bionic_futex.h + * Ported to .NET for Android from: https://android.googlesource.com/platform/bionic/+/refs/tags/android-11.0.0_r31/libc/private/bionic_futex.h */ /* diff --git a/src-ThirdParty/bionic/cxa_guard.cc b/src-ThirdParty/bionic/cxa_guard.cc index 099d8f476eb..3db28f6564d 100644 --- a/src-ThirdParty/bionic/cxa_guard.cc +++ b/src-ThirdParty/bionic/cxa_guard.cc @@ -1,5 +1,5 @@ // -// Ported to Xamarin.Android from: https://android.googlesource.com/platform/bionic/+/refs/tags/android-11.0.0_r31/libc/bionic/__cxa_guard.cpp +// Ported to .NET for Android from: https://android.googlesource.com/platform/bionic/+/refs/tags/android-11.0.0_r31/libc/bionic/__cxa_guard.cpp // /* diff --git a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj index 435a8a73311..ba08c1f2bb8 100644 --- a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj +++ b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.Designer.cs b/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.Designer.cs index e9883a88c78..7368c4d5d51 100644 --- a/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.Designer.cs +++ b/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.Designer.cs @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to 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.. + /// Looks up a localized string similar to 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 .NET for Android once .NET 6 is released.. /// public static string XA2000 { get { diff --git a/src/Microsoft.Android.Sdk.ILLink/README.md b/src/Microsoft.Android.Sdk.ILLink/README.md index b2538148e97..272ba6165f4 100644 --- a/src/Microsoft.Android.Sdk.ILLink/README.md +++ b/src/Microsoft.Android.Sdk.ILLink/README.md @@ -1 +1 @@ -ILLink custom [sub]steps for Xamarin.Android/NET5 +ILLink custom [sub]steps for .NET for Android diff --git a/src/Microsoft.Android.Templates/Microsoft.Android.Templates.csproj b/src/Microsoft.Android.Templates/Microsoft.Android.Templates.csproj index f821e7233e4..3902ae7b218 100644 --- a/src/Microsoft.Android.Templates/Microsoft.Android.Templates.csproj +++ b/src/Microsoft.Android.Templates/Microsoft.Android.Templates.csproj @@ -4,7 +4,7 @@ netstandard2.0 Template Microsoft.Android.Templates - .NET Android Templates + .NET for Android Templates Templates for Android platforms. true false diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.de.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.de.json index c10fa9aad46..1e194f6ce2f 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.de.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.de.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android-Java-Bibliotheksbindung", - "description": "Ein Projekt zum Erstellen einer .NET Android-Klassenbibliothek, die an eine native Java-Bibliothek gebunden wird", + "description": "Ein Projekt zum Erstellen einer .NET for Android-Klassenbibliothek, die an eine native Java-Bibliothek gebunden wird", "symbols/supportedOSVersion/description": "Überschreibt $(SupportedOSPlatformVersion) im Projekt" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.en.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.en.json index 9f148d46e2f..f00354e7311 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.en.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.en.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android Java Library Binding", - "description": "A project for creating a .NET Android class library that binds to a native Java library", + "description": "A project for creating a .NET for Android class library that binds to a native Java library", "symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.es.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.es.json index 99426b9039d..14695d6e136 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.es.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.es.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Enlace de biblioteca Java de Android", - "description": "Proyecto para crear una biblioteca de clases de .NET Android que enlaza a una biblioteca de Java nativa", + "description": "Proyecto para crear una biblioteca de clases de .NET for Android que enlaza a una biblioteca de Java nativa", "symbols/supportedOSVersion/description": "Invalida $(SupportedOSPlatformVersion) en el proyecto" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.it.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.it.json index 81360c8481a..e9598396434 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.it.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.it.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Binding a libreria Java Android", - "description": "Progetto per la creazione di una libreria di classi .NET Android che esegue il binding a una libreria Java nativa.", + "description": "Progetto per la creazione di una libreria di classi .NET for Android che esegue il binding a una libreria Java nativa.", "symbols/supportedOSVersion/description": "Esegue l'override di $(SupportedOSPlatformVersion) nel progetto" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.ja.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.ja.json index b631f07cf93..14952860964 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.ja.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.ja.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android Java ライブラリ バインド", - "description": "ネイティブ Java ライブラリにバインドする .NET Android クラス ライブラリを作成するためのプロジェクト", + "description": "ネイティブ Java ライブラリにバインドする .NET for Android クラス ライブラリを作成するためのプロジェクト", "symbols/supportedOSVersion/description": "プロジェクト ファイルの $(SupportedOSPlatformVersion) をオーバーライドします" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.ko.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.ko.json index d6e0192373c..f8807b03b22 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.ko.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.ko.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android Java 라이브러리 바인딩", - "description": "네이티브 Java 라이브러리에 바인딩하는 .NET Android 클래스 라이브러리를 만들기 위한 프로젝트", + "description": "네이티브 Java 라이브러리에 바인딩하는 .NET for Android 클래스 라이브러리를 만들기 위한 프로젝트", "symbols/supportedOSVersion/description": "프로젝트에서 $(SupportedOSPlatformVersion) 재정의" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.pl.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.pl.json index bf6f251183e..ea11ac66523 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.pl.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.pl.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Powiązanie biblioteki języka Java systemu Android", - "description": "Projekt służący do tworzenia biblioteki klas .NET Android z powiązaniem z natywną biblioteką języka Java", + "description": "Projekt służący do tworzenia biblioteki klas .NET for Android z powiązaniem z natywną biblioteką języka Java", "symbols/supportedOSVersion/description": "Nadpisuje element $(SupportedOSPlatformVersion) w projekcie" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.tr.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.tr.json index f88b2288700..bbd07310298 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.tr.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.tr.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android Java Kitaplığı Bağlaması", - "description": "Yerel bir Java kitaplık dosyasını bağlayan bir .NET Android sınıf kitaplığı oluşturmak için proje.", + "description": "Yerel bir Java kitaplık dosyasını bağlayan bir .NET for Android sınıf kitaplığı oluşturmak için proje.", "symbols/supportedOSVersion/description": "Projedeki $(SupportedOSPlatformVersion) öğesini geçersiz kılar" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.zh-Hans.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.zh-Hans.json index 13ca3fed68b..d532035685d 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.zh-Hans.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android Java 库绑定", - "description": "用于创建绑定到本机 Java 库的 .NET Android 类库的项目", + "description": "用于创建绑定到本机 Java 库的 .NET for Android 类库的项目", "symbols/supportedOSVersion/description": "替代项目中的 $(SupportedOSPlatformVersion)" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.zh-Hant.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.zh-Hant.json index 4178ca96ffb..51d51c5c509 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.zh-Hant.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android Java 程式庫繫結", - "description": "用於建立繫結至原生 Java 程式庫的 .NET Android 類別庫的專案", + "description": "用於建立繫結至原生 Java 程式庫的 .NET for Android 類別庫的專案", "symbols/supportedOSVersion/description": "覆寫專案中的 $(SupportedOSPlatformVersion)" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/template.json b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/template.json index e4fa869c39e..ed4f4c3f476 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/.template.config/template.json +++ b/src/Microsoft.Android.Templates/android-bindinglib/.template.config/template.json @@ -4,7 +4,7 @@ "classifications": [ "Android", "Mobile" ], "identity": "Microsoft.Android.AndroidBinding", "name": "Android Java Library Binding", - "description": "A project for creating a .NET Android class library that binds to a native Java library", + "description": "A project for creating a .NET for Android class library that binds to a native Java library", "shortName": "android-bindinglib", "tags": { "language": "C#", diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.cs.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.cs.json index 0653e0ab530..6ed3ae1faa1 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.cs.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.cs.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Aplikace Android Wear", - "description": "Projekt pro vytvoření aplikace .NET Android Wear", + "description": "Projekt pro vytvoření aplikace .NET for Android Wear", "symbols/packageName/description": "Přepíše název balíčku v souboru AndroidManifest.xml.", "symbols/supportedOSVersion/description": "Přepíše $(SupportedOSPlatformVersion) v projektu." } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.de.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.de.json index 0f77a50e579..be17ed3cbe0 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.de.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.de.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android Wear-Anwendung", - "description": "Ein Projekt zum Erstellen einer .NET Android Wear-Anwendung", + "description": "Ein Projekt zum Erstellen einer .NET for Android Wear-Anwendung", "symbols/packageName/description": "Überschreibt den Paketnamen in der Datei „AndroidManifest.xml“.", "symbols/supportedOSVersion/description": "Überschreibt $(SupportedOSPlatformVersion) im Projekt" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.en.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.en.json index dda40969ffe..29662ebedc4 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.en.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.en.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android Wear Application", - "description": "A project for creating a .NET Android Wear application", + "description": "A project for creating a .NET for Android Wear application", "symbols/packageName/description": "Overrides the package name in the AndroidManifest.xml", "symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.es.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.es.json index 9eb25a227a3..52f2dadeb40 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.es.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.es.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Aplicación Android Wear", - "description": "Proyecto para crear una aplicación .NET Android Wear", + "description": "Proyecto para crear una aplicación .NET for Android Wear", "symbols/packageName/description": "Invalida el nombre del paquete en AndroidManifest.xml", "symbols/supportedOSVersion/description": "Invalida $(SupportedOSPlatformVersion) en el proyecto" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ja.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ja.json index b0e86ea9612..e7f35c659f4 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ja.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ja.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android Wear アプリケーション", - "description": ".NET Android Wear アプリケーションを作成するためのプロジェクト", + "description": ".NET for Android Wear アプリケーションを作成するためのプロジェクト", "symbols/packageName/description": "AndroidManifest.xml のパッケージ名をオーバーライドします", "symbols/supportedOSVersion/description": "プロジェクト ファイルの $(SupportedOSPlatformVersion) をオーバーライドします" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ko.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ko.json index 4a48b429481..e57f1414486 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ko.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ko.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android 웨어 애플리케이션", - "description": ".NET Android Wear 애플리케이션을 만들기 위한 프로젝트", + "description": ".NET for Android Wear 애플리케이션을 만들기 위한 프로젝트", "symbols/packageName/description": "AndroidManifest.xml의 패키지 이름을 재정의합니다.", "symbols/supportedOSVersion/description": "프로젝트에서 $(SupportedOSPlatformVersion) 재정의" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.pl.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.pl.json index 64b59cf011e..97bdcc8754c 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.pl.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.pl.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Aplikacja systemu Android Wear", - "description": "Projekt służący do tworzenia aplikacji .NET Android Wear", + "description": "Projekt służący do tworzenia aplikacji .NET for Android Wear", "symbols/packageName/description": "Przesłania nazwę pakietu w pliku AndroidManifest.xml", "symbols/supportedOSVersion/description": "Nadpisuje element $(SupportedOSPlatformVersion) w projekcie" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.pt-BR.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.pt-BR.json index 0c8041d4aa1..86947fe3eb8 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.pt-BR.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.pt-BR.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Aplicativo Android Wear", - "description": "Um projeto para criar um aplicativo .NET Android Wear", + "description": "Um projeto para criar um aplicativo .NET for Android Wear", "symbols/packageName/description": "Substitui o nome do pacote no AndroidManifest.xml", "symbols/supportedOSVersion/description": "Substitui a $(SupportedOSPlatformVersion) no projeto" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ru.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ru.json index fa041a7e186..e18b0b64a8a 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ru.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.ru.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Приложение Android Wear", - "description": "Проект по созданию приложения .NET Android Wear", + "description": "Проект по созданию приложения .NET for Android Wear", "symbols/packageName/description": "Переопределяет имя пакета в AndroidManifest.xml", "symbols/supportedOSVersion/description": "Переопределяет $(SupportedOSPlatformVersion) в файле проекта" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.tr.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.tr.json index 780f408da75..2e721cbda94 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.tr.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.tr.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android Wear Uygulaması", - "description": ".NET Android Wear uygulaması oluşturmak için proje", + "description": ".NET for Android Wear uygulaması oluşturmak için proje", "symbols/packageName/description": "AndroidManifest.xm öğesindeki paket adını geçersiz kılar", "symbols/supportedOSVersion/description": "Projedeki $(SupportedOSPlatformVersion) öğesini geçersiz kılar" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.zh-Hans.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.zh-Hans.json index d57740f56ac..5550d8b08a9 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.zh-Hans.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android Wear 应用程序", - "description": "用于创建 .NET Android Wear 应用程序的项目", + "description": "用于创建 .NET for Android Wear 应用程序的项目", "symbols/packageName/description": "重写 AndroidManifest.xml 中的包名称", "symbols/supportedOSVersion/description": "替代项目中的 $(SupportedOSPlatformVersion)" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.zh-Hant.json b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.zh-Hant.json index db834f6fa6e..e97827ab06a 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.zh-Hant.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android Wear 應用程式", - "description": "用於建立 .NET Android Wear 應用程式的專案", + "description": "用於建立 .NET for Android Wear 應用程式的專案", "symbols/packageName/description": "覆寫 AndroidManifest.xml 中的套件名稱", "symbols/supportedOSVersion/description": "覆寫專案中的 $(SupportedOSPlatformVersion)" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android-wear/.template.config/template.json b/src/Microsoft.Android.Templates/android-wear/.template.config/template.json index da3e4d3e9c1..d6c79598230 100644 --- a/src/Microsoft.Android.Templates/android-wear/.template.config/template.json +++ b/src/Microsoft.Android.Templates/android-wear/.template.config/template.json @@ -4,7 +4,7 @@ "classifications": [ "Android", "Mobile" ], "identity": "Microsoft.Android.AndroidWearApp", "name": "Android Wear Application", - "description": "A project for creating a .NET Android Wear application", + "description": "A project for creating a Wear OS app using .NET for Android", "shortName": "androidwear", "tags": { "language": "C#", diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.de.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.de.json index 0ffb0fb083e..d9f10a43365 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.de.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.de.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android-Anwendung", - "description": "Ein Projekt zum Erstellen einer .NET Android-Anwendung", + "description": "Ein Projekt zum Erstellen einer .NET for Android-Anwendung", "symbols/packageName/description": "Überschreibt den Paketnamen in der Datei „AndroidManifest.xml“.", "symbols/supportedOSVersion/description": "Überschreibt $(SupportedOSPlatformVersion) im Projekt" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.en.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.en.json index f3aca984923..a2c0dd5adc2 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.en.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.en.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android Application", - "description": "A project for creating a .NET Android application", + "description": "A project for creating a .NET for Android application", "symbols/packageName/description": "Overrides the package name in the AndroidManifest.xml", "symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.es.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.es.json index 93933074063..15204544a08 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.es.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.es.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Aplicación de Android", - "description": "Proyecto para crear una aplicación .NET Android", + "description": "Proyecto para crear una aplicación .NET for Android", "symbols/packageName/description": "Invalida el nombre del paquete en AndroidManifest.xml", "symbols/supportedOSVersion/description": "Invalida $(SupportedOSPlatformVersion) en el proyecto" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.fr.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.fr.json index 94202937cac..8d4e4883ef4 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.fr.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.fr.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Application Android", - "description": "Projet pour la création d’une application .NET Android", + "description": "Projet pour la création d’une application .NET for Android", "symbols/packageName/description": "Remplace le nom du package dans le AndroidManifest.xml", "symbols/supportedOSVersion/description": "Remplace $(SupportedOSPlatformVersion) dans le projet" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.ja.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.ja.json index 42beced10be..fd979616272 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.ja.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.ja.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android アプリケーション", - "description": ".NET Android アプリケーションを作成するためのプロジェクト", + "description": ".NET for Android アプリケーションを作成するためのプロジェクト", "symbols/packageName/description": "AndroidManifest.xml のパッケージ名をオーバーライドします", "symbols/supportedOSVersion/description": "プロジェクト ファイルの $(SupportedOSPlatformVersion) をオーバーライドします" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.ko.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.ko.json index d9aebaee8d8..442862a58c9 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.ko.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.ko.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android 애플리케이션", - "description": ".NET Android 애플리케이션을 만들기 위한 프로젝트", + "description": ".NET for Android 애플리케이션을 만들기 위한 프로젝트", "symbols/packageName/description": "AndroidManifest.xml의 패키지 이름을 재정의합니다.", "symbols/supportedOSVersion/description": "프로젝트에서 $(SupportedOSPlatformVersion) 재정의" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.pl.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.pl.json index e9e4593537a..197240b8392 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.pl.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.pl.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Aplikacja systemu Android", - "description": "Projekt służący do tworzenia aplikacji .NET Android", + "description": "Projekt służący do tworzenia aplikacji .NET for Android", "symbols/packageName/description": "Przesłania nazwę pakietu w pliku AndroidManifest.xml", "symbols/supportedOSVersion/description": "Nadpisuje element $(SupportedOSPlatformVersion) w projekcie" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.tr.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.tr.json index 3895aacc51d..0853713d743 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.tr.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.tr.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android Uygulaması", - "description": ".NET Android uygulaması oluşturmak için proje", + "description": ".NET for Android uygulaması oluşturmak için proje", "symbols/packageName/description": "AndroidManifest.xm öğesindeki paket adını geçersiz kılar", "symbols/supportedOSVersion/description": "Projedeki $(SupportedOSPlatformVersion) öğesini geçersiz kılar" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.zh-Hans.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.zh-Hans.json index 26578e0e31d..1762f6b4aa6 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.zh-Hans.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android 应用程序", - "description": "用于创建 .NET Android 应用程序的项目", + "description": "用于创建 .NET for Android 应用程序的项目", "symbols/packageName/description": "重写 AndroidManifest.xml 中的包名称", "symbols/supportedOSVersion/description": "替代项目中的 $(SupportedOSPlatformVersion)" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.zh-Hant.json b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.zh-Hant.json index 182fe1720fe..556f4b6b028 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.zh-Hant.json @@ -1,7 +1,7 @@ { "author": "Microsoft", "name": "Android 應用程式", - "description": "用於建立 .NET Android 應用程式的專案", + "description": "用於建立 .NET for Android 應用程式的專案", "symbols/packageName/description": "覆寫 AndroidManifest.xml 中的套件名稱", "symbols/supportedOSVersion/description": "覆寫專案中的 $(SupportedOSPlatformVersion)" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/android/.template.config/template.json b/src/Microsoft.Android.Templates/android/.template.config/template.json index 3ec8155afa1..e8cf8ecfdc5 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/template.json +++ b/src/Microsoft.Android.Templates/android/.template.config/template.json @@ -4,7 +4,7 @@ "classifications": [ "Android", "Mobile" ], "identity": "Microsoft.Android.AndroidApp", "name": "Android Application", - "description": "A project for creating a .NET Android application", + "description": "A project for creating a .NET for Android application", "shortName": "android", "tags": { "language": "C#", diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.de.json b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.de.json index 74b0baf6e71..4a615bbf879 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.de.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.de.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android-Klassenbibliothek", - "description": "Ein Projekt zum Erstellen einer .NET Android-Klassenbibliothek", + "description": "Ein Projekt zum Erstellen einer .NET for Android-Klassenbibliothek", "symbols/supportedOSVersion/description": "Überschreibt $(SupportedOSPlatformVersion) im Projekt" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.en.json b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.en.json index 9ff26a5cf72..a75cc4e346d 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.en.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.en.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android Class Library", - "description": "A project for creating a .NET Android class library", + "description": "A project for creating a .NET for Android class library", "symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.es.json b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.es.json index 20ce9d2d703..fa0a7bcf9d8 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.es.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.es.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Biblioteca de clases de Android", - "description": "Proyecto para crear una biblioteca de clases .NET Android", + "description": "Proyecto para crear una biblioteca de clases .NET for Android", "symbols/supportedOSVersion/description": "Invalida $(SupportedOSPlatformVersion) en el proyecto" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.ja.json b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.ja.json index 252afd9d961..c622ab51098 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.ja.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.ja.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android クラス ライブラリ", - "description": ".NET Android クラス ライブラリを作成するためのプロジェクト", + "description": ".NET for Android クラス ライブラリを作成するためのプロジェクト", "symbols/supportedOSVersion/description": "プロジェクト ファイルの $(SupportedOSPlatformVersion) をオーバーライドします" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.ko.json b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.ko.json index ba4a18ecd9f..4a28858c4e8 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.ko.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.ko.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android 클래스 라이브러리", - "description": ".NET Android 클래스 라이브러리를 만들기 위한 프로젝트", + "description": ".NET for Android 클래스 라이브러리를 만들기 위한 프로젝트", "symbols/supportedOSVersion/description": "프로젝트에서 $(SupportedOSPlatformVersion) 재정의" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.pl.json b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.pl.json index bfd57e33ebd..1771aa4ea2c 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.pl.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.pl.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Biblioteka klas systemu Android", - "description": "Projekt służący do tworzenia biblioteki klas .NET Android", + "description": "Projekt służący do tworzenia biblioteki klas .NET for Android", "symbols/supportedOSVersion/description": "Nadpisuje element $(SupportedOSPlatformVersion) w projekcie" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.tr.json b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.tr.json index a2455d556ad..db0b378e4bb 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.tr.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.tr.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android Sınıf Kitaplığı", - "description": ".NET Android sınıf kitaplığı oluşturmak için proje", + "description": ".NET for Android sınıf kitaplığı oluşturmak için proje", "symbols/supportedOSVersion/description": "Projedeki $(SupportedOSPlatformVersion) öğesini geçersiz kılar" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.zh-Hans.json b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.zh-Hans.json index ca088386437..770bcf7f48e 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.zh-Hans.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android 类库", - "description": "用于创建 .NET Android类库的项目", + "description": "用于创建 .NET for Android类库的项目", "symbols/supportedOSVersion/description": "替代项目中的 $(SupportedOSPlatformVersion)" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.zh-Hant.json b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.zh-Hant.json index 1fb871023ee..6f36b0b756e 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.zh-Hant.json @@ -1,6 +1,6 @@ { "author": "Microsoft", "name": "Android 類別庫", - "description": "用於建立 .NET Android 類別庫的專案", + "description": "用於建立 .NET for Android 類別庫的專案", "symbols/supportedOSVersion/description": "覆寫專案中的 $(SupportedOSPlatformVersion)" } \ No newline at end of file diff --git a/src/Microsoft.Android.Templates/androidlib/.template.config/template.json b/src/Microsoft.Android.Templates/androidlib/.template.config/template.json index d13615ce6fd..c1e6a4a499c 100644 --- a/src/Microsoft.Android.Templates/androidlib/.template.config/template.json +++ b/src/Microsoft.Android.Templates/androidlib/.template.config/template.json @@ -4,7 +4,7 @@ "classifications": [ "Android", "Mobile" ], "identity": "Microsoft.Android.AndroidLib", "name": "Android Class Library", - "description": "A project for creating a .NET Android class library", + "description": "A project for creating a .NET for Android class library", "shortName": "androidlib", "tags": { "language": "C#", diff --git a/src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in b/src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in index 6c392e8130f..fee83c88b9c 100644 --- a/src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in +++ b/src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in @@ -13,7 +13,7 @@ using System.Runtime.Versioning; [assembly: AssemblyInformationalVersion ("@PACKAGE_VERSION@.@PACKAGE_VERSION_BUILD@; git-rev-head:@PACKAGE_HEAD_REV@; git-branch:@PACKAGE_HEAD_BRANCH@")] [assembly: AssemblyTitle ("Mono.Android.Runtime.dll")] -[assembly: AssemblyProduct ("Xamarin.Android")] +[assembly: AssemblyProduct (".NET for Android")] [assembly: AssemblyCompany ("Microsoft Corporation")] [assembly: TargetPlatform("Android@API_LEVEL@.0")] [assembly: SupportedOSPlatform("Android@MIN_API_LEVEL@.0")] diff --git a/src/Mono.Android/Android.Runtime/TimingLogger.cs b/src/Mono.Android/Android.Runtime/TimingLogger.cs index e34ec0d701e..b3722924ac0 100644 --- a/src/Mono.Android/Android.Runtime/TimingLogger.cs +++ b/src/Mono.Android/Android.Runtime/TimingLogger.cs @@ -3,7 +3,7 @@ namespace Android.Runtime { /// - /// A class which uses the native Xamarin.Android runtime to accurately measure (to the nanosecond level) time + /// A class which uses the native .NET for Android runtime to accurately measure (to the nanosecond level) time /// spent executing a portion of code bracketed with calls to (or the constructor, by /// default) and . /// Timing messages are logged with the Info priority and the monodroid-timing tag in the @@ -50,7 +50,7 @@ public void Start (string? startMessage = null) /// /// Stop measuring time and log message specified in the parameter. If - /// message is not specified, the Xamarin.Android runtime will use the default message, "Managed + /// message is not specified, the .NET for Android runtime will use the default message, "Managed /// Timing". Time is reported in the following format: /// /// diff --git a/src/Mono.Android/Properties/AssemblyInfo.cs.in b/src/Mono.Android/Properties/AssemblyInfo.cs.in index 100a54ae5c6..14f600a3113 100644 --- a/src/Mono.Android/Properties/AssemblyInfo.cs.in +++ b/src/Mono.Android/Properties/AssemblyInfo.cs.in @@ -14,7 +14,7 @@ using System.Runtime.Versioning; [assembly: AssemblyInformationalVersion ("@PACKAGE_VERSION@.@PACKAGE_VERSION_BUILD@; git-rev-head:@PACKAGE_HEAD_REV@; git-branch:@PACKAGE_HEAD_BRANCH@")] [assembly: AssemblyTitle ("Mono.Android.dll")] -[assembly: AssemblyProduct ("Xamarin.Android")] +[assembly: AssemblyProduct (".NET for Android")] // FIXME: Probably need to add Copyright 2009-2011 Novell Inc. // [assembly: AssemblyCopyright ("Copyright 2011-2014 Xamarin Inc.")] [assembly: AssemblyCompany ("Microsoft Corporation")] diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata index ab46d039d61..5955f86f446 100644 --- a/src/Mono.Android/metadata +++ b/src/Mono.Android/metadata @@ -1465,7 +1465,7 @@ <_RuntimeConfigReservedProperties Include="TRUSTED_PLATFORM_ASSEMBLIES"/> <_RuntimeConfigReservedProperties Include="APP_PATHS"/> diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs index 0c326142438..435a1deedc8 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs @@ -684,7 +684,7 @@ public static string XA1023 { } /// - /// Looks up a localized string similar to Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.. + /// Looks up a localized string similar to Ignoring configuration file '{0}'. .NET configuration files are not supported in .NET for Android projects that target .NET 6 or higher. /// public static string XA1024 { get { @@ -711,7 +711,7 @@ public static string XA1026 { } /// - /// Looks up a localized string similar to Using AAPT is not supported in Xamarin.Android projects that target .NET 6 or higher. Please enable 'Use incremental Android packaging system (aapt2)' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidUseAapt2' MSBuild property to 'true'.. + /// Looks up a localized string similar to Using AAPT is deprecated in favor of AAPT2. Please enable 'Use incremental Android packaging system (aapt2)' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidUseAapt2' MSBuild property to 'true'.. /// public static string XA1026_dotnet { get { @@ -747,7 +747,7 @@ public static string XA1037 { } /// - /// Looks up a localized string similar to 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.. + /// Looks up a localized string similar to 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 .NET for Android once .NET 6 is released. /// public static string XA2000 { get { @@ -1107,7 +1107,7 @@ public static string XA4230 { } /// - /// Looks up a localized string similar to The Android class parser value '{0}' is deprecated and will be removed in a future version of Xamarin.Android. Update the project properties to use 'class-parse'.. + /// Looks up a localized string similar to The Android class parser value '{0}' is deprecated and will be removed in a future version of .NET for Android. Update the project properties to use 'class-parse'.. /// public static string XA4231 { get { @@ -1116,7 +1116,7 @@ public static string XA4231 { } /// - /// Looks up a localized string similar to The Android code generation target '{0}' is deprecated and will be removed in a future version of Xamarin.Android. Update the project properties to use 'XAJavaInterop1'.. + /// Looks up a localized string similar to The Android code generation target '{0}' is deprecated and will be removed in a future version of .NET for Android. Update the project properties to use 'XAJavaInterop1'.. /// public static string XA4232 { get { @@ -1409,7 +1409,7 @@ public static string XA4311 { } /// - /// Looks up a localized string similar to Referencing the Android Wear application project '{0}' from an Android application project is deprecated and will no longer be supported in a future version of Xamarin.Android. Remove the Android Wear application project reference from the Android application project and distribute the Wear application as a standalone application instead.. + /// Looks up a localized string similar to Referencing the Android Wear application project '{0}' from an Android application project is deprecated and will no longer be supported in a future version of .NET for Android. Remove the Android Wear application project reference from the Android application project and distribute the Wear application as a standalone application instead.. /// public static string XA4312 { get { @@ -1528,7 +1528,7 @@ public static string XA5205_Lint { } /// - /// Looks up a localized string similar to Could not find android.jar for API level {0}. This means the Android SDK platform for API level {0} is not installed. Either install it in the Android SDK Manager ({2}), or change the Xamarin.Android project to target an API version that is installed. ({1} missing.). + /// Looks up a localized string similar to Could not find android.jar for API level {0}. This means the Android SDK platform for API level {0} is not installed. {2} See https://aka.ms/xa5207 for more details. /// public static string XA5207 { get { diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx index 9d26ec9a0b0..f82af8244e6 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex Soubor LibraryProjectProperties {0} se nachází v adresáři, který je nadřazený přechodnému výstupnímu adresáři vazebního projektu. Upravte prosím cestu tak, aby se používal původní soubor project.properties přímo z adresáře projektu knihovny Androidu. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -453,7 +453,7 @@ In this message, the term "binding" means a piece of generated code that makes i Ignoruje se konfigurační soubor {0}. Konfigurační soubory .NET se v projektech .NET pro Android, které cílí na .NET 6 nebo vyšší, nepodporují. - The following are literal names and should not be translated: .NET, .NET Android. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx index e8594a22923..a7548c3e726 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex Die LibraryProjectProperties-Datei "{0}" befindet sich in einem übergeordneten Verzeichnis des Zwischenausgabeverzeichnisses für das Bindungsprojekt. Passen Sie den Pfad so an, dass die ursprüngliche Datei "project.properties" direkt aus dem Android-Bibliotheksprojektverzeichnis verwendet wird. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - Die Konfigurationsdatei "{0}" wird ignoriert. .NET-Konfigurationsdateien werden in .NET Android-Projekten, die auf .NET 6 oder höher ausgerichtet sind, nicht unterstützt. - The following are literal names and should not be translated: .NET, .NET Android. + Die Konfigurationsdatei "{0}" wird ignoriert. .NET-Konfigurationsdateien werden in .NET for Android-Projekten, die auf .NET 6 oder höher ausgerichtet sind, nicht unterstützt. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - Die Verwendung von AAPT wird in .NET Android-Projekten, die auf .NET 6 oder höher ausgerichtet sind, nicht unterstützt. Aktivieren Sie "Inkrementelles Android-Paketierungssystem (aapt2) verwenden" in den Visual Studio-Projekteigenschaftsseiten, oder bearbeiten Sie die Projektdatei in einem Text-Editor, und legen Sie die MSBuild-Eigenschaft "AndroidUseAapt2" auf WAHR fest. + Die Verwendung von AAPT wird in .NET for Android-Projekten, die auf .NET 6 oder höher ausgerichtet sind, nicht unterstützt. Aktivieren Sie "Inkrementelles Android-Paketierungssystem (aapt2) verwenden" in den Visual Studio-Projekteigenschaftsseiten, oder bearbeiten Sie die Projektdatei in einem Text-Editor, und legen Sie die MSBuild-Eigenschaft "AndroidUseAapt2" auf WAHR fest. The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -525,7 +525,7 @@ Bitte ändern Sie den Wert in einen Assembly-basierten Typnamen, der von "System {1} - The SupportedOSPlatformVersion property value - Die Verwendung von AppDomain.CreateDomain() wurde in der Assembly {0} erkannt. .NET 6 und höher unterstützt nur eine einzelne AppDomain, sodass diese API nach der Veröffentlichung von .NET 6 nicht mehr in .NET Android verfügbar ist. + Die Verwendung von AppDomain.CreateDomain() wurde in der Assembly {0} erkannt. .NET 6 und höher unterstützt nur eine einzelne AppDomain, sodass diese API nach der Veröffentlichung von .NET 6 nicht mehr in .NET for Android verfügbar ist. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - Der Android-Klassenparserwert "{0}" ist veraltet und wird in einer zukünftigen Version von .NET Android entfernt. Aktualisieren Sie die Projekteigenschaften, um "class-parse" zu verwenden. + Der Android-Klassenparserwert "{0}" ist veraltet und wird in einer zukünftigen Version von .NET for Android entfernt. Aktualisieren Sie die Projekteigenschaften, um "class-parse" zu verwenden. The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - Das Android-Codegenerierungsziel "{0}" ist veraltet und wird in einer zukünftigen Version von .NET Android entfernt. Aktualisieren Sie die Projekteigenschaften, um "XAJavaInterop1" zu verwenden. + Das Android-Codegenerierungsziel "{0}" ist veraltet und wird in einer zukünftigen Version von .NET for Android entfernt. Aktualisieren Sie die Projekteigenschaften, um "XAJavaInterop1" zu verwenden. The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - Das Verweisen auf das Android Wear-Anwendungsprojekt "{0}" aus einem Android-Anwendungsprojekt ist veraltet und wird in einer zukünftigen Version von .NET Android nicht mehr unterstützt. Entfernen Sie den Verweis auf das Android Wear-Anwendungsprojekt aus dem Android-Anwendungsprojekt, und verteilen Sie die Wear-Anwendung stattdessen als eigenständige Anwendung. + Das Verweisen auf das Android Wear-Anwendungsprojekt "{0}" aus einem Android-Anwendungsprojekt ist veraltet und wird in einer zukünftigen Version von .NET for Android nicht mehr unterstützt. Entfernen Sie den Verweis auf das Android Wear-Anwendungsprojekt aus dem Android-Anwendungsprojekt, und verteilen Sie die Wear-Anwendung stattdessen als eigenständige Anwendung. The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. @@ -890,7 +890,7 @@ Weitere Informationen finden Sie unter https://aka.ms/xa5207. {2} - The instructions to install the missing component - Installieren Sie es entweder im Android SDK-Manager (Tools > Android > Android SDK-Manager...), oder ändern Sie das .NET Android-Projekt so, dass es auf eine installierte API-Version abzielt. + Installieren Sie es entweder im Android SDK-Manager (Tools > Android > Android SDK-Manager...), oder ändern Sie das .NET for Android-Projekt so, dass es auf eine installierte API-Version abzielt. This string is the instrucitons to install the component diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx index c9480f4af97..253a86cb330 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex El archivo "LibraryProjectProperties" en "{0}" se encuentra en un directorio principal del directorio de salida intermedio del proyecto de enlaces. Ajuste la ruta de acceso para usar el archivo "project.properties" original directamente desde el directorio del proyecto de la biblioteca de Android. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - Ignorando el archivo de configuración "{0}". Los archivos de configuración .NET no son compatibles con proyectos .NET Android que tengan como objetivo .NET 6 o superior. - The following are literal names and should not be translated: .NET, .NET Android. + Ignorando el archivo de configuración "{0}". Los archivos de configuración .NET no son compatibles con proyectos .NET for Android que tengan como objetivo .NET 6 o superior. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - El uso de AAPT no es compatible con proyectos .NET Android que tengan como objetivo .NET 6 o superior. Habilite "Use el sistema de empaquetado de Android incremental (aapt2)" en las páginas de propiedades del proyecto de Visual Studio o edite el archivo del proyecto en un editor de texto y establezca la propiedad "AndroidUseAapt2" de MSBuild en "true". + El uso de AAPT no es compatible con proyectos .NET for Android que tengan como objetivo .NET 6 o superior. Habilite "Use el sistema de empaquetado de Android incremental (aapt2)" en las páginas de propiedades del proyecto de Visual Studio o edite el archivo del proyecto en un editor de texto y establezca la propiedad "AndroidUseAapt2" de MSBuild en "true". The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -525,7 +525,7 @@ Cambie el valor de AndroidManifest.xml para que coincida con el valor $(Supporte {1} - The SupportedOSPlatformVersion property value - Uso de AppDomain.CreateDomain() detectado en el ensamblado: {0}.NET 6 y superiores solo admitirán un único AppDomain, por lo que esta API dejará de estar disponible en .NET Android una vez que se publique .NET 6. + Uso de AppDomain.CreateDomain() detectado en el ensamblado: {0}.NET 6 y superiores solo admitirán un único AppDomain, por lo que esta API dejará de estar disponible en .NET for Android una vez que se publique .NET 6. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - El valor "{0}" del analizador de clases de Android está obsoleto y se eliminará en una futura versión de .NET Android. Actualice las propiedades del proyecto para usar "class-parse". + El valor "{0}" del analizador de clases de Android está obsoleto y se eliminará en una futura versión de .NET for Android. Actualice las propiedades del proyecto para usar "class-parse". The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - El objetivo de generación de código Android "{0}" está obsoleto y se eliminará en una futura versión de .NET Android. Actualice las propiedades del proyecto para usar "XAJavaInterop1". + El objetivo de generación de código Android "{0}" está obsoleto y se eliminará en una futura versión de .NET for Android. Actualice las propiedades del proyecto para usar "XAJavaInterop1". The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - Hacer referencia al proyecto de aplicación Android Wear "{0}" desde un proyecto de aplicación Android está obsoleto y ya no se admitirá en una versión futura de .NET Android. Elimine la referencia al proyecto de la aplicación Android Wear del proyecto de la aplicación Android y distribuya en su lugar la aplicación Wear como una aplicación independiente. + Hacer referencia al proyecto de aplicación Android Wear "{0}" desde un proyecto de aplicación Android está obsoleto y ya no se admitirá en una versión futura de .NET for Android. Elimine la referencia al proyecto de la aplicación Android Wear del proyecto de la aplicación Android y distribuya en su lugar la aplicación Wear como una aplicación independiente. The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. @@ -890,7 +890,7 @@ Consulte https://aka.ms/xa5207 para obtener más detalles. {2} - The instructions to install the missing component - Instálelo en el Android SDK Manager (herramientas > Android > Android SDK Manager...) o cambie el proyecto .NET Android para que se dirija a una versión de la API que esté instalada. + Instálelo en el Android SDK Manager (herramientas > Android > Android SDK Manager...) o cambie el proyecto .NET for Android para que se dirija a una versión de la API que esté instalada. This string is the instrucitons to install the component diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx index ea191b8069b..cb164415c2e 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex Le fichier 'LibraryProjectProperties' '{0}' se trouve dans un répertoire parent du répertoire de sortie intermédiaire du projet de liaisons. Modifiez le chemin pour utiliser le fichier 'project.properties' d'origine directement à partir du répertoire du projet de bibliothèque Android. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -453,7 +453,7 @@ In this message, the term "binding" means a piece of generated code that makes i Fichier de configuration «{0}» ignoré. Les fichiers de configuration .NET ne sont pas pris en charge dans les projets Android .NET qui ciblent .NET 6 ou une version ultérieure. - The following are literal names and should not be translated: .NET, .NET Android. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -525,7 +525,7 @@ Modifiez la valeur dans AndroidManifest.xml pour qu’elle corresponde à la val {1} - The SupportedOSPlatformVersion property value - Utilisation d’AppDomain.CreateDomain() détectée dans l’assembly : {0}. .NET 6 et versions ultérieures ne prennent en charge qu’un seul AppDomain. Cette API ne sera donc plus disponible dans .NET Android une fois .NET 6 publié. + Utilisation d’AppDomain.CreateDomain() détectée dans l’assembly : {0}. .NET 6 et versions ultérieures ne prennent en charge qu’un seul AppDomain. Cette API ne sera donc plus disponible dans .NET for Android une fois .NET 6 publié. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - La valeur de l’analyseur de classe Android «{0}» est déconseillée et sera supprimée dans une future version de .NET Android. Mettez à jour les propriétés du projet pour utiliser 'class-parse'. + La valeur de l’analyseur de classe Android «{0}» est déconseillée et sera supprimée dans une future version de .NET for Android. Mettez à jour les propriétés du projet pour utiliser 'class-parse'. The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - La cible de génération de code Android «{0}» est déconseillée et sera supprimée dans une future version de .NET Android. Mettez à jour les propriétés du projet pour utiliser 'XAJavaInterop1'. + La cible de génération de code Android «{0}» est déconseillée et sera supprimée dans une future version de .NET for Android. Mettez à jour les propriétés du projet pour utiliser 'XAJavaInterop1'. The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - Le référencement du projet d’application Android Wear «{0}» à partir d’un projet d’application Android est déconseillé et ne sera plus pris en charge dans une future version de .NET Android. Supprimez la référence du projet d’application Android Wear du projet d’application Android et distribuez l’application Wear en tant qu’application autonome à la place. + Le référencement du projet d’application Android Wear «{0}» à partir d’un projet d’application Android est déconseillé et ne sera plus pris en charge dans une future version de .NET for Android. Supprimez la référence du projet d’application Android Wear du projet d’application Android et distribuez l’application Wear en tant qu’application autonome à la place. The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx index 595c47a5d60..f4118dcf5f1 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex Il file `{0}` di `LibraryProjectProperties` si trova in una directory padre della directory di output intermedia del progetto di binding. Modificare il percorso in modo da usare il file `project.properties` originale della directory del progetto della libreria Android. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - Il file di configurazione '{0}' verrà ignorato. I file di configurazione .NET non sono supportati in progetti .NET Android destinati a .NET 6 o versione successiva. - The following are literal names and should not be translated: .NET, .NET Android. + Il file di configurazione '{0}' verrà ignorato. I file di configurazione .NET non sono supportati in progetti .NET for Android destinati a .NET 6 o versione successiva. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - L'uso di AAPT non è supportato in progetti .NET Android destinati a .NET 6 o versione successiva. Abilitare 'Usa sistema di creazione pacchetti Android incrementale (AAPT2)' nelle pagine delle proprietà del progetto di Visual Studio o modificare il file di progetto in un editor di testo e impostare la proprietà 'AndroidUseAapt2' di MSBuild su 'true'. + L'uso di AAPT non è supportato in progetti .NET for Android destinati a .NET 6 o versione successiva. Abilitare 'Usa sistema di creazione pacchetti Android incrementale (AAPT2)' nelle pagine delle proprietà del progetto di Visual Studio o modificare il file di progetto in un editor di testo e impostare la proprietà 'AndroidUseAapt2' di MSBuild su 'true'. The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -525,7 +525,7 @@ Modificare il valore in AndroidManifest.xml in modo che corrisponda al valore $( {1} - The SupportedOSPlatformVersion property value - È stato rilevato l'uso di AppDomain.CreateDomain() nell'assembly: {0}. .NET 6 e versioni successive supporteranno solo un singolo AppDomain, quindi questa API non sarà più disponibile in .NET Android dopo il rilascio di .NET 6. + È stato rilevato l'uso di AppDomain.CreateDomain() nell'assembly: {0}. .NET 6 e versioni successive supporteranno solo un singolo AppDomain, quindi questa API non sarà più disponibile in .NET for Android dopo il rilascio di .NET 6. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - Il valore '{0}' del parser di classi Android è deprecato e verrà rimosso in una versione futura di .NET Android. Aggiornare le proprietà del progetto in modo da usare 'class-parse'. + Il valore '{0}' del parser di classi Android è deprecato e verrà rimosso in una versione futura di .NET for Android. Aggiornare le proprietà del progetto in modo da usare 'class-parse'. The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - La destinazione '{0}' per la generazione del codice Android è deprecato e verrà rimosso in una versione futura di .NET Android. Aggiornare le proprietà del progetto in modo da usare 'XAJavaInterop1'. + La destinazione '{0}' per la generazione del codice Android è deprecato e verrà rimosso in una versione futura di .NET for Android. Aggiornare le proprietà del progetto in modo da usare 'XAJavaInterop1'. The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - Il riferimento a un progetto applicazione Android Wear '{0}' da un progetto Applicazione Android è deprecato e non sarà più supportato in una versione futura di .NET Android. Rimuovere il riferimento al progetto Applicazione Android Wear dal progetto Applicazione Android e distribuire l'applicazione Wear come applicazione autonoma. + Il riferimento a un progetto applicazione Android Wear '{0}' da un progetto Applicazione Android è deprecato e non sarà più supportato in una versione futura di .NET for Android. Rimuovere il riferimento al progetto Applicazione Android Wear dal progetto Applicazione Android e distribuire l'applicazione Wear come applicazione autonoma. The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx index 3c2fea5feaf..25458347bd3 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex 'LibraryProjectProperties' ファイル '{0}' は、バインド プロジェクトの中間出力ディレクトリの親ディレクトリにあります。元の 'project.properties' ファイルを Android ライブラリ プロジェクト ディレクトリから直接使用するには、パスを調整してください。 The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - 構成ファイル '{0}' を無視しています。.NET 構成ファイルは、.NET 6 以降を対象とする .NET Android プロジェクトではサポートされていません。 - The following are literal names and should not be translated: .NET, .NET Android. + 構成ファイル '{0}' を無視しています。.NET 構成ファイルは、.NET 6 以降を対象とする .NET for Android プロジェクトではサポートされていません。 + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - .NET 6 以降を対象とする .NET Android プロジェクトでは、AAPT の使用はサポートされていません。Visual Studio プロジェクトのプロパティ ページで [インクリメンタル Android パッケージ システム (aapt2) を使用します] を有効にするか、テキスト エディターでプロジェクト ファイルを編集して 'AndroidUseAapt2' MSBuild プロパティを 'true' に設定してください。 + .NET 6 以降を対象とする .NET for Android プロジェクトでは、AAPT の使用はサポートされていません。Visual Studio プロジェクトのプロパティ ページで [インクリメンタル Android パッケージ システム (aapt2) を使用します] を有効にするか、テキスト エディターでプロジェクト ファイルを編集して 'AndroidUseAapt2' MSBuild プロパティを 'true' に設定してください。 The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -526,7 +526,7 @@ $(SupportedOSPlatformVersion) 値に一致するように AndroidManifest.xml {1} - The SupportedOSPlatformVersion property value - アセンブリ {0} で AppDomain.CreateDomain() が使用されていることが検出されました。.NET 6 以降では単一の AppDomain のみがサポートされる予定のため、.NET 6 がリリースされるとこの API は .NET Android では使用できなくなります。 + アセンブリ {0} で AppDomain.CreateDomain() が使用されていることが検出されました。.NET 6 以降では単一の AppDomain のみがサポートされる予定のため、.NET 6 がリリースされるとこの API は .NET for Android では使用できなくなります。 The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -725,12 +725,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - Android クラス パーサーの値 '{0}' は非推奨であり、.NET Android の今後のバージョンでは削除されます。'class-parse' を使用するようにプロジェクトのプロパティを更新してください。 + Android クラス パーサーの値 '{0}' は非推奨であり、.NET for Android の今後のバージョンでは削除されます。'class-parse' を使用するようにプロジェクトのプロパティを更新してください。 The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - Android コード生成ターゲット '{0}' は非推奨であり、.NET Android の今後のバージョンでは削除されます。'XAJavaInterop1' を使用するようにプロジェクトのプロパティを更新してください。 + Android コード生成ターゲット '{0}' は非推奨であり、.NET for Android の今後のバージョンでは削除されます。'XAJavaInterop1' を使用するようにプロジェクトのプロパティを更新してください。 The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -811,7 +811,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - Android アプリケーション プロジェクトから Android Wear アプリケーション プロジェクト '{0}' を参照することは非推奨となり、.NET Android の今後のバージョンではサポートされなくなります。Android アプリケーション プロジェクトから Android Wear アプリケーション プロジェクト参照を削除し、代わりにスタンドアロン アプリケーションとして Wear アプリケーションを配布してください。 + Android アプリケーション プロジェクトから Android Wear アプリケーション プロジェクト '{0}' を参照することは非推奨となり、.NET for Android の今後のバージョンではサポートされなくなります。Android アプリケーション プロジェクトから Android Wear アプリケーション プロジェクト参照を削除し、代わりにスタンドアロン アプリケーションとして Wear アプリケーションを配布してください。 The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. @@ -891,7 +891,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi {2} - The instructions to install the missing component - Android SDK マネージャー ([ツール] > [Android] > [Android SDK マネージャー]...) にインストールするか、インストールされている API バージョンを対象とするように .NET Android プロジェクトを変更してください。 + Android SDK マネージャー ([ツール] > [Android] > [Android SDK マネージャー]...) にインストールするか、インストールされている API バージョンを対象とするように .NET for Android プロジェクトを変更してください。 This string is the instrucitons to install the component diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx index 5b568e649bf..ff6e37d441a 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex `LibraryProjectProperties` 파일 `{0}`이(가) 바인딩 프로젝트의 중간 출력 디렉터리의 부모 디렉터리에 있습니다. 경로를 조정하여 Android 라이브러리 프로젝트 디렉터리에서 바로 원본 `project.properties` 파일을 사용하세요. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - 구성 파일 '{0}'을(를) 무시합니다. .Net 6 이상을 대상으로 .NET Android 프로젝트에서 .NET 구성 파일은 지원되지 않습니다. - The following are literal names and should not be translated: .NET, .NET Android. + 구성 파일 '{0}'을(를) 무시합니다. .Net 6 이상을 대상으로 .NET for Android 프로젝트에서 .NET 구성 파일은 지원되지 않습니다. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - AAPT는 .NET 6 이상을 대상으로 하는 .NET Android 프로젝트에서 사용할 수 없습니다. Visual Studio 프로젝트 속성 페이지에서 '증분 Android 패키징 시스템(aapt2) 사용'을 사용하도록 설정하거나 텍스트 편집기에서 프로젝트 파일을 편집하고 'AndroidUseAapt2' MSBuild 속성을 'true'로 설정하세요. + AAPT는 .NET 6 이상을 대상으로 하는 .NET for Android 프로젝트에서 사용할 수 없습니다. Visual Studio 프로젝트 속성 페이지에서 '증분 Android 패키징 시스템(aapt2) 사용'을 사용하도록 설정하거나 텍스트 편집기에서 프로젝트 파일을 편집하고 'AndroidUseAapt2' MSBuild 속성을 'true'로 설정하세요. The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -525,7 +525,7 @@ AndroidManifest.xml의 값을 $(SupportedOSPlatformVersion) 값에 맞도록 변 {1} - The SupportedOSPlatformVersion property value - 어셈블리에서 AppDomain.CreateDomain() 사용이 검색되었습니다. {0}. .NET 6 이상에서는 단일 AppDomain만 지원하므로 .NET 6이 릴리스된 후에는 이 API를 .NET Android에서 더 이상 사용할 수 없습니다. + 어셈블리에서 AppDomain.CreateDomain() 사용이 검색되었습니다. {0}. .NET 6 이상에서는 단일 AppDomain만 지원하므로 .NET 6이 릴리스된 후에는 이 API를 .NET for Android에서 더 이상 사용할 수 없습니다. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - Android 클래스 파서 값 '{0}'은(는) 사용되지 않으며 .NET Android의 이후 버전에서 제거됩니다. 'class-parse'를 사용하도록 프로젝트 속성을 업데이트하세요. + Android 클래스 파서 값 '{0}'은(는) 사용되지 않으며 .NET for Android의 이후 버전에서 제거됩니다. 'class-parse'를 사용하도록 프로젝트 속성을 업데이트하세요. The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - Android 코드 생성 대상 '{0}'은(는) 사용되지 않으며 .NET Android의 이후 버전에서 제거됩니다. 'XAJavaInterop1'을 사용하도록 프로젝트 속성을 업데이트하세요. + Android 코드 생성 대상 '{0}'은(는) 사용되지 않으며 .NET for Android의 이후 버전에서 제거됩니다. 'XAJavaInterop1'을 사용하도록 프로젝트 속성을 업데이트하세요. The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - Android 애플리케이션 프로젝트에서 Android Wear 애플리케이션 프로젝트 '{0}'을(를) 참조하는 기능은 사용되지 않으며 .NET Android의 이후 버전에서 더 이상 지원되지 않습니다. Android 애플리케이션 프로젝트에서 Android Wear 애플리케이션 프로젝트 참조를 제거하고 대신 Wear 애플리케이션을 독립 실행형 애플리케이션으로 배포하세요. + Android 애플리케이션 프로젝트에서 Android Wear 애플리케이션 프로젝트 '{0}'을(를) 참조하는 기능은 사용되지 않으며 .NET for Android의 이후 버전에서 더 이상 지원되지 않습니다. Android 애플리케이션 프로젝트에서 Android Wear 애플리케이션 프로젝트 참조를 제거하고 대신 Wear 애플리케이션을 독립 실행형 애플리케이션으로 배포하세요. The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. @@ -890,7 +890,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi {2} - The instructions to install the missing component - Android SDK 관리자에 설치하거나(도구 > Android > Android SDK 관리자...) 설치된 API 버전을 대상으로 하도록 .NET Android 프로젝트를 변경합니다. + Android SDK 관리자에 설치하거나(도구 > Android > Android SDK 관리자...) 설치된 API 버전을 대상으로 하도록 .NET for Android 프로젝트를 변경합니다. This string is the instrucitons to install the component diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx index 70b7afe431b..23d3b7fa497 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex Plik „LibraryProjectProperties” „{0}” znajduje się w katalogu nadrzędnym pośredniego katalogu wyjściowego projektu powiązań. Dostosuj ścieżkę tak, aby użyć oryginalnego pliku „project.properties” bezpośrednio z katalogu projektu biblioteki systemu Android. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -453,7 +453,7 @@ In this message, the term "binding" means a piece of generated code that makes i Plik konfiguracji „{0}” zostanie zignorowany. Pliki konfiguracji platformy .NET nie są obsługiwane w projektach .NET dla systemu Android, których miejscem docelowym jest platforma .NET 6 lub nowsza. - The following are literal names and should not be translated: .NET, .NET Android. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx index 631a199d9eb..4bae568a150 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex O arquivo `LibraryProjectProperties` `{0}` está localizado em um diretório pai do diretório de saída intermediário do projeto de associações. Ajuste o caminho para usar o arquivo original `project.properties` diretamente no diretório do projeto de biblioteca do Android. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -453,7 +453,7 @@ In this message, the term "binding" means a piece of generated code that makes i Ignorando o arquivo de configuração '{0}'. Não há suporte para os arquivos de configuração do .NET nos projetos Android do .NET direcionados ao .NET 6 ou superior. - The following are literal names and should not be translated: .NET, .NET Android. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - O valor do analisador de classe do Android '{0}' foi preterido e será removido em uma versão futura do .NET Android. Atualize as propriedades do projeto para usar 'class-parse'. + O valor do analisador de classe do Android '{0}' foi preterido e será removido em uma versão futura do .NET for Android. Atualize as propriedades do projeto para usar 'class-parse'. The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - O destino de geração de código android '{0}' foi preterido e será removido em uma versão futura do .NET Android. Atualize as propriedades do projeto para usar 'XAJavaInterop1'. + O destino de geração de código android '{0}' foi preterido e será removido em uma versão futura do .NET for Android. Atualize as propriedades do projeto para usar 'XAJavaInterop1'. The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - A referência ao projeto do aplicativo Android Wear '{0}' de um projeto de aplicativo Android foi preterida e não terá mais suporte em uma versão futura do .NET Android. Remova a referência ao projeto de aplicativo Wear Android do projeto de aplicativo Android e distribua o aplicativo Wear como um aplicativo autônomo. + A referência ao projeto do aplicativo Android Wear '{0}' de um projeto de aplicativo Android foi preterida e não terá mais suporte em uma versão futura do .NET for Android. Remova a referência ao projeto de aplicativo Wear Android do projeto de aplicativo Android e distribua o aplicativo Wear como um aplicativo autônomo. The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx index 50ff07099ef..ca26aa0bbec 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex `LibraryProjectProperties` file `{0}` is located in a parent directory of the bindings project's intermediate output directory. Please adjust the path to use the original `project.properties` file directly from the Android library project directory. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - Ignoring configuration file '{0}'. .NET configuration files are not supported in .NET Android projects that target .NET 6 or higher. - The following are literal names and should not be translated: .NET, .NET Android. + Ignoring configuration file '{0}'. .NET configuration files are not supported in .NET for Android projects that target .NET 6 or higher. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - Using AAPT is not supported in .NET Android projects that target .NET 6 or higher. Please enable 'Use incremental Android packaging system (aapt2)' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidUseAapt2' MSBuild property to 'true'. + Using AAPT is not supported in .NET for Android projects that target .NET 6 or higher. Please enable 'Use incremental Android packaging system (aapt2)' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidUseAapt2' MSBuild property to 'true'. The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -525,7 +525,7 @@ Either change the value in the AndroidManifest.xml to match the $(SupportedOSPla {1} - The SupportedOSPlatformVersion property value - 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 .NET 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 no longer be available in .NET for Android once .NET 6 is released. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - The Android class parser value '{0}' is deprecated and will be removed in a future version of .NET Android. Update the project properties to use 'class-parse'. + The Android class parser value '{0}' is deprecated and will be removed in a future version of .NET for Android. Update the project properties to use 'class-parse'. The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - The Android code generation target '{0}' is deprecated and will be removed in a future version of .NET Android. Update the project properties to use 'XAJavaInterop1'. + The Android code generation target '{0}' is deprecated and will be removed in a future version of .NET for Android. Update the project properties to use 'XAJavaInterop1'. The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - Referencing the Android Wear application project '{0}' from an Android application project is deprecated and will no longer be supported in a future version of .NET Android. Remove the Android Wear application project reference from the Android application project and distribute the Wear application as a standalone application instead. + Referencing the Android Wear application project '{0}' from an Android application project is deprecated and will no longer be supported in a future version of .NET for Android. Remove the Android Wear application project reference from the Android application project and distribute the Wear application as a standalone application instead. The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. @@ -890,7 +890,7 @@ See https://aka.ms/xa5207 for more details. {2} - The instructions to install the missing component - Either install it in the Android SDK Manager (Tools > Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed. + Either install it in the Android SDK Manager (Tools > Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed. This string is the instrucitons to install the component diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx index e962f9e6071..8011632e550 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex Файл "LibraryProjectProperties" "{0}" находится в родительском каталоге промежуточного выходного каталога проекта привязок. Измените путь, чтобы использовать исходный файл "project.properties" непосредственно из каталога проекта библиотеки Android. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - Пропуск файла конфигурации "{0}". Файлы конфигурации .NET не поддерживаются в проектах .NET Android для .NET 6 и более поздних версий. - The following are literal names and should not be translated: .NET, .NET Android. + Пропуск файла конфигурации "{0}". Файлы конфигурации .NET не поддерживаются в проектах .NET for Android для .NET 6 и более поздних версий. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - Использование AAPT не поддерживается в проектах .NET Android для .NET 6 и более поздних версий. Установите параметр "Использование инкрементной системы создания пакетов Android (AAPT2)" на страницах свойств проекта в Visual Studio или откройте файл проекта в текстовом редакторе и задайте значение "true" для свойства MSBuild "AndroidUseAapt2". + Использование AAPT не поддерживается в проектах .NET for Android для .NET 6 и более поздних версий. Установите параметр "Использование инкрементной системы создания пакетов Android (AAPT2)" на страницах свойств проекта в Visual Studio или откройте файл проекта в текстовом редакторе и задайте значение "true" для свойства MSBuild "AndroidUseAapt2". The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -525,7 +525,7 @@ In this message, the term "binding" means a piece of generated code that makes i {1} - The SupportedOSPlatformVersion property value - В сборке обнаружено использование AppDomain.CreateDomain(): {0}. .NET 6 и более поздние версии будут поддерживать только один домен AppDomain, поэтому этот API больше не будет доступен в .NET Android после выпуска .NET 6. + В сборке обнаружено использование AppDomain.CreateDomain(): {0}. .NET 6 и более поздние версии будут поддерживать только один домен AppDomain, поэтому этот API больше не будет доступен в .NET for Android после выпуска .NET 6. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - Значение "{0}" синтаксического анализатора класса Android является устаревшим и будет удалено в будущей версии .NET Android. Обновите свойства проекта, чтобы использовать "class-parse". + Значение "{0}" синтаксического анализатора класса Android является устаревшим и будет удалено в будущей версии .NET for Android. Обновите свойства проекта, чтобы использовать "class-parse". The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - Целевой объект "{0}" создания кода Android является устаревшим и будет удален в следующей версии .NET Android. Обновите свойства проекта, чтобы использовать "XAJavaInterop1". + Целевой объект "{0}" создания кода Android является устаревшим и будет удален в следующей версии .NET for Android. Обновите свойства проекта, чтобы использовать "XAJavaInterop1". The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - Использование ссылки на проект приложения Android Wear "{0}" из проекта приложения Android является нерекомендуемым, и в будущей версии .NET Android поддержка такой ссылки будет прекращена. Удалите ссылку на проект приложения Android Wear из проекта приложения Android и распространяйте приложение Wear в качестве автономного приложения. + Использование ссылки на проект приложения Android Wear "{0}" из проекта приложения Android является нерекомендуемым, и в будущей версии .NET for Android поддержка такой ссылки будет прекращена. Удалите ссылку на проект приложения Android Wear из проекта приложения Android и распространяйте приложение Wear в качестве автономного приложения. The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. @@ -890,7 +890,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi {2} - The instructions to install the missing component - Установите его в Диспетчере SDK Android (Инструменты > Android > Диспетчер SDK Android...) или измените проект .NET Android, выбрав для него в качестве цели установленную версию API. + Установите его в Диспетчере SDK Android (Инструменты > Android > Диспетчер SDK Android...) или измените проект .NET for Android, выбрав для него в качестве цели установленную версию API. This string is the instrucitons to install the component diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx index 05829fcc39d..f1d4182e846 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex `LibraryProjectProperties` dosyası `{0}`, bağlama projesinin ara çıkış dizininin bir üst dizininde yer alıyor. Lütfen yolu özgün `project.properties` dosyasını doğrudan Android kitaplığı proje dizininden kullanacak şekilde ayarlayın. The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - '{0}' yapılandırma dosyası göz ardı ediliyor. .NET yapılandırma dosyaları, .NET 6 veya üstünü hedefleyen .NET Android projelerinde desteklenmez. - The following are literal names and should not be translated: .NET, .NET Android. + '{0}' yapılandırma dosyası göz ardı ediliyor. .NET yapılandırma dosyaları, .NET 6 veya üstünü hedefleyen .NET for Android projelerinde desteklenmez. + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - .NET 6 veya üstünü hedefleyen .NET Android projelerinde AAPT kullanımı desteklenmez. Lütfen Visual Studio projesinin özellik sayfalarındaki 'Artımlı Android paketleme sistemini (aapt2) kullan' seçeneğini etkinleştirin veya proje dosyasını bir metin düzenleyicisinde düzenleyip 'AndroidUseAapt2' MSBuild özelliğini 'true' olarak ayarlayın. + .NET 6 veya üstünü hedefleyen .NET for Android projelerinde AAPT kullanımı desteklenmez. Lütfen Visual Studio projesinin özellik sayfalarındaki 'Artımlı Android paketleme sistemini (aapt2) kullan' seçeneğini etkinleştirin veya proje dosyasını bir metin düzenleyicisinde düzenleyip 'AndroidUseAapt2' MSBuild özelliğini 'true' olarak ayarlayın. The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -525,7 +525,7 @@ AndroidManifest.xml dosyasındaki değeri $(SupportedOSPlatformVersion) değeriy {1} - The SupportedOSPlatformVersion property value - Derlemede AppDomain.CreateDomain() kullanımı algılandı: {0}. .NET 6 ve üzeri yalnızca tek bir AppDomain'i destekleyeceğinden, .NET 6 yayımlandıktan sonra bu API artık .NET Android'de kullanılamayacaktır. + Derlemede AppDomain.CreateDomain() kullanımı algılandı: {0}. .NET 6 ve üzeri yalnızca tek bir AppDomain'i destekleyeceğinden, .NET 6 yayımlandıktan sonra bu API artık .NET for Android'de kullanılamayacaktır. The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - Android sınıfı ayrıştırıcı değeri '{0}' kullanımdan kaldırıldı ve .NET Android'in gelecekteki bir sürümünde kaldırılacak. Proje özelliklerini 'class-parse' kullanacak şekilde güncelleştirin. + Android sınıfı ayrıştırıcı değeri '{0}' kullanımdan kaldırıldı ve .NET for Android'in gelecekteki bir sürümünde kaldırılacak. Proje özelliklerini 'class-parse' kullanacak şekilde güncelleştirin. The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - Android kod oluşturma hedefi '{0}' kullanımdan kaldırıldı ve .NET Android'in gelecekteki bir sürümünde kaldırılacak. Proje özelliklerini 'XAJavaInterop1' kullanacak şekilde güncelleştirin. + Android kod oluşturma hedefi '{0}' kullanımdan kaldırıldı ve .NET for Android'in gelecekteki bir sürümünde kaldırılacak. Proje özelliklerini 'XAJavaInterop1' kullanacak şekilde güncelleştirin. The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - Bir Android uygulama projesinden Android Wear uygulama projesine '{0}' başvurmak artık kullanımdan kaldırıldı ve .NET Android'in gelecekteki bir sürümünde artık desteklenmeyecek. Android Wear uygulama projesi referansını Android uygulama projesinden kaldırın ve bunun yerine Wear uygulamasını bağımsız bir uygulama olarak dağıtın. + Bir Android uygulama projesinden Android Wear uygulama projesine '{0}' başvurmak artık kullanımdan kaldırıldı ve .NET for Android'in gelecekteki bir sürümünde artık desteklenmeyecek. Android Wear uygulama projesi referansını Android uygulama projesinden kaldırın ve bunun yerine Wear uygulamasını bağımsız bir uygulama olarak dağıtın. The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. @@ -890,7 +890,7 @@ Daha fazla ayrıntı için https://aka.ms/xa5207 adresine bakın. {2} - The instructions to install the missing component - Bunu Android SDK Yöneticisi'ne yükleyin (Araçlar > Android > Android SDK Yöneticisi...) veya .NET Android projesini, yüklü bir API sürümünü hedefleyecek şekilde değiştirin. + Bunu Android SDK Yöneticisi'ne yükleyin (Araçlar > Android > Android SDK Yöneticisi...) veya .NET for Android projesini, yüklü bir API sürümünü hedefleyecek şekilde değiştirin. This string is the instrucitons to install the component diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx index 8d500e766a5..d7780a55a7e 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex "LibraryProjectProperties" 文件“{0}”位于绑定项目的中间输出目录的父目录中。请调整路径，以直接从 Android 库项目目录使用原始 "project.properties" 文件。 The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - 将忽略配置文件“{0}”。在面向 .NET 6 或更高版本的 .NET Android 项目中不支持 .NET 配置文件。 - The following are literal names and should not be translated: .NET, .NET Android. + 将忽略配置文件“{0}”。在面向 .NET 6 或更高版本的 .NET for Android 项目中不支持 .NET 配置文件。 + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - 在面向 .NET 6 或更高版本的 .NET Android 项目中不支持使用 AAPT。请在 Visual Studio 项目属性页面中启用“使用增量 Android 打包系统(aapt2)”，或者在文本编辑器中编辑项目文件，并将 "AndroidUseAapt2" MSBuild 属性设置为 "true"。 + 在面向 .NET 6 或更高版本的 .NET for Android 项目中不支持使用 AAPT。请在 Visual Studio 项目属性页面中启用“使用增量 Android 打包系统(aapt2)”，或者在文本编辑器中编辑项目文件，并将 "AndroidUseAapt2" MSBuild 属性设置为 "true"。 The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -525,7 +525,7 @@ In this message, the term "binding" means a piece of generated code that makes i {1} - The SupportedOSPlatformVersion property value - 在程序集 {0} 中检测到使用了 AppDomain.CreateDomain()。.NET 6 及更高版本将仅支持一个 AppDomain，因此 .NET 6 发布后，将无法再在 .NET Android 中使用此 API。 + 在程序集 {0} 中检测到使用了 AppDomain.CreateDomain()。.NET 6 及更高版本将仅支持一个 AppDomain，因此 .NET 6 发布后，将无法再在 .NET for Android 中使用此 API。 The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - Android 类分析器值“{0}”已被弃用，并将在 .NET Android 的未来版本中被删除。要使用 "class-parse"，请更新项目属性。 + Android 类分析器值“{0}”已被弃用，并将在 .NET for Android 的未来版本中被删除。要使用 "class-parse"，请更新项目属性。 The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - Android 代码生成目标“{0}”已被弃用，并将在 .NET Android 的未来版本中被删除。要使用 "XAJavaInterop1"，请更新项目属性。 + Android 代码生成目标“{0}”已被弃用，并将在 .NET for Android 的未来版本中被删除。要使用 "XAJavaInterop1"，请更新项目属性。 The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - 已弃用从 Android 应用程序项目中引用 Android Wear 应用程序项目“{0}”的功能，并且未来版本的 .NET Android 中将不再支持此功能。请从 Android 应用程序项目中删除 Android Wear 应用程序项目引用，并将 Wear 应用程序作为独立应用程序进行分发。 + 已弃用从 Android 应用程序项目中引用 Android Wear 应用程序项目“{0}”的功能，并且未来版本的 .NET for Android 中将不再支持此功能。请从 Android 应用程序项目中删除 Android Wear 应用程序项目引用，并将 Wear 应用程序作为独立应用程序进行分发。 The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. @@ -890,7 +890,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi {2} - The instructions to install the missing component - 要么将其安装在 Android SDK 管理器中(工具 > Android > Android SDK 管理器...)，要么将 .NET Android 项目更改为面向已安装的 API 版本。 + 要么将其安装在 Android SDK 管理器中(工具 > Android > Android SDK 管理器...)，要么将 .NET for Android 项目更改为面向已安装的 API 版本。 This string is the instrucitons to install the component diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx index 79a7594785b..6e7725da171 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx @@ -430,7 +430,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex 'LibraryProjectProperties' 檔案 '{0}' 位於繫結專案之中繼輸出目錄的父目錄中。請將該路徑調整為直接使用 Android 程式庫專案目錄中的原始 'project. properties' 檔案。 The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android -In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#. +In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET for Android project written in C# or F#. {0} - The path of the LibraryProjectProperties file @@ -452,8 +452,8 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool. - 正在忽略組態檔 '{0}'。以 .NET 6 或更新版本為目標的 .NET Android 專案不支援 .NET 組態檔。 - The following are literal names and should not be translated: .NET, .NET Android. + 正在忽略組態檔 '{0}'。以 .NET 6 或更新版本為目標的 .NET for Android 專案不支援 .NET 組態檔。 + The following are literal names and should not be translated: .NET, .NET for Android. {0} - The file name such as 'Foo.dll.config' @@ -465,7 +465,7 @@ In this message, the term "binding" means a piece of generated code that makes i The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true. - 以 .NET 6 或更新版本為目標的 .NET Android 專案不支援使用 AAPT。請在 Visual Studio 專案屬性頁中啟用 [使用增量 Android 套件系統 (aapt2)]，或在文字編輯器中編輯專案檔，並將 'AndroidUseAapt2' MSBuild 屬性設定為 'true'。 + 以 .NET 6 或更新版本為目標的 .NET for Android 專案不支援使用 AAPT。請在 Visual Studio 專案屬性頁中啟用 [使用增量 Android 套件系統 (aapt2)]，或在文字編輯器中編輯專案檔，並將 'AndroidUseAapt2' MSBuild 屬性設定為 'true'。 The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true. @@ -525,7 +525,7 @@ In this message, the term "binding" means a piece of generated code that makes i {1} - The SupportedOSPlatformVersion property value - 在下列組件中偵測到使用 AppDomain.CreateDomain(): {0}。.NET 6 及更新版本只支援單一 AppDomain，因此在 .NET 6 發行之後，此 API 就無法再於 .NET Android 中使用。 + 在下列組件中偵測到使用 AppDomain.CreateDomain(): {0}。.NET 6 及更新版本只支援單一 AppDomain，因此在 .NET 6 發行之後，此 API 就無法再於 .NET for Android 中使用。 The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain {0} - The name of the assembly @@ -724,12 +724,12 @@ In this message, "root element" refers to the root element of an XML file. {0} - The exception message and stack trace of the associated exception - Android 類別剖析器值 '{0}' 即將退場，將會從後續版本的 .NET Android 版本中移除。請更新專案屬性，以使用 'class-parse'。 + Android 類別剖析器值 '{0}' 即將退場，將會從後續版本的 .NET for Android 版本中移除。請更新專案屬性，以使用 'class-parse'。 The following are literal names and should not be translated: class-parse {0} - The name of the current class parser value - Android 程式碼產生目標 '{0}' 即將退場，將會從後續版本的 .NET Android 版本中移除。請更新專案屬性，以使用 'XAJavaInterop1'。 + Android 程式碼產生目標 '{0}' 即將退場，將會從後續版本的 .NET for Android 版本中移除。請更新專案屬性，以使用 'XAJavaInterop1'。 The following are literal names and should not be translated: XAJavaInterop1 {0} - The name of the current code generation target @@ -810,7 +810,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi "Wear" is a short version of the full product name "Wear OS" and so should not be translated. - 從 Android 應用程式專案參考 Android Wear 應用程式專案 '{0}' 的功能已淘汰，且日後的 .NET Android 版本將不再予以支援。從 Android 應用程式專案移除 Android Wear 應用程式專案參考，並將 Wear 應用程式改為以獨立應用程式發佈。 + 從 Android 應用程式專案參考 Android Wear 應用程式專案 '{0}' 的功能已淘汰，且日後的 .NET for Android 版本將不再予以支援。從 Android 應用程式專案移除 Android Wear 應用程式專案參考，並將 Wear 應用程式改為以獨立應用程式發佈。 The following are literal names and should not be translated: Android Wear, Android, Wear. {0} - The referenced Android Wear project. @@ -890,7 +890,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi {2} - The instructions to install the missing component - 請將其安裝在 Android SDK 管理員中 (工具 > Android > Android SDK 管理員...)，或將 .NET Android 專案變更為針對已安裝的 API 版本為目標。 + 請將其安裝在 Android SDK 管理員中 (工具 > Android > Android SDK 管理員...)，或將 .NET for Android 專案變更為針對已安裝的 API 版本為目標。 This string is the instrucitons to install the component diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs index 016654829dc..aeb91b1f25c 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs @@ -20,7 +20,7 @@ public class BuildAppBundle : BundleTool public override string TaskPrefix => "BAB"; static readonly string [] UncompressedByDefault = new [] { - // Xamarin.Android specific files + // .NET for Android specific files "typemap.mj", "typemap.jm", "assemblies/**", diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/FilterAssemblies.cs b/src/Xamarin.Android.Build.Tasks/Tasks/FilterAssemblies.cs index 13645c84ca9..43cac6d83e8 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/FilterAssemblies.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/FilterAssemblies.cs @@ -10,7 +10,7 @@ namespace Xamarin.Android.Tasks { /// - /// Filters a set of assemblies to be known as "Xamarin.Android" assemblies through various checks: + /// Filters a set of assemblies to be known as ".NET for Android" assemblies through various checks: /// * The presence of [assembly: System.Runtime.Versioning.TargetFramework("MonoAndroid,Version=v9.0")] /// * A Mono.Android.dll reference /// * An EmbeddedResource ending with *.jar diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/InstallApkSet.cs b/src/Xamarin.Android.Build.Tasks/Tasks/InstallApkSet.cs index 2fa52781738..3e5e4d3dbdd 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/InstallApkSet.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/InstallApkSet.cs @@ -34,7 +34,7 @@ internal override CommandLineBuilder GetCommandLineBuilder () // --modules: List of modules to be installed, or "_ALL_" for all modules. // Defaults to modules installed during first install, i.e. not on-demand. - // Xamarin.Android won't support on-demand modules yet. + // .NET for Android won't support on-demand modules yet. if (Modules == null) cmd.AppendSwitchIfNotNull ("--modules ", "_ALL_"); else diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs index 9cba6164287..2394f7804d9 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs @@ -740,9 +740,9 @@ public void CheckTimestamps ([Values (true, false)] bool isRelease) start = DateTime.UtcNow; Assert.IsTrue (b.Build (proj), "second build should have succeeded."); - // These files won't exist in OSS Xamarin.Android, thus the existence check and + // These files won't exist in OSS .NET for Android, thus the existence check and // Assert.Ignore below. They will also not exist in the commercial version of - // Xamarin.Android unless fastdev is enabled. + // .NET for Android unless fastdev is enabled. foreach (var file in new [] { "typemap.mj", "typemap.jm" }) { var info = new FileInfo (Path.Combine (intermediate, "android", file)); if (info.Exists) { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateLibraryResourcesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateLibraryResourcesTests.cs index da27485805a..c4d8697760c 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateLibraryResourcesTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateLibraryResourcesTests.cs @@ -39,7 +39,7 @@ int styleable Foo_styleable_bar 0 const string Header = @"/* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by - * Xamarin.Android from the resource data it found. + * .NET for Android from the resource data it found. * It should not be modified by hand. */ "; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs index 440c5656f73..4b99199d45c 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs @@ -28,13 +28,13 @@ public class BaseTest public string Root => Path.GetFullPath (XABuildPaths.TestOutputDirectory); /// - /// Checks if a commercial Xamarin.Android is available + /// Checks if a commercial .NET for Android is available /// * Defaults to Assert.Ignore () /// public void AssertCommercialBuild (bool fail = false) { if (!TestEnvironment.CommercialBuildAvailable) { - var message = $"'{TestName}' requires a commercial build of Xamarin.Android."; + var message = $"'{TestName}' requires a commercial build of .NET for Android."; if (fail) { Assert.Fail (message); } else { @@ -241,7 +241,7 @@ protected string CreateFauxReferencesDirectory (string path, ApiInfo [] versions Directory.CreateDirectory (Path.Combine (referencesDirectory, "MonoAndroid", "v1.0", "RedistList")); File.WriteAllText (Path.Combine (referencesDirectory, "MonoAndroid", "v1.0", "mscorlib.dll"), ""); File.WriteAllText (Path.Combine (referencesDirectory, "MonoAndroid", "v1.0", "RedistList", "FrameworkList.xml"), - $""); + $""); foreach (var v in versions) { Directory.CreateDirectory (Path.Combine (referencesDirectory, "MonoAndroid", v.FrameworkVersion)); Directory.CreateDirectory (Path.Combine (referencesDirectory, "MonoAndroid", v.FrameworkVersion, "RedistList")); @@ -249,7 +249,7 @@ protected string CreateFauxReferencesDirectory (string path, ApiInfo [] versions File.WriteAllText (Path.Combine (referencesDirectory, "MonoAndroid", v.FrameworkVersion, "AndroidApiInfo.xml"), $"\n{v.Id}\n{v.Level}\n{v.Name}\n{v.FrameworkVersion}\n{v.Stable}\n"); File.WriteAllText (Path.Combine (referencesDirectory, "MonoAndroid", v.FrameworkVersion, "RedistList", "FrameworkList.xml"), - $""); + $""); } return referencesDirectory; } @@ -303,7 +303,7 @@ void CreateFauxJdk (string dir, string releaseVersion, string releaseBuildNumber java = java + $"echo Property settings:{Environment.NewLine}" + $"echo {quote} java.home = {dir}{quote}{Environment.NewLine}" + - $"echo {quote} java.vendor = Xamarin.Android Unit Tests{quote}{Environment.NewLine}" + + $"echo {quote} java.vendor = .NET for Android Unit Tests{quote}{Environment.NewLine}" + $"echo {quote} java.version = {javaVersion}{quote}{Environment.NewLine}" + $"echo {quote} xamarin.multi-line = line the first{quote}{Environment.NewLine}" + $"echo {quote} line the second{quote}{Environment.NewLine}" + diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModule.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModule.cs index 9a50f4ee5cf..2d938b8b92c 100644 --- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModule.cs +++ b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModule.cs @@ -53,7 +53,7 @@ public LlvmIrModule () flags.AddReferenceField (metadataManager.AddNumbered (LlvmIrModuleMergeBehavior.Max, "PIC Level", 2)); LlvmIrMetadataItem ident = metadataManager.Add (LlvmIrKnownMetadata.LlvmIdent); - LlvmIrMetadataItem identValue = metadataManager.AddNumbered ($"Xamarin.Android {XABuildConfig.XamarinAndroidBranch} @ {XABuildConfig.XamarinAndroidCommitHash}"); + LlvmIrMetadataItem identValue = metadataManager.AddNumbered ($".NET for Android {XABuildConfig.XamarinAndroidBranch} @ {XABuildConfig.XamarinAndroidCommitHash}"); ident.AddReferenceField (identValue.Name); tbaaAnyPointer = metadataManager.AddNumbered (); diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NdkTools/WithClang.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NdkTools/WithClang.cs index 0c49e88361e..8add96d068d 100644 --- a/src/Xamarin.Android.Build.Tasks/Utilities/NdkTools/WithClang.cs +++ b/src/Xamarin.Android.Build.Tasks/Utilities/NdkTools/WithClang.cs @@ -27,7 +27,7 @@ public override bool ValidateNdkPlatform (Action logMessage, Action(.*)" "\\1" XA_VER project( monodroid VERSION ${XA_VERSION} - DESCRIPTION "Xamarin.Android native runtime" + DESCRIPTION ".NET for Android native runtime" HOMEPAGE_URL "https://github.com/xamarin/xamarin-android" LANGUAGES CXX C ) diff --git a/src/monodroid/jni/cppcompat.hh b/src/monodroid/jni/cppcompat.hh index a802a2a12c3..27891a10ac8 100644 --- a/src/monodroid/jni/cppcompat.hh +++ b/src/monodroid/jni/cppcompat.hh @@ -6,7 +6,7 @@ // We can't use on Android because it requires linking libc++ into the rutime, see below. // -// Android NDK currently provides a build of libc++ which we cannot link into Xamarin.Android runtime because it would +// Android NDK currently provides a build of libc++ which we cannot link into .NET for Android runtime because it would // expose libc++ symbols which would conflict with a version of libc++ potentially included in a mixed // native/Xamarin.Android application. // diff --git a/src/monodroid/jni/embedded-assemblies-zip.cc b/src/monodroid/jni/embedded-assemblies-zip.cc index b2631fe8b19..30b10faaa1d 100644 --- a/src/monodroid/jni/embedded-assemblies-zip.cc +++ b/src/monodroid/jni/embedded-assemblies-zip.cc @@ -188,7 +188,7 @@ EmbeddedAssemblies::map_assembly_store (dynamic_local_string auto header = static_cast(assembly_store_map.area); if (header->magic != ASSEMBLY_STORE_MAGIC) { - log_fatal (LOG_ASSEMBLY, "Assembly store '%s' is not a valid .NET Android assembly store file", entry_name.get ()); + log_fatal (LOG_ASSEMBLY, "Assembly store '%s' is not a valid .NET for Android assembly store file", entry_name.get ()); Helpers::abort_application (); } diff --git a/src/monodroid/jni/monodroid-glue.cc b/src/monodroid/jni/monodroid-glue.cc index 1de65c5c46d..96cdb6f9473 100644 --- a/src/monodroid/jni/monodroid-glue.cc +++ b/src/monodroid/jni/monodroid-glue.cc @@ -1712,7 +1712,7 @@ MonodroidRuntime::Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass kl if (utils.should_log (LOG_DEFAULT)) [[unlikely]] { log_info_nocheck ( LOG_DEFAULT, - ".NET Android version: %s (%s; %s); built on %s; NDK version: %s; API level: %s; MonoVM version: %s", + ".NET for Android version: %s (%s; %s); built on %s; NDK version: %s; API level: %s; MonoVM version: %s", BuildInfo::xa_version.data (), BuildInfo::architecture.data (), BuildInfo::kind.data (), diff --git a/src/profiled-aot/README.md b/src/profiled-aot/README.md index f436151e9d3..f4ee0524d9f 100644 --- a/src/profiled-aot/README.md +++ b/src/profiled-aot/README.md @@ -6,7 +6,7 @@ https://github.com/jonathanpeppers/Mono.Profiler.Android#usage-of-the-aot-profil ## Updating Profiles -Build Xamarin.Android following our instructions to build on +Build .NET for Android following our instructions to build on [Windows][0] or [Unix-like platforms][1]. Make sure to build with `-p:Configuration=Release` or `CONFIGURATION=Release`. @@ -31,7 +31,7 @@ files don't change, it is likely not necessary to update the Once you've updated the profile, always test to make sure the times you get are either "the same" or slightly better than before. -Build Xamarin.Android again in `Release` mode to get the updated +Build .NET for Android again in `Release` mode to get the updated profiles, or manually copy the new `dotnet.aotprofile` to: ``` diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/MainActivity.cs b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/MainActivity.cs index 8a8fb75843b..73768737e13 100644 --- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/MainActivity.cs +++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/MainActivity.cs @@ -4,7 +4,7 @@ namespace UnitTestRunner { - [Activity(Label = "Xamarin.Android UnitTestRunner", MainLauncher = true, Icon = "@mipmap/icon")] + [Activity(Label = ".NET for Android UnitTestRunner", MainLauncher = true, Icon = "@mipmap/icon")] public class MainActivity : Activity { int count = 1; diff --git a/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Android.Runtime/PInvokeOverrideTests.cs b/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Android.Runtime/PInvokeOverrideTests.cs index 0071e8fce2a..0d67252bfae 100644 --- a/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Android.Runtime/PInvokeOverrideTests.cs +++ b/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Android.Runtime/PInvokeOverrideTests.cs @@ -14,9 +14,9 @@ public class PInvokeOverrideTests [Test] public void CheckThirdPartySharedLibrariesWork () { - // We need to test if a library that is neither a Xamarin.Android internal one nor a standard DotNet one is properly cached in the robin_map p/invoke + // We need to test if a library that is neither a .NET for Android internal one nor a standard DotNet one is properly cached in the robin_map p/invoke // override cache. The only such library that we can count to always be present in the apk is `libmonosgen-2.0.so`. It doesn't matter which API we call, - // what it does and what returns as long as we hit the Xamarin.Android code path which uses the robin_map cache. If something doesn't work, the runtime will + // what it does and what returns as long as we hit the .NET for Android code path which uses the robin_map cache. If something doesn't work, the runtime will // crash, thus we don't need any asserts here. The API is called twice, because the first call hits a slightly different code path than the subsequent ones. mono_config_is_server_mode (); mono_config_is_server_mode (); diff --git a/tests/TestRunner.Core/TestInstrumentation.cs b/tests/TestRunner.Core/TestInstrumentation.cs index 0f9abf5fcee..1c1e1066709 100644 --- a/tests/TestRunner.Core/TestInstrumentation.cs +++ b/tests/TestRunner.Core/TestInstrumentation.cs @@ -147,7 +147,7 @@ void LogDeviceInfo () string mfaVer = attribute == null ? "unknown" : attribute.InformationalVersion; int alignColumn = 25; - LogPaddedInfo ("Xamarin.Android Version", mfaVer, alignColumn); + LogPaddedInfo (".NET for Android Version", mfaVer, alignColumn); var aver = new List (); aver.Add (Build.VERSION.Release); diff --git a/tools/jit-times/README.md b/tools/jit-times/README.md index 14856d4798b..74008ad6934 100644 --- a/tools/jit-times/README.md +++ b/tools/jit-times/README.md @@ -1,4 +1,4 @@ -**jit-times** is a tool to process methods.txt file produced by Xamarin.Android +**jit-times** is a tool to process methods.txt file produced by .NET for Android applications Usage: jit-times.exe OPTIONS* @@ -18,7 +18,7 @@ applications ### Getting the `methods.txt` file -The `methods.txt` file can be acquired from Xamarin.Android application like this: +The `methods.txt` file can be acquired from .NET for Android application like this: 1. Set the `debug.mono.log` system property to include `timing`: diff --git a/tools/relnote-gen/README.md b/tools/relnote-gen/README.md index b41706674f1..5eb836cdb28 100644 --- a/tools/relnote-gen/README.md +++ b/tools/relnote-gen/README.md @@ -1,6 +1,6 @@ # Release Notes Generator -Parses `git log` output to produce Xamarin.Android release notes fragments. +Parses `git log` output to produce .NET for Android release notes fragments. Usage: diff --git a/tools/tmt/README.md b/tools/tmt/README.md index 4739332e153..b4f21baa495 100644 --- a/tools/tmt/README.md +++ b/tools/tmt/README.md @@ -29,7 +29,7 @@ # Introduction -This is a utility program to read Xamarin.Android application type +This is a utility program to read .NET for Android application type maps compiled into a shared library named `libxamarin-app.so`. This library is compiled for each native architecture separately and packaged together with the application into the APK archive. diff --git a/tools/tmt/main.cs b/tools/tmt/main.cs index f72c6d17a3a..3e3143137c7 100644 --- a/tools/tmt/main.cs +++ b/tools/tmt/main.cs @@ -91,8 +91,8 @@ public static int Main (string[] args) "Usage: tmt [OPTIONS] [FILTER_REGEX]", "", "The only required parameter is a path to a location containing the type maps.", - "It is a path to an APK archive, AAB archive, Xamarin.Android application", - "shared library or a Xamarin.Android project directory with compiled application.", + "It is a path to an APK archive, AAB archive, .NET for Android application", + "shared library or a .NET for Android project directory with compiled application.", "", "The optional FILTER_REGEX argument following the path is a regular expression to", "apply to the mapped types in order to filter the results. Full output files are still created,",