Skip to content

Commit b3bae06

Browse files
authored
Merge branch 'main' into FixStateContainerBug
2 parents 0553a38 + c1d2ee3 commit b3bae06

File tree

71 files changed

+6809
-801
lines changed

Some content is hidden

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

71 files changed

+6809
-801
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Nullable>enable</Nullable>
55
<!-- Remove MCTEXP001 once the BindablePropertySourceGenerator is Released and no longer in Experimental -->
6-
<NoWarn>NETSDK1023,MCTEXP001</NoWarn>
6+
<NoWarn>NETSDK1023,MCTEXP001</NoWarn>
77
<NetVersion>net10.0</NetVersion>
88
<LangVersion>preview</LangVersion>
99
<ImplicitUsings>enable</ImplicitUsings>
@@ -22,7 +22,7 @@ https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitati
2222
<NuGetAuditMode>all</NuGetAuditMode>
2323

2424
<!-- MAUI Specific -->
25-
<MauiPackageVersion>10.0.20</MauiPackageVersion>
25+
<MauiPackageVersion>10.0.30</MauiPackageVersion>
2626
<MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
2727
<SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
2828
<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>

samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<PackageReference Include="Microsoft.Maui.Controls" Version="*" />
5858
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="7.0.0" />
5959
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
60-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
61-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.1" />
60+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.2.0" />
61+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.2" />
6262
</ItemGroup>
6363

6464
<PropertyGroup>

src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
21-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
20+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.3" />
21+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.3" />
2222
<PackageReference Include="xunit.v3.mtp-v2" Version="3.2.0" />
2323
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
2424
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />

src/CommunityToolkit.Maui.Analyzers.UnitTests/ReferenceAssembliesExtensions.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/CommunityToolkit.Maui.Core/Essentials/FileSaver/FileSaverImplementation.macios.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Task<string> InternalSaveAsync(string fileName, Stream stream, IProgress<double>
1212
{
1313
return InternalSaveAsync("/", fileName, stream, progress, cancellationToken);
1414
}
15-
15+
1616
async Task<string> InternalSaveAsync(
1717
string initialPath,
1818
string fileName,
@@ -23,8 +23,8 @@ async Task<string> InternalSaveAsync(
2323
cancellationToken.ThrowIfCancellationRequested();
2424

2525
var currentViewController = Platform.GetCurrentUIViewController()
26-
?? throw new FileSaveException(
27-
"Cannot present file picker: No active view controller found. Ensure the app is active with a visible window.");
26+
?? throw new FileSaveException(
27+
"Cannot present file picker: No active view controller found. Ensure the app is active with a visible window.");
2828

2929
var fileManager = NSFileManager.DefaultManager;
3030

@@ -71,22 +71,22 @@ await WriteStream(
7171
picker.DidPickDocumentAtUrls -= OnPicked;
7272
picker.WasCancelled -= OnCancelled;
7373
}
74-
74+
7575
void OnPicked(object? sender, UIDocumentPickedAtUrlsEventArgs e)
7676
{
7777
if (e.Urls.Length is 0)
7878
{
7979
tcs.TrySetException(new FileSaveException("No file was selected."));
8080
return;
8181
}
82-
82+
8383
var path = e.Urls[0].Path;
8484
if (path is null)
8585
{
8686
tcs.TrySetException(new FileSaveException("File path cannot be null."));
8787
return;
8888
}
89-
89+
9090
tcs.TrySetResult(path);
9191
}
9292

src/CommunityToolkit.Maui.Core/Essentials/FileSaver/FileSaverResult.shared.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public record FileSaverResult(string? FilePath, Exception? Exception)
1616
[MemberNotNullWhen(true, nameof(FilePath))]
1717
[MemberNotNullWhen(false, nameof(Exception))]
1818
public bool IsSuccessful => Exception is null;
19-
19+
2020
/// <summary>
2121
/// Check if the operation was cancelled.
2222
/// </summary>

src/CommunityToolkit.Maui.Core/Essentials/FolderPicker/FolderPickerImplementation.macios.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ Task<Folder> InternalPickAsync(CancellationToken cancellationToken)
1414
{
1515
return InternalPickAsync("/", cancellationToken);
1616
}
17-
17+
1818
async Task<Folder> InternalPickAsync(string initialPath, CancellationToken cancellationToken)
1919
{
2020
cancellationToken.ThrowIfCancellationRequested();
2121

2222
var currentViewController = Platform.GetCurrentUIViewController()
23-
?? throw new FolderPickerException("Unable to get a window where to present the folder picker UI.");
23+
?? throw new FolderPickerException("Unable to get a window where to present the folder picker UI.");
2424

2525
var tcs = new TaskCompletionSource<Folder>(
2626
TaskCreationOptions.RunContinuationsAsynchronously);
@@ -44,7 +44,7 @@ async Task<Folder> InternalPickAsync(string initialPath, CancellationToken cance
4444
picker.DidPickDocumentAtUrls -= OnPicked;
4545
picker.WasCancelled -= OnCancelled;
4646
}
47-
47+
4848
void OnPicked(object? sender, UIDocumentPickedAtUrlsEventArgs e)
4949
{
5050
if (e.Urls.Length is 0)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace CommunityToolkit.Maui.Core;
2+
3+
static class DockLayoutDefaults
4+
{
5+
public const DockPosition DockPosition = Core.DockPosition.None;
6+
public const bool ShouldExpandLastChild = true;
7+
public const double HorizontalSpacing = 0.0d;
8+
public const double VerticalSpacing = 0.0d;
9+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace CommunityToolkit.Maui.Core;
2+
3+
static class MultiValidationBehaviorDefaults
4+
{
5+
public static List<object?>? Errors { get; } = null;
6+
public static List<object?>? Error { get; } = null;
7+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace CommunityToolkit.Maui.Core;
2+
3+
static class NumericValidationBehaviorDefaults
4+
{
5+
public const double MinimumValue = double.NegativeInfinity;
6+
public const double MaximumValue = double.PositiveInfinity;
7+
public const int MinimumDecimalPlaces = 0;
8+
public const int MaximumDecimalPlaces = int.MaxValue;
9+
}

0 commit comments

Comments
 (0)