Skip to content

Commit 2b6fcfc

Browse files
authored
It's ".NET for Android", not ".NET Android" (#8933)
*Heavy sigh* Additionally, begin reviewing *non-source code* mentions of `Xamarin.Android`, and replace with `.NET for Android` as appropriate.
1 parent 6e5239b commit 2b6fcfc

File tree

212 files changed

+630
-649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+630
-649
lines changed

.gdn/tsaoptions-v2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"codebaseName": "xamarin.android_main",
2+
"codebaseName": "dotnet.android_main",
33
"notificationAliases": [
44
55
],

.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "2.0.0",
55
"tasks": [
66
{
7-
"label": "Build All Xamarin.Android",
7+
"label": "Build All .NET for Android",
88
"type": "shell",
99
"windows":{ "command": ".\\build.cmd ${input:buildtype}"},
1010
"linux":{"command": "./build.sh ${input:buildtype}"},
@@ -231,4 +231,4 @@
231231
]
232232
},
233233
]
234-
}
234+
}

Documentation/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
# Getting Started
44

5-
* [Installing the Xamarin.Android SDK](https://developer.xamarin.com/guides/android/getting_started/installation/)
6-
* [Xamarin.Android Documentation](https://developer.xamarin.com/guides/android/)
7-
* [Xamarin.Android API Documentation](https://developer.xamarin.com/api/root/MonoAndroid-lib/)
5+
* [Installing the .NET for Android SDK](https://developer.xamarin.com/guides/android/getting_started/installation/)
6+
* [.NET for Android Documentation](https://learn.microsoft.com/dotnet/android/)
7+
* [.NET for Android API Documentation](https://learn.microsoft.com/en-us/dotnet/api/?preserve-view=true&view=net-android-34.0)
88

99

1010
# Project Docs
@@ -30,9 +30,9 @@
3030

3131
* [Build System Configuration](building/configuration.md)
3232
* [Build Dependencies for Linux and macOS](building/unix/dependencies.md)
33-
* [Building Xamarin.Android on Linux and macOS](building/unix/instructions.md)
33+
* [Building .NET for Android on Linux and macOS](building/unix/instructions.md)
3434
* [Build Dependencies for Windows](building/windows/dependencies.md)
35-
* [Building Xamarin.Android on Windows](building/windows/instructions.md)
35+
* [Building .NET for Android on Windows](building/windows/instructions.md)
3636

3737

3838
# Development Workflow
@@ -50,4 +50,4 @@
5050

5151
# Other Information
5252

53-
* [Wikipedia Entry for Xamarin.Android](https://en.wikipedia.org/wiki/Mono_(software)#Xamarin.Android)
53+
* [Wikipedia Entry for .NET for Android](https://en.wikipedia.org/w/index.php?title=.NET_for_Android&redirect=yes)

Documentation/binfmt_misc-warning-Linux.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Your Linux appears to have support for binfmt_misc kernel module enabled.
44
The module makes it possible to execute non-Linux binaries if the appropriate
55
interpreter for the given format is available.
66
Your machine is configured to handle Windows PE executables either via Mono or
7-
Wine. It will make the Xamarin.Android build fail IF you choose to build the
7+
Wine. It will make the .NET for Android build fail IF you choose to build the
88
Windows cross-compilers by enabling the 'mxe-Win32' or 'mxe-Win64' host targets.
99

1010
You can disable the binfmt_misc module by issuing the following command as root
11-
before building Xamarin.Android:
11+
before building .NET for Android:
1212

1313
echo 0 > /proc/sys/fs/binfmt_misc/status
1414

Documentation/building/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# Build Configuration
1111

12-
The Xamarin.Android build is heavily dependent on MSBuild, with the *intention*
12+
The .NET for Android build is heavily dependent on MSBuild, with the *intention*
1313
that it should (eventually?) be possible to build the project simply by
1414
checking out the repo, loading `Xamarin.Android.sln` into an IDE, and Building
1515
the solution. (This isn't currently possible, and may never be, but it's

Documentation/building/unix/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build Dependencies for Linux and macOS
22

3-
Building Xamarin.Android requires:
3+
Building .NET for Android requires:
44

55
* [Homebrew](#homebrew)
66
* [Latest Mono](#mono-sdk)

Documentation/building/unix/instructions.md

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Building Xamarin.Android on Linux and macOS
1+
# Building .NET for Android on Linux and macOS
22

3-
Building Xamarin.Android on Linux and macOS relies on GNU make and
3+
Building .NET for Android on Linux and macOS relies on GNU make and
44
MSBuild via the `msbuild` command (within Mono). MSBuild via `xbuild`
55
can also be used by setting the `$(MSBUILD)` make variable to `xbuild`.
66

7-
# Building Xamarin.Android
7+
# Building .NET for Android
88

99
1. Install the [build dependencies](dependencies.md).
1010

@@ -58,11 +58,11 @@ can also be used by setting the `$(MSBUILD)` make variable to `xbuild`.
5858
2019][xamdevsummit] with a full walkthrough. Even though the demo was
5959
on Windows, many of the concepts should still apply:
6060

61-
[![Build Xamarin.Android](https://img.youtube.com/vi/8qaQleb6Tbk/maxresdefault.jpg)][xamdevsummit]
61+
[![Build .NET for Android](https://img.youtube.com/vi/8qaQleb6Tbk/maxresdefault.jpg)][xamdevsummit]
6262

6363
[xamdevsummit]: https://youtu.be/8qaQleb6Tbk
6464

65-
# Creating a local .NET android Workload
65+
# Creating a local .NET for Android Workload
6666

6767
`make prepare` provisions a specific build of .NET to
6868
`bin/$(Configuration)/dotnet`.
@@ -95,12 +95,12 @@ See the [One .NET Documentation](../../guides/OneDotNet.md) for further details.
9595
# Creating installers
9696

9797
Once `make all` or `make jenkins` have completed, macOS (.pkg),
98-
Windows (.vsix), and .NET android workload .nupkg files
98+
Windows (.vsix), and .NET for Android workload .nupkg files
9999
can be built with:
100100

101101
make create-installers
102102

103-
Alternatively, .NET android workload packs can be built with:
103+
Alternatively, .NET for Android workload packs can be built with:
104104

105105
make create-nupkgs
106106
# -or-
@@ -351,23 +351,3 @@ For example, to rebuild Mono for armeabi-v7a:
351351
$ msbuild /t:_InstallRuntimes src/mono-runtimes/mono-runtimes.csproj
352352

353353

354-
# How do I rebuild BCL assemblies?
355-
356-
The Xamarin.Android Base Class Library assemblies, such as `mscorlib.dll`,
357-
are built within `external/mono`, using Mono's normal build system:
358-
359-
# This updates external/mono/mcs/class/lib/monodroid/ASSEMBLY.dll
360-
$ make -C external/mono/mcs/class/ASSEMBLY PROFILE=monodroid
361-
362-
Alternatively, if you want to rebuild *all* the assemblies, the "host"
363-
Mono needs to be rebuilt. Note that the name of the "host" directory
364-
varies based on the operating system you're building from:
365-
366-
$ make -C src/mono-runtimes/obj/Debug/host-Darwin
367-
368-
Once the assemblies have been rebuilt, they can be copied into the appropriate
369-
Xamarin.Android SDK directory by using the `_InstallBcl` target:
370-
371-
# This updates bin/$(Configuration)/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/ASSEMBLY.dll
372-
$ msbuild src/mono-runtimes/mono-runtimes.csproj /t:_InstallBcl
373-

Documentation/building/windows/dependencies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Build Dependencies for Windows
22

3-
Building Xamarin.Android requires:
3+
Building .NET for Android requires:
44

5-
* An existing installation of the Xamarin.Android SDK and the Android SDK
5+
* An existing installation of the .NET for Android SDK and the Android SDK
66
* The .NET Framework 3.5 – 4.7 development tools
77
* Git for Windows
88
* The Java Development Kit (JDK)

Documentation/building/windows/instructions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Building Xamarin.Android on Windows
1+
# Building .NET for Android on Windows
22

3-
Building Xamarin.Android on Windows requires .NET and the `msbuild` command
3+
Building .NET for Android on Windows requires .NET and the `msbuild` command
44
be available within the Command-Line environment.
55
(The **Developer Command Prompt** that Visual Studio installs is sufficient.)
66

77
MSBuild version 15 or later is required.
88

9-
# Building Xamarin.Android
9+
# Building .NET for Android
1010

1111
1. Install the [build dependencies](dependencies.md).
1212

@@ -80,13 +80,13 @@ So for example:
8080
[windows_path]: https://www.java.com/en/download/help/path.xml
8181
[set_alias]: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.utility/set-alias?view=powershell-6
8282

83-
# Creating a local .NET android Workload
83+
# Creating a local .NET for Android Workload
8484

8585
`dotnet msbuild Xamarin.Android.sln -t:Prepare` provisions a
8686
specific build of .NET to `bin\$(Configuration)\dotnet`.
8787

8888
Once the prepare target is complete, you can set up a local
89-
.NET android workload install with:
89+
.NET for Android workload install with:
9090

9191
dotnet-local.cmd build Xamarin.Android.sln -t:BuildDotNet -m:1
9292

@@ -121,7 +121,7 @@ See the [One .NET Documentation](../../guides/OneDotNet.md) for further details.
121121
# Creating installers
122122

123123
Once `dotnet msbuild Xamarin.Android.sln -t:Prepare` is complete,
124-
.NET android workload packs can be built with:
124+
.NET for Android workload packs can be built with:
125125

126126
dotnet-local.cmd build Xamarin.Android.sln -t:BuildDotNet,PackDotNet -m:1
127127

Documentation/guides/AndroidAssetPacks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ as required.
1111
There are two types of `pack`: Feature packs and Asset packs.
1212
*Feature* pack contains *non-native* Java code and other resources.
1313
Code in these types of `pack` can be launched via the `Context.StartActivity()`
14-
API call. At this time due to various constraints .NET Android cannot support
14+
API call. At this time due to various constraints .NET for Android cannot support
1515
Feature packs.
1616

1717
*Asset* packs contain *only*
@@ -232,4 +232,4 @@ issues though.
232232
2. There is no IDE support for building this type of project.
233233

234234
Having the user go through a number of hoops to implement this for
235-
.NET Android or .NET MAUI is not ideal.
235+
.NET for Android or .NET MAUI is not ideal.

0 commit comments

Comments
 (0)