Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into merge_net8_to_main
Browse files Browse the repository at this point in the history
# Conflicts:
#	eng/Versions.props
  • Loading branch information
mattleibow committed Oct 11, 2023
2 parents 36ed2e4 + 81fd8f6 commit 8e41106
Show file tree
Hide file tree
Showing 72 changed files with 1,638 additions and 2,638 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Expand Up @@ -9,7 +9,7 @@
]
},
"powershell": {
"version": "7.3.7",
"version": "7.3.8",
"commands": [
"pwsh"
]
Expand Down
3 changes: 1 addition & 2 deletions README.md
Expand Up @@ -18,9 +18,8 @@
![.NET MAUI Weather App on all platforms](Assets/maui-weather-hero-sm.png)

## Current News

* October 10, 2023 - [Announcing .NET MAUI in .NET 8 Release Candidate 2: More Quality](https://devblogs.microsoft.com/dotnet/announcing-dotnet-maui-in-dotnet-8-rc-2/)
* September 12, 2023 - [Announcing .NET MAUI in .NET 8 Release Candidate 1: Quality](https://devblogs.microsoft.com/dotnet/announcing-dotnet-maui-in-dotnet-8-rc-1)
* August 8, 2023 - [Announcing .NET MAUI in .NET 8 Preview 7: Keyboard Accelerators](https://devblogs.microsoft.com/dotnet/announcing-dotnet-maui-in-dotnet-8-preview-7/)

Follow the [.NET MAUI Blog](https://devblogs.microsoft.com/dotnet/category/net-maui/) and visit the [News](https://github.com/dotnet/maui/wiki/News) wiki page for more news and updates.

Expand Down
Expand Up @@ -7,9 +7,9 @@ public class AutomationPropertiesGallery : ContentPage
{
public AutomationPropertiesGallery()
{
// https://developer.xamarin.com/guides/android/advanced_topics/accessibility/
// https://developer.xamarin.com/guides/ios/advanced_topics/accessibility/
// https://msdn.microsoft.com/en-us/windows/uwp/accessibility/basic-accessibility-information
// https://learn.microsoft.com/xamarin/android/app-fundamentals/accessibility
// https://learn.microsoft.com/xamarin/ios/app-fundamentals/accessibility
// https://learn.microsoft.com/windows/apps/design/accessibility/basic-accessibility-information

const string EntryPlaceholder = "Your name.";
const string EntryHelpText = "Type your name.";
Expand Down
3 changes: 0 additions & 3 deletions src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs
Expand Up @@ -96,7 +96,6 @@ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary

//Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
//{
// // http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
// if (null != e.View.AutomationId && null != e.NativeView)
// {
// // e.NativeView.AccessibilityIdentifier = e.View.StyleId;
Expand Down Expand Up @@ -186,8 +185,6 @@ public void StartPressed40911()
[Export("navigateToTest:")]
public string NavigateToTest(string test)
{
// According to https://developer.xamarin.com/guides/testcloud/uitest/working-with/backdoors/
// this method has to return a string
return (Microsoft.Maui.Controls.Application.Current as App).NavigateToTestPage(test).ToString();
}

Expand Down
Expand Up @@ -23,7 +23,6 @@ protected override void OnElementChanged(ElementChangedEventArgs<CustomView> e)
// --- Important --- //
//
// This is a WRONG Pattern!
//Pattern taken from: https://docs.microsoft.com/en-us/xamarin/xamarin-forms/app-fundamentals/custom-renderer/view
if (this.Control == null)
{
// Instantiate the native control and assign it to the Control property with
Expand Down
Expand Up @@ -169,8 +169,7 @@ public override UITableViewCell GetCell(Cell item, UITableViewCell reusableCell,


/// <summary>
/// Sample of a custom cell layout, taken from the iOS docs at
/// http://developer.xamarin.com/guides/ios/user_interface/tables/part_3_-_customizing_a_table's_appearance/
/// Sample of a custom cell layout.
/// </summary>
public class NativeiOSCell : UITableViewCell
{
Expand Down Expand Up @@ -224,8 +223,7 @@ public override void LayoutSubviews()
}

/// <summary>
/// Sample of a custom cell layout, taken from the iOS docs at
/// http://developer.xamarin.com/guides/ios/user_interface/tables/part_3_-_customizing_a_table's_appearance/
/// Sample of a custom cell layout.
/// </summary>
public class NativeiOSListViewCell : UITableViewCell
{
Expand Down
Expand Up @@ -4,8 +4,7 @@
namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
{
/// <summary>
/// Extension class, provides native embedding functionalities:
/// https://developer.xamarin.com/guides/xamarin-forms/user-interface/layouts/add-platform-controls/
/// Extension class, provides native embedding functionalities.
/// </summary>
/// <remarks>
/// This code is not used in the Microsoft.Maui.Controls.Compatibility.Platform.Tizen implementation, however it should not
Expand Down
Expand Up @@ -22,7 +22,7 @@ protected override void UpdateTimeAndFormat()
{
if (Control is MPicker mp)
{
// Microsoft.Maui.Controls using DateTime formatting (https://developer.xamarin.com/api/property/Microsoft.Maui.Controls.TimePicker.Format/)
// .NET MAUI using DateTime formatting (https://learn.microsoft.com/dotnet/api/microsoft.maui.controls.timepicker.format)
mp.Placeholder = new DateTime(Time.Ticks).ToString(Element.Format ?? _defaultFormat);
}
}
Expand Down
5 changes: 0 additions & 5 deletions src/Controls/docs/Microsoft.Maui.Controls/AbsoluteLayout.xml
Expand Up @@ -137,11 +137,6 @@
}]]></code>
</example>
<para>The following image shows the AbsoluteLayout demo from the <format type="text/html"><a href="https://developer.xamarin.com/samples/tag/Microsoft.Maui.Controls/" target="_blank">FormsGallery</a></format> sample.
</para>
<para>
<img href="~/xml/Microsoft.Maui.Controls/_images/AbsoluteLayout.TripleScreenShot.png" />
</para>
<example>
<para>XAML for Microsoft.Maui.Controls supports the following attached properties for the <see cref="T:Microsoft.Maui.Controls.AbsoluteLayout" /> class:</para>
<list type="table">
Expand Down
11 changes: 0 additions & 11 deletions src/Controls/docs/Microsoft.Maui.Controls/AppLinkEntry.xml
Expand Up @@ -18,10 +18,6 @@
</Interfaces>
<Docs>
<summary>A deep application link in an app link search index.</summary>
<remarks>
<para>For information on setting up deep application linking on the Android platform (and on using deep linking in general), see <format type="text/html"><a href="https://developer.xamarin.com/guides/xamarin-forms/platform-features/deep-linking/">Application Indexing and Deep Linking</a></format>.</para>
</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/platform-features/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
<Members>
<Member MemberName=".ctor">
Expand Down Expand Up @@ -61,7 +57,6 @@
<summary>Gets or sets an application-specific URI that uniquely describes content within an app.</summary>
<value>An application-specific URI that uniquely describes content within an app.</value>
<remarks>To be added.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/working-with/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
</Member>
<Member MemberName="AppLinkUriProperty">
Expand Down Expand Up @@ -104,7 +99,6 @@
<summary>Gets or sets a description that appears with the item in search results.</summary>
<value>The description that appears with the item in search results.</value>
<remarks>To be added.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/working-with/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
</Member>
<Member MemberName="DescriptionProperty">
Expand Down Expand Up @@ -171,7 +165,6 @@
<summary>Gets or sets a value that tells whether the item that is identified by the link entry is currently open.</summary>
<value>A value that tells whether the item that is identified by the link entry is currently open.</value>
<remarks>Application developers can set this value in <see cref="E:Microsoft.Maui.Controls.Application.PageAppearing" /> and <see cref="E:Microsoft.Maui.Controls.Application.PageDisappearing" /> methods to control whether the app link is shown for indexing or Handoff.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/working-with/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
</Member>
<Member MemberName="IsLinkActiveProperty">
Expand All @@ -191,7 +184,6 @@
<Docs>
<summary>Backing store for the <see cref="P:Microsoft.Maui.Controls.AppLinkEntry.IsLinkActive" /> property.</summary>
<remarks>To be added.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/working-with/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
</Member>
<Member MemberName="KeyValues">
Expand All @@ -215,7 +207,6 @@
<summary>Gets a dictionary of application-specific key-value pairs.</summary>
<value>A dictionary of standard and application-specific key-value pairs that is used for Handoff on the iOS platform.</value>
<remarks>The standard keys are <c>contentType</c>, <c>associatedWebPage</c>, and <c>shouldAddToPublicIndex</c>.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/working-with/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
</Member>
<Member MemberName="Thumbnail">
Expand All @@ -239,7 +230,6 @@
<summary>Gets or sets a small image that appears with the item in search results.</summary>
<value>A small image that appears with the item in search results</value>
<remarks>To be added.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/working-with/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
</Member>
<Member MemberName="ThumbnailProperty">
Expand Down Expand Up @@ -282,7 +272,6 @@
<summary>Gets or sets the title of the item.</summary>
<value>The title of the item.</value>
<remarks>To be added.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/working-with/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
</Member>
<Member MemberName="TitleProperty">
Expand Down
2 changes: 0 additions & 2 deletions src/Controls/docs/Microsoft.Maui.Controls/Application.xml
Expand Up @@ -105,7 +105,6 @@ public partial class App : Application
<summary>Gets the object that developers use to register or unregister application links.</summary>
<value>The object that developers use to register or unregister application links.</value>
<remarks>It is not possible to unregister an app link on the Android platform.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/platform-features/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
</Member>
<Member MemberName="CleanUp">
Expand Down Expand Up @@ -438,7 +437,6 @@ public partial class App : Application
<param name="uri">The URI for the request.</param>
<summary>App developers override this method to respond when the user initiates an app link request.</summary>
<remarks>To be added.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/platform-features/deep-linking/">Application Indexing and Deep Linking</related>
</Docs>
</Member>
<Member MemberName="OnParentSet">
Expand Down
1 change: 0 additions & 1 deletion src/Controls/docs/Microsoft.Maui.Controls/Behavior.xml
Expand Up @@ -19,7 +19,6 @@
<Docs>
<summary>Base class for generalized user-defined behaviors that can respond to arbitrary conditions and events.</summary>
<remarks>Application developers should specialize the <see cref="T:Microsoft.Maui.Controls.Behavior`1" /> generic class, instead of directly using <see cref="T:Microsoft.Maui.Controls.Behavior" />.</remarks>
<related type="article" href="https://developer.xamarin.com/guides/xamarin-forms/application-fundamentals/behaviors/creating/">Microsoft.Maui.Controls Behaviors</related>
</Docs>
<Members>
<Member MemberName=".ctor">
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/docs/Microsoft.Maui.Controls/Button.xml
Expand Up @@ -68,7 +68,7 @@
BorderColor="Black"
HorizontalOptions="Center"/>
]]></code>
To display the <c>icon.png</c> image with the above XAML, the developer must place it in the appropriate location, with the appropriate build action, specific to each platform project. The <format type="text/html"><a href="https://developer.xamarin.com/guides/xamarin-forms/user-interface/images/">Images</a></format> topic explains this and other important details about working with images in Microsoft.Maui.Controls.
To display the <c>icon.png</c> image with the above XAML, the developer must place it in the appropriate location, with the appropriate build action, specific to each platform project.
</example>
<format type="text/html">
<h1>Button Events</h1>
Expand Down
1 change: 0 additions & 1 deletion src/Controls/docs/Microsoft.Maui.Controls/ContentPage.xml
Expand Up @@ -55,7 +55,6 @@ namespace ContentPageExample
}
}
]]></code>
<para>The <format type="text/html"><a href="https://docs.microsoft.com/samples/xamarin/xamarin-forms-samples/formsgallery/" target="_blank">FormsGallery</a></format> sample, which can be found on the <format type="text/html"><a href="https://docs.microsoft.com/samples/browse/" target="_blank">Sample Applications</a></format> page, has a ContentPageDemoPage.cs file. This file contains a longer and more complicated example.</para>
</example>
</remarks>
</Docs>
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/docs/Microsoft.Maui.Controls/Device.xml
Expand Up @@ -100,7 +100,7 @@ Device.BeginInvokeOnMainThread (() => {
<summary>Gets the flow direction on the device.</summary>
<value>The flow direction on the device. See Remarks.</value>
<remarks>
<para>The following contains a few important points about flow direction from <format type="text/html"><a href="https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/localization/right-to-left">Right-to-Left Localization</a></format>. Developers should consult that document for more information about limitations of right-to-left support, and for requirements to implement right-to-left support on various target platforms.</para>
<para>The following contains a few important points about flow direction from <format type="text/html"><a href="https://learn.microsoft.com/dotnet/maui/fundamentals/localization#right-to-left-localization">Right-to-Left Localization</a></format>. Developers should consult that document for more information about limitations of right-to-left support, and for requirements to implement right-to-left support on various target platforms.</para>
<para>The default value of <see cref="T:Microsoft.Maui.FlowDirection" /> for a visual element that has no parent is <see cref="F:Microsoft.Maui.FlowDirection.LeftToRight" />, even on platforms where <see cref="P:Microsoft.Maui.Controls.Device.FlowDirection" /> is <see cref="F:Microsoft.Maui.FlowDirection.RightToLeft" />. Therefore, developers must deliberately opt in to right-to-left layout. Developers can choose right-to-left layout by setting the <see cref="P:Microsoft.Maui.Controls.VisualElement.FlowDirection" /> property of the root element to <see cref="F:Microsoft.Maui.FlowDirection.RightToLeft" /> to chosse right-to-left layout, or to <see cref="F:Microsoft.Maui.FlowDirection.MatchParent" /> to match the device layout.</para>
<para>All <see cref="T:Microsoft.Maui.Controls.VisualElement" />s that have a parent default to <see cref="F:Microsoft.Maui.FlowDirection.MatchParent" />.</para>
</remarks>
Expand Down

0 comments on commit 8e41106

Please sign in to comment.