Skip to content

Commit dacda0a

Browse files
VladislavAntonyukVladislavAntonyuk
authored
Merge branch 'main' into fix-memory-leak-on-snackbar
2 parents 54b6342 + c1d2ee3 commit dacda0a

File tree

41 files changed

+6487
-430
lines changed

Some content is hidden

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

41 files changed

+6487
-430
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/Primitives/Defaults/DockLayoutDefaults.shared.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
static class DockLayoutDefaults
44
{
5+
public const DockPosition DockPosition = Core.DockPosition.None;
56
public const bool ShouldExpandLastChild = true;
67
public const double HorizontalSpacing = 0.0d;
78
public const double VerticalSpacing = 0.0d;

‎src/CommunityToolkit.Maui.Core/Primitives/Defaults/StateViewDefaults.shared.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace CommunityToolkit.Maui.Core;
2+
3+
static class StateViewDefaults
4+
{
5+
public const string StateKey = "";
6+
}

‎src/CommunityToolkit.Maui.SourceGenerators.Benchmarks/AttachedBindablePropertySourceGeneratorBenchmarks.cs‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
using BenchmarkDotNet.Attributes;
2+
using CommunityToolkit.Maui.SourceGenerators.Internal.UnitTests.AttachedBindablePropertyAttributeSourceGeneratorTests;
3+
4+
namespace CommunityToolkit.Maui.SourceGenerators.Benchmarks;
5+
6+
[MemoryDiagnoser]
7+
public class AttachedBindablePropertyAttributeSourceGeneratorBenchmarks
8+
{
9+
static readonly AttachedBindablePropertyAttributeSourceGenerator_ClassAttribute_CommonUsageTests commonUsageTests = new();
10+
static readonly AttachedBindablePropertyAttributeSourceGenerator_ClassAttribute_EdgeCaseTests edgeCaseTests = new();
11+
static readonly AttachedBindablePropertyAttributeSourceGenerator_ClassAttribute_IntegrationTests integrationTests = new();
12+
13+
[Benchmark]
14+
public Task GenerateAttachedBindableProperty_SimpleExample_GeneratesCorrectCode()
15+
=> commonUsageTests.GenerateAttachedBindableProperty_SimpleExample_GeneratesCorrectCode();
16+
17+
[Benchmark]
18+
public Task GenerateAttachedBindableProperty_MultipleProperties_GeneratesCorrectCode()
19+
=> commonUsageTests.GenerateAttachedBindableProperty_MultipleProperties_GeneratesCorrectCode();
20+
21+
[Benchmark]
22+
public Task GenerateAttachedBindableProperty_WithAllParameters_GeneratesCorrectCode()
23+
=> commonUsageTests.GenerateAttachedBindableProperty_WithAllParameters_GeneratesCorrectCode();
24+
25+
[Benchmark]
26+
public Task GenerateAttachedBindableProperty_InternalClass_GeneratesCorrectCode()
27+
=> commonUsageTests.GenerateAttachedBindableProperty_InternalClass_GeneratesCorrectCode();
28+
29+
[Benchmark]
30+
public Task GenerateAttachedBindableProperty_ComplexInheritanceScenario_GeneratesCorrectCode()
31+
=> integrationTests.GenerateAttachedBindableProperty_ComplexInheritanceScenario_GeneratesCorrectCode();
32+
33+
[Benchmark]
34+
public Task GenerateAttachedBindableProperty_NestedClass_GeneratesCorrectCode()
35+
=> integrationTests.GenerateAttachedBindableProperty_AttributeOnNestedInnerClass_GeneratesCorrectCode();
36+
37+
[Benchmark]
38+
public Task GenerateAttachedBindableProperty_WithComplexDefaultValues_GeneratesCorrectCode()
39+
=> edgeCaseTests.GenerateAttachedBindableProperty_WithComplexDefaultValues_GeneratesCorrectCode();
40+
}

‎src/CommunityToolkit.Maui.SourceGenerators.Benchmarks/BindablePropertyAttributeSourceGeneratorBenchmarks.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ namespace CommunityToolkit.Maui.SourceGenerators.Benchmarks;
66
[MemoryDiagnoser]
77
public class BindablePropertyAttributeSourceGeneratorBenchmarks
88
{
9-
static readonly CommonUsageTests commonUsageTests = new();
10-
static readonly EdgeCaseTests edgeCaseTests = new();
11-
static readonly IntegrationTests integrationTests = new();
9+
static readonly BindablePropertyAttributeSourceGenerator_CommonUsageTests commonUsageTests = new();
10+
static readonly BindablePropertyAttributeSourceGenerator_EdgeCaseTests edgeCaseTests = new();
11+
static readonly BindablePropertyAttributeSourceGenerator_IntegrationTests integrationTests = new();
1212

1313
[Benchmark]
1414
public Task GenerateBindableProperty_SimpleExample_GeneratesCorrectCode()

‎src/CommunityToolkit.Maui.SourceGenerators.Benchmarks/Program.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ public static void Main(string[] args)
99
{
1010
var config = DefaultConfig.Instance;
1111
BenchmarkRunner.Run<BindablePropertyAttributeSourceGeneratorBenchmarks>(config, args);
12+
BenchmarkRunner.Run<AttachedBindablePropertyAttributeSourceGeneratorBenchmarks>(config, args);
1213
}
1314
}

0 commit comments

Comments
 (0)