Merge remote-tracking branch 'origin/net10.0' into darc-net10.0-0dd73…

…eff-20ce-4689-8f48-b5c219aa9e30
xamarin · Jan 17, 2025 · 623d1fe · 623d1fe
2 parents 94aa8a2 + 0683a2e
commit 623d1fe
Show file tree

Hide file tree

Showing 1,187 changed files with 51,524 additions and 39,456 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,3 +1,8 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
 [*.{props,targets}]
 indent_style = tab
 indent_size = 4

diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,5 @@
-[submodule "external/Touch.Unit"]
-    path = external/Touch.Unit
-    url = ../../xamarin/Touch.Unit.git
-    branch = main
 [submodule "external/Xamarin.MacDev"]
     path = external/Xamarin.MacDev
     url = ../../xamarin/Xamarin.MacDev
     branch = main
-[submodule "external/MonoTouch.Dialog"]
-    path = external/MonoTouch.Dialog
-    url = ../../xamarin/MonoTouch.Dialog
-    branch = dotnet
+
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -95,7 +95,6 @@
 /src/HomeKit
 /src/homekit.cs
 /src/iad.cs
-/src/iAd.framework
 /src/identitylookup.cs @dalexsoto
 /src/identitylookupui.cs @dalexsoto
 /src/ituneslibrary.cs @mandel-macaque
@@ -184,8 +183,6 @@
 /src/vision.cs @dalexsoto
 /src/WatchConnectivity @rolfbjarne
 /src/watchconnectivity.cs @rolfbjarne
-/src/WatchKit @rolfbjarne
-/src/watchkit.cs @rolfbjarne
 /src/WebKit
 /src/webkit.cs
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,6 +8,7 @@
 		<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
 		<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
 		<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
+		<NUnitXmlTestLoggerPackageVersion>3.1.15</NUnitXmlTestLoggerPackageVersion>
 	</PropertyGroup>
 	<Import Project="Build.props" Condition="Exists('Build.props')" />
 </Project>
diff --git a/Make.config b/Make.config
@@ -44,10 +44,10 @@ include $(TOP)/Make.versions
 # The value is taken from the name + version of the Ref pack.
 # Example: given the Ref pack "Microsoft.iOS.Ref.net8.0_17.5" with the version "17.5.8030", the value
 # to write here would be the part after "Microsoft.iOS.Ref." + "/" + version: "net8.0_17.5/17.5.8030"
-STABLE_NUGET_VERSION_iOS=net9.0_18.0/18.0.9617
-STABLE_NUGET_VERSION_tvOS=net9.0_18.0/18.0.9617
-STABLE_NUGET_VERSION_MacCatalyst=net9.0_18.0/18.0.9617
-STABLE_NUGET_VERSION_macOS=net9.0_15.0/15.0.9617
+STABLE_NUGET_VERSION_iOS=net9.0_18.2/18.2.9170
+STABLE_NUGET_VERSION_tvOS=net9.0_18.2/18.2.9170
+STABLE_NUGET_VERSION_MacCatalyst=net9.0_18.2/18.2.9170
+STABLE_NUGET_VERSION_macOS=net9.0_15.2/15.2.9170
 
 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 
@@ -169,15 +169,6 @@ endif
 
 NUGET_BUILD_METADATA=
 
-IOS_PRODUCT=Xamarin.iOS
-IOS_PACKAGE_NAME=Xamarin.iOS
-IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
-IOS_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION)))
-IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION)))
-IOS_PACKAGE_VERSION_REV:=$(word 3, $(subst ., ,$(IOS_PACKAGE_VERSION)))
-IOS_PACKAGE_VERSION_BUILD=$(IOS_COMMIT_DISTANCE)
-IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_MAJOR) $(IOS_PACKAGE_VERSION_MINOR) $(IOS_PACKAGE_VERSION_REV) $(IOS_PACKAGE_VERSION_BUILD))
-
 IOS_NUGET=Microsoft.iOS
 IOS_NUGET_VERSION=$(IOS_NUGET_OS_VERSION).$(IOS_NUGET_COMMIT_DISTANCE)
 IOS_NUGET_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_NUGET_VERSION)))
@@ -312,31 +303,18 @@ RANLIB=$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranli
 # paths to the modules we depend on, as variables, so people can put
 # things in other places if they absolutely must.
 MONO_PATH=$(TOP)/external/mono
-TOUCH_UNIT_PATH=$(TOP)/external/Touch.Unit
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
 MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
 API_TOOLS_PATH=$(TOP)/external/api-tools
 MACCORE_PATH=$(TOP)/../maccore
-ADR_PATH=$(TOP)/../macios-adr
+ADR_PATH:=$(abspath $(TOP)/../macios-adr)
 
 MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
 SYSTEM_MONO=$(MONO_PREFIX)/bin/mono
 SYSTEM_MSBUILD=unset MSBuildExtensionsPath && $(MONO_PREFIX)/bin/msbuild /p:Features=strict /m
 
 PKG_CONFIG=$(MONO_PREFIX)/bin/pkg-config
 
-MAC_PRODUCT=Xamarin.Mac
-MAC_PACKAGE_NAME=xamarin.mac
-MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
-
-MAC_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(MAC_PACKAGE_VERSION)))
-MAC_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(MAC_PACKAGE_VERSION)))
-MAC_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(MAC_PACKAGE_VERSION)))
-MAC_PACKAGE_VERSION_BUILD=$(word 4, $(subst ., ,$(MAC_PACKAGE_VERSION)))
-MAC_PACKAGE_VERSION_MAJOR_MINOR=$(MAC_PACKAGE_VERSION_MAJOR).$(MAC_PACKAGE_VERSION_MINOR)
-MAC_PACKAGE_UPDATE_ID=$(shell echo $(subst ., ,$(MAC_PACKAGE_VERSION).$(MAC_PACKAGE_VERSION_BUILD)) | awk '{printf "2%02d%02d%02d%03d",$$1,$$2,$$3,$$4}')
-MAC_PACKAGE_TITLE=Xamarin $(MAC_PACKAGE_NAME) $(MAC_PACKAGE_VERSION)
-
 MACOS_NUGET=Microsoft.macOS
 MACOS_NUGET_VERSION=$(MACOS_NUGET_OS_VERSION).$(MACOS_NUGET_COMMIT_DISTANCE)
 MACOS_NUGET_VERSION_MAJOR=$(word 1, $(subst ., ,$(MACOS_NUGET_VERSION)))
@@ -345,11 +323,6 @@ MACOS_NUGET_VERSION_PATCH=$(word 3, $(subst ., ,$(MACOS_NUGET_VERSION)))
 MACOS_NUGET_VERSION_NO_METADATA=$(MACOS_NUGET_VERSION)$(NUGET_PRERELEASE_IDENTIFIER)
 MACOS_NUGET_VERSION_FULL=$(MACOS_NUGET_VERSION_NO_METADATA)$(NUGET_BUILD_METADATA)
 
-MAC_PACKAGE_FILENAME=$(MAC_PACKAGE_NAME_LOWER)-$(MAC_PACKAGE_VERSION).pkg
-MAC_PACKAGE_DMG_FILENAME=$(MAC_PACKAGE_NAME_LOWER)-$(MAC_PACKAGE_VERSION).dmg
-MAC_PACKAGE_DMG_DIRNAME="$(MAC_PACKAGE_TITLE)"
-MAC_PACKAGE_UTI=com.$(MAC_PACKAGE_NAME_LOWER).pkg
-
 TT = $(DOTNET) tool restore && $(DOTNET) t4
 
 PRODUCT_KEY_PATH?=$(TOP)/product.snk
@@ -600,28 +573,28 @@ DOTNET_maccatalyst_PLATFORM=maccatalyst
 DOTNET_macos_PLATFORM=macos
 
 # XCFRAMEWORK -> clang argument for min OS version
-CLANG_iossimulator-x64_VERSION_MIN=-mios-simulator-version-min=$(MIN_IOS_SDK_VERSION)
-CLANG_iossimulator-arm64_VERSION_MIN=-mios-simulator-version-min=$(MIN_IOS_SDK_VERSION)
-CLANG_ios-arm64_VERSION_MIN=-miphoneos-version-min=$(MIN_IOS_SDK_VERSION)
-CLANG_tvossimulator-x64_VERSION_MIN=-mtvos-simulator-version-min=$(MIN_TVOS_SDK_VERSION)
-CLANG_tvossimulator-arm64_VERSION_MIN=-mtvos-simulator-version-min=$(MIN_TVOS_SDK_VERSION)
-CLANG_tvos-arm64_VERSION_MIN=-mtvos-version-min=$(MIN_TVOS_SDK_VERSION)
-CLANG_maccatalyst-x64_VERSION_MIN=-target x86_64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi -arch x86_64
-CLANG_maccatalyst-arm64_VERSION_MIN=-target arm64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi -arch arm64
-CLANG_osx-x64_VERSION_MIN=-mmacosx-version-min=$(MIN_MACOS_SDK_VERSION)
-CLANG_osx-arm64_VERSION_MIN=-mmacosx-version-min=$(MIN_MACOS_SDK_VERSION)
+CLANG_iossimulator-x64_VERSION_MIN=-mios-simulator-version-min=$(DOTNET_MIN_IOS_SDK_VERSION)
+CLANG_iossimulator-arm64_VERSION_MIN=-mios-simulator-version-min=$(DOTNET_MIN_IOS_SDK_VERSION)
+CLANG_ios-arm64_VERSION_MIN=-miphoneos-version-min=$(DOTNET_MIN_IOS_SDK_VERSION)
+CLANG_tvossimulator-x64_VERSION_MIN=-mtvos-simulator-version-min=$(DOTNET_MIN_TVOS_SDK_VERSION)
+CLANG_tvossimulator-arm64_VERSION_MIN=-mtvos-simulator-version-min=$(DOTNET_MIN_TVOS_SDK_VERSION)
+CLANG_tvos-arm64_VERSION_MIN=-mtvos-version-min=$(DOTNET_MIN_TVOS_SDK_VERSION)
+CLANG_maccatalyst-x64_VERSION_MIN=-target x86_64-apple-ios$(DOTNET_MIN_MACCATALYST_SDK_VERSION)-macabi -arch x86_64
+CLANG_maccatalyst-arm64_VERSION_MIN=-target arm64-apple-ios$(DOTNET_MIN_MACCATALYST_SDK_VERSION)-macabi -arch arm64
+CLANG_osx-x64_VERSION_MIN=-mmacosx-version-min=$(DOTNET_MIN_MACOS_SDK_VERSION)
+CLANG_osx-arm64_VERSION_MIN=-mmacosx-version-min=$(DOTNET_MIN_MACOS_SDK_VERSION)
 
 # RUNTIMEIDENTIFIER -> swiftc argument(s) for min OS version
-SWIFTC_iossimulator-arm64_VERSION_MIN=-target arm64-apple-ios$(MIN_IOS_SDK_VERSION)-simulator
-SWIFTC_iossimulator-x64_VERSION_MIN=-target x86_64-apple-ios$(MIN_IOS_SDK_VERSION)-simulator
-SWIFTC_ios-arm64_VERSION_MIN=-target arm64-apple-ios$(MIN_IOS_SDK_VERSION)
-SWIFTC_tvossimulator-x64_VERSION_MIN=-target x86_64-apple-tvos$(MIN_TVOS_SDK_VERSION)-simulator
-SWIFTC_tvossimulator-arm64_VERSION_MIN=-target arm64-apple-tvos$(MIN_TVOS_SDK_VERSION)-simulator
-SWIFTC_tvos-arm64_VERSION_MIN=-target arm64-apple-tvos$(MIN_TVOS_SDK_VERSION)
-SWIFTC_maccatalyst-x64_VERSION_MIN=-target x86_64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi
-SWIFTC_maccatalyst-arm64_VERSION_MIN=-target arm64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi
-SWIFTC_osx-x64_VERSION_MIN=-target x86_64-apple-macos$(MIN_MACOS_SDK_VERSION)
-SWIFTC_osx-arm64_VERSION_MIN=-target arm64-apple-macos$(MIN_MACOS_SDK_VERSION)
+SWIFTC_iossimulator-arm64_VERSION_MIN=-target arm64-apple-ios$(DOTNET_MIN_IOS_SDK_VERSION)-simulator
+SWIFTC_iossimulator-x64_VERSION_MIN=-target x86_64-apple-ios$(DOTNET_MIN_IOS_SDK_VERSION)-simulator
+SWIFTC_ios-arm64_VERSION_MIN=-target arm64-apple-ios$(DOTNET_MIN_IOS_SDK_VERSION)
+SWIFTC_tvossimulator-x64_VERSION_MIN=-target x86_64-apple-tvos$(DOTNET_MIN_TVOS_SDK_VERSION)-simulator
+SWIFTC_tvossimulator-arm64_VERSION_MIN=-target arm64-apple-tvos$(DOTNET_MIN_TVOS_SDK_VERSION)-simulator
+SWIFTC_tvos-arm64_VERSION_MIN=-target arm64-apple-tvos$(DOTNET_MIN_TVOS_SDK_VERSION)
+SWIFTC_maccatalyst-x64_VERSION_MIN=-target x86_64-apple-ios$(DOTNET_MIN_MACCATALYST_SDK_VERSION)-macabi
+SWIFTC_maccatalyst-arm64_VERSION_MIN=-target arm64-apple-ios$(DOTNET_MIN_MACCATALYST_SDK_VERSION)-macabi
+SWIFTC_osx-x64_VERSION_MIN=-target x86_64-apple-macos$(DOTNET_MIN_MACOS_SDK_VERSION)
+SWIFTC_osx-arm64_VERSION_MIN=-target arm64-apple-macos$(DOTNET_MIN_MACOS_SDK_VERSION)
 
 
 # Misc other computed variables

diff --git a/Make.versions b/Make.versions
@@ -1,8 +1,5 @@
 #
-# A release branch requires updating the following six variables at the bottom of this file:
-#
-# IOS_PACKAGE_VERSION (major/minor/revision #)
-# MAC_PACKAGE_VERSION (major/minor/revision #)
+# A release branch requires updating the following four variables further down in this file:
 #
 # IOS_NUGET_VERSION (major/minor/patch #)
 # TVOS_NUGET_VERSION (major/minor/patch #)
@@ -12,45 +9,6 @@
 # Update version numbers on main as well, to the next version
 #
 
-#
-# ** Version numbers **
-#
-# Versions are defined as: Major.Minor.Revison.Build
-#
-# Major/minor (first/second numbers - max 2 digits each):
-# - Bump for major/minor releases.
-#
-# Revision (third number - max 2 digits):
-# - Reset to 0 after a major or minor bump (do not use 99 for Xcode preview
-#   branches (use 0 instead), because otherwise we can't bump it further if
-#   needed).
-# - Bump for service releases and previews.
-# - Bump if commit distance becomes > 999.
-# - Can also be bumped for other reasons (in particular there's no correlation
-#   between Preview/Service Release #X and Revision #Y).
-#   - Bumping revision to a high enough number to make it clear that there's
-#     no correlation is a valid reason to bump.
-# - The revision must be bumped at the same time for both iOS and Mac
-#   (otherwise the commit distance will differ).
-# - Also bump if the [IOS|MAC]_PACKAGE_VERSION lines change for any other
-#   reason (otherwise we end up with repeating version numbers, since the
-#   commit distance would restart at 0, while the other numbers wouldn't
-#   change).
-# - Any other problem can also usually be solved by bumping the revision.
-# - Do not refactor the revision to a separate variable, because the reason
-#   bumping the revision is a general solution for many problems is that it
-#   also resets the commit distance (which wouldn't happen if the revision was
-#   refactored to a separate variable).
-#
-# Build (fourth number - max 3 digits):
-# - Automatically calculated as the number of commits since the last time any
-#   of the other three numbers changed (technically since the corresponding
-#   line changed in git).
-#
-
-IOS_PACKAGE_VERSION=17.99.0.$(IOS_COMMIT_DISTANCE)
-MAC_PACKAGE_VERSION=9.99.0.$(MAC_COMMIT_DISTANCE)
-
 #
 # ** NuGet package version numbers **
 #
@@ -63,8 +21,6 @@ MAC_PACKAGE_VERSION=9.99.0.$(MAC_COMMIT_DISTANCE)
 # IMPORTANT: There must be *no* managed API differences unless the two first
 # numbers (major.minor) changes.
 
-# WARNING: Do **not** use versions higher than the available Xcode SDK or else we will have issues with mtouch (See https://github.com/xamarin/xamarin-macios/issues/7705)
-
 IOS_NUGET_OS_VERSION=18.2
 TVOS_NUGET_OS_VERSION=18.2
 MACOS_NUGET_OS_VERSION=15.2

diff --git a/Makefile b/Makefile
@@ -20,21 +20,6 @@ world: check-system
 
 .PHONY: check-system
 check-system:
-ifdef INCLUDE_MAC
-ifdef INCLUDE_IOS
-	@if [[ "x$(IOS_COMMIT_DISTANCE)" != "x$(MAC_COMMIT_DISTANCE)" ]]; then \
-		echo "$(COLOR_RED)*** The commit distance for Xamarin.iOS ($(IOS_COMMIT_DISTANCE)) and Xamarin.Mac ($(MAC_COMMIT_DISTANCE)) are different.$(COLOR_CLEAR)"; \
-		echo "$(COLOR_RED)*** To fix this problem, bump the revision (the third number) for both $(COLOR_GRAY)IOS_PACKAGE_NUMBER$(COLOR_RED) and $(COLOR_GRAY)MAC_PACKAGE_NUMBER$(COLOR_RED) in Make.versions.$(COLOR_CLEAR)"; \
-		echo "$(COLOR_RED)*** Once fixed, you need to commit the changes for them to pass this check.$(COLOR_CLEAR)"; \
-		exit 1; \
-	elif (( $(IOS_COMMIT_DISTANCE) > 999 || $(MAC_COMMIT_DISTANCE) > 999 )); then \
-		echo "$(COLOR_RED)*** The commit distance for Xamarin.iOS ($(IOS_COMMIT_DISTANCE)) and/or Xamarin.Mac ($(MAC_COMMIT_DISTANCE)) are > 999.$(COLOR_CLEAR)"; \
-		echo "$(COLOR_RED)*** To fix this problem, bump the revision (the third number) for both $(COLOR_GRAY)IOS_PACKAGE_NUMBER$(COLOR_RED) and $(COLOR_GRAY)MAC_PACKAGE_NUMBER$(COLOR_RED) in Make.versions.$(COLOR_CLEAR)"; \
-		echo "$(COLOR_RED)*** Once fixed, you need to commit the changes for them to pass this check.$(COLOR_CLEAR)"; \
-		exit 1; \
-	fi
-endif
-endif
 	@./system-dependencies.sh
 	$(Q) $(MAKE) show-versions
 

diff --git a/create-make-config.sh b/create-make-config.sh
@@ -12,9 +12,6 @@ LANG=C
 export LANG
 
 # Compute commit distances
-printf "IOS_COMMIT_DISTANCE:=$(git log $(git blame -- ./Make.versions HEAD | grep IOS_PACKAGE_VERSION= | sed 's/ .*//' )..HEAD --oneline | wc -l | sed 's/ //g')\n" >> "$OUTPUT_FILE"
-printf "MAC_COMMIT_DISTANCE:=$(git log $(git blame -- ./Make.versions HEAD | grep MAC_PACKAGE_VERSION= | sed 's/ .*//' )..HEAD --oneline | wc -l | sed 's/ //g')\n" >> "$OUTPUT_FILE"
-
 for platform in $ALL_DOTNET_PLATFORMS; do
 	PLATFORM=$(echo "$platform" | tr '[:lower:]' '[:upper:]')
 	COMMIT=$(git blame -- ./Make.versions HEAD | grep "${PLATFORM}_NUGET_OS_VERSION=" | sed 's/ .*//')

diff --git a/docs/api/UIKit/UIAlertView.xml b/docs/api/UIKit/UIAlertView.xml
@@ -1,36 +1,55 @@
 <Documentation>
   <Docs DocId="T:UIKit.UIAlertView">
-    <summary>A <see cref="T:UIKit.UIView" /> that displays a dialog message with one or more buttons. (As of iOS 8, devs should use <see cref="T:UIKit.UIAlertController" /> rather than this class.)</summary>
+    <summary>
+      A <see cref="UIView" /> that displays a dialog message with one or more buttons.
+      (As of iOS 8, devs should use <see cref="UIAlertController" /> rather than this class.)
+    </summary>
     <remarks>
-      <para>As of iOS 8, app devs should use <see cref="T:UIKit.UIAlertController" /> rather than this class. Extensions may not use this class at all.</para>
       <para>
-        The <see cref="T:UIKit.UIAlertView" /> allows the application user to choose among alternative actions. The following code and image, taken from the "AlertViews" section of the "ios Standard Controls" sample illustrates the simplest use-case:
+        As of iOS 8, app devs should use <see cref="UIAlertController" /> rather than this class.
+        Extensions may not use this class at all.
+      </para>
+      <para>
+        The <see cref="UIAlertView" /> allows the application user to choose among alternative actions.
+        The following code and image, taken from the "AlertViews" section of the "ios Standard Controls"
+        sample illustrates the simplest use-case:
       </para>
       <example>
         <code lang="csharp lang-csharp"><![CDATA[
-UIAlertView alert = new UIAlertView () { 
-	Title = "alert title", Message = "this is a simple alert"
+var alert = new UIAlertView () {
+	Title = "alert title",
+  Message = "this is a simple alert"
 };
-alert.AddButton("OK");
+alert.AddButton ("OK");
 alert.Show ();
         ]]></code>
       </example>
       <para>
-        <img href="~/UIKit/_images/UIKit.UIAlertView.png" alt="Screenshot showing the alert view" />
+        An alternative to the <see cref="UIAlertView" /> is the <see cref="UIActionSheet" />.
       </para>
-      <para>An alternative to the <see cref="T:UIKit.UIAlertView" /> is the <see cref="T:UIKit.UIActionSheet" />.</para>
-      <para>The application developer can use <see cref="T:UIKit.UIAlertViewStyle" />s such as <see cref="F:UIKit.UIAlertViewStyle.PlainTextInput" /> or <see cref="F:UIKit.UIAlertViewStyle.LoginAndPasswordInput" /> to allow the application user to enter values.</para>
       <para>
-   The Xamarin API supports two styles of event notification: the Objective-C style that uses a delegate class or the C# style using event notifications.  
-</para>
+        The application developer can use <see cref="UIAlertViewStyle" />s such as <see cref="UIAlertViewStyle.PlainTextInput" />
+        or <see cref="UIAlertViewStyle.LoginAndPasswordInput" /> to allow the application user to enter values.
+      </para>
+      <para>
+        The managed API supports two styles of event notification: the Objective-C style that uses a delegate class or the C# style using event notifications.
+      </para>
       <para>
-   The C# style allows the user to add or remove event handlers at runtime by assigning to the events of properties of this class.    Event handlers can be anyone of a method, an anonymous methods or a lambda expression.  Using the C# style events or properties will override any manual settings to the Objective-C Delegate or WeakDelegate settings.
-</para>
-      <para>The Objective-C style requires the user to create a new class derived from <see cref="T:UIKit.UIAlertViewDelegate" /> class and assign it to the <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=UIKit%20Delegate&amp;scope=Xamarin" title="P:UIKit.Delegate">P:UIKit.Delegate</a></format> property.   Alternatively, for low-level control, by creating a class derived from <see cref="T:Foundation.NSObject" /> which has every entry point properly decorated with an [Export] attribute.   The instance of this object can then be assigned to the <see cref="P:UIKit.UIAlertView.WeakDelegate" /> property.   
+        The C# style allows the user to add or remove event handlers at runtime by assigning to the
+        events of properties of this class. Event handlers can be anyone of a method, an anonymous method
+        or a lambda expression. Using the C# style events or properties will override any manual settings
+        to the Objective-C Delegate or WeakDelegate settings.
       </para>
-      <block subset="none" type="overrides">
+      <para>
+        The Objective-C style requires the user to create a new class derived from <see cref="UIAlertViewDelegate" />
+        class and assign it to the <see cref="Delegate" /> property. Alternatively, for low-level control, by creating
+        a class derived from <see cref="NSObject" /> which has every entry point properly decorated with an
+        <see cref="ExportAttribute" /> attribute and assigning an instance of this class to the <see cref="WeakDelegate" />
+        property.
+      </para>
+      <para>
         <para>This class should not be subclassed.</para>
-      </block>
+      </para>
     </remarks>
     <related type="externalDocumentation" href="https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIAlertView_Class/index.html">Apple documentation for <c>UIAlertView</c></related>
   </Docs>