-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dev--moljac--fix-resizetizer-invalid-png-fro…
…m-svg
- Loading branch information
Showing
101 changed files
with
1,790 additions
and
493 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 8.0.20-ci.net8 | ||
| 8.0.20-ci.net8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
src/Controls/samples/Controls.Sample.UITests/Issues/Issue19556.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||
| x:Class="Maui.Controls.Sample.Issues.Issue19556" | ||
| xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls" | ||
| ios:NavigationPage.PrefersLargeTitles="false" | ||
| Title="Issue19556"> | ||
| <StackLayout Padding="30,0" Spacing="0"> | ||
| <Label Text="NET Multi-platform App UI monospace" | ||
| FontFamily="monospace" | ||
| AutomationId="label" | ||
| SemanticProperties.HeadingLevel="Level1" /> | ||
| <Label Text=".NET Multi-platform App UI sans-serif-condensed" | ||
| FontFamily="sans-serif-condensed" | ||
| SemanticProperties.HeadingLevel="Level2" | ||
| SemanticProperties.Description="Welcome to dot net Multi platform App U I sans-serif-condensed" /> | ||
| <Label Text=".NET Multi-platform App UI sans-serif-condensed-light" | ||
| FontFamily="sans-serif-condensed-light" | ||
| SemanticProperties.HeadingLevel="Level2" | ||
| SemanticProperties.Description="Welcome to dot net Multi platform App U I sans-serif-condensed-light" /> | ||
| <Label Text=".NET Multi-platform App UI serif" | ||
| FontFamily="serif" | ||
| SemanticProperties.HeadingLevel="Level2" | ||
| SemanticProperties.Description="Welcome to dot net Multi platform App U I serif " /> | ||
| <Label Text=".NET Multi-platform App UI sans-serif" | ||
| FontFamily="sans-serif" | ||
| SemanticProperties.HeadingLevel="Level2" | ||
| SemanticProperties.Description="Welcome to dot net Multi platform App U I sans-serif" /> | ||
| <Label Text=".NET Multi-platform App UI sans-serif-black" | ||
| FontFamily="sans-serif-black" | ||
| SemanticProperties.HeadingLevel="Level2" | ||
| SemanticProperties.Description="Welcome to dot net Multi platform App U I sans-serif-black" /> | ||
| <Label Text=".NET Multi-platform App UI sans-serif-light" | ||
| FontFamily="sans-serif-light" | ||
| SemanticProperties.HeadingLevel="Level2" | ||
| SemanticProperties.Description="Welcome to dot net Multi platform App U I sans-serif-light" /> | ||
| <Label Text=".NET Multi-platform App UI sans-serif-medium" | ||
| FontFamily="sans-serif-medium" | ||
| SemanticProperties.HeadingLevel="Level2" | ||
| SemanticProperties.Description="Welcome to dot net Multi platform App U I sans-serif-medium" /> | ||
| </StackLayout> | ||
| </ContentPage> |
14 changes: 14 additions & 0 deletions
14
src/Controls/samples/Controls.Sample.UITests/Issues/Issue19556.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| using Microsoft.Maui.Controls; | ||
| using Microsoft.Maui.Controls.Xaml; | ||
| namespace Maui.Controls.Sample.Issues; | ||
|
|
||
| [XamlCompilation(XamlCompilationOptions.Compile)] | ||
| [Issue(IssueTracker.Github, 19556, "[Android] Systemfonts (light/black etc.) not working", PlatformAffected.Android)] | ||
|
|
||
| public partial class Issue19556 : ContentPage | ||
| { | ||
| public Issue19556() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
| } |
56 changes: 56 additions & 0 deletions
56
src/Controls/samples/Controls.Sample.UITests/Issues/Issue20294.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||
| Title="Issue 20294" | ||
| x:Class="Maui.Controls.Sample.Issues.Issue20294"> | ||
| <CollectionView SelectionMode="Single" Margin="10.0" AutomationId="theCollectionView"> | ||
| <CollectionView.ItemsSource> | ||
| <x:Array Type="{x:Type x:String}"> | ||
| <x:String>ONE</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>asdf</x:String> | ||
| <x:String>LAST</x:String> | ||
| </x:Array> | ||
| </CollectionView.ItemsSource> | ||
| <CollectionView.ItemsLayout> | ||
| <LinearItemsLayout | ||
| Orientation="Vertical" | ||
| ItemSpacing="15"/> | ||
| </CollectionView.ItemsLayout> | ||
| <CollectionView.Footer> | ||
| <Label HeightRequest="45" Text="FOOTER" AutomationId="FOOTER"/> | ||
| </CollectionView.Footer> | ||
| <CollectionView.ItemTemplate> | ||
| <DataTemplate x:DataType="x:String"> | ||
| <Border AutomationId="{Binding}" StrokeThickness="0.2"> | ||
| <Label Text="{Binding}" FontSize="20"/> | ||
| </Border> | ||
| </DataTemplate> | ||
| </CollectionView.ItemTemplate> | ||
| </CollectionView> | ||
| </ContentPage> |
15 changes: 15 additions & 0 deletions
15
src/Controls/samples/Controls.Sample.UITests/Issues/Issue20294.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| using Microsoft.Maui.Controls; | ||
| using Microsoft.Maui.Controls.Xaml; | ||
|
|
||
| namespace Maui.Controls.Sample.Issues | ||
| { | ||
| [XamlCompilation(XamlCompilationOptions.Compile)] | ||
| [Issue(IssueTracker.Github, 20294, "CollectionView containing a Footer and a Border with StrokeThickness set to decimal value crashes on scroll", PlatformAffected.iOS)] | ||
| public partial class Issue20294 : ContentPage | ||
| { | ||
| public Issue20294() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.