Skip to content

Commit 319b470

Browse files
maxkatz6maxkatz6
committed
Merge remote-tracking branch 'origin/main' into themes/fluent2
# Conflicts: # samples/ControlCatalog/Assets/Icon.png # samples/ControlCatalog/Assets/banner-bg.png # samples/ControlCatalog/Assets/logo1.png # samples/ControlCatalog/Assets/logo2.png # samples/ControlCatalog/Assets/logo3.png # samples/ControlCatalog/Assets/logo4.png # samples/ControlCatalog/Pages/HomePage.xaml # samples/ControlCatalog/Pages/HomePage.xaml.cs # samples/ControlCatalog/ViewModels/MainWindowViewModel.cs # samples/ControlCatalog/ViewModels/MainWindowViewModel_PageList.cs
2 parents 14b1bfa + 0442ba1 commit 319b470

225 files changed

Lines changed: 11906 additions & 1875 deletions

File tree

Some content is hidden

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

‎.editorconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,18 @@ dotnet_diagnostic.AVP1032.severity = warning
199199
dotnet_diagnostic.AVP1040.severity = warning
200200
dotnet_diagnostic.AVA2001.severity = warning
201201

202+
# Avalonia property source generator (GeneratedPropertyAnalyzer)
203+
dotnet_diagnostic.AVP2001.severity = error
204+
dotnet_diagnostic.AVP2002.severity = error
205+
dotnet_diagnostic.AVP2003.severity = error
206+
dotnet_diagnostic.AVP2004.severity = error
207+
dotnet_diagnostic.AVP2005.severity = error
208+
dotnet_diagnostic.AVP2006.severity = error
209+
dotnet_diagnostic.AVP2007.severity = error
210+
dotnet_diagnostic.AVP2008.severity = error
211+
dotnet_diagnostic.AVP2100.severity = warning
212+
dotnet_diagnostic.AVP2101.severity = warning
213+
202214
# Xaml files
203215
[*.{xaml,axaml}]
204216
indent_size = 2

‎.ncrunch/Avalonia.Controls.ColorPicker.v3.ncrunchproject‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
4+
</Settings>
5+
</ProjectConfiguration>

‎.ncrunch/Avalonia.DBus.Generators.v3.ncrunchproject‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<CustomBuildProperties>
4+
<Value>TargetFramework = netstandard2.0</Value>
5+
</CustomBuildProperties>
6+
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
7+
</Settings>
8+
</ProjectConfiguration>

‎.ncrunch/Avalonia.FreeDesktop.AtSpi.v3.ncrunchproject‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
4+
</Settings>
5+
</ProjectConfiguration>

‎Avalonia.Desktop.slnf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"src\\Windows\\Avalonia.Win32.Automation\\Avalonia.Win32.Automation.csproj",
5656
"src\\Windows\\Avalonia.Win32.Interoperability\\Avalonia.Win32.Interoperability.csproj",
5757
"src\\Windows\\Avalonia.Win32\\Avalonia.Win32.csproj",
58+
"tests\\Avalonia.Analyzers.Tests\\Avalonia.Analyzers.Tests.csproj",
5859
"tests\\Avalonia.Base.UnitTests\\Avalonia.Base.UnitTests.csproj",
5960
"tests\\Avalonia.Benchmarks\\Avalonia.Benchmarks.csproj",
6061
"tests\\Avalonia.Build.Tasks.UnitTest\\Avalonia.Build.Tasks.UnitTest.csproj",

‎Avalonia.slnx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
<File Path="build/UnitTests.NetCore.targets" />
138138
</Folder>
139139
<Folder Name="/Tests/">
140+
<Project Path="tests/Avalonia.Analyzers.Tests/Avalonia.Analyzers.Tests.csproj" />
140141
<Project Path="tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj" />
141142
<Project Path="tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj" />
142143
<Project Path="tests/Avalonia.Build.Tasks.UnitTest/Avalonia.Build.Tasks.UnitTest.csproj" />

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)build-intermediate/nuget</PackageOutputPath>
66
<AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)\src\tools\Avalonia.Designer.HostApp\bin\$(Configuration)\$(AvsCurrentTargetFramework)\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath>
7+
<SharedAssetsPath>$(MSBuildThisFileDirectory)\build\Assets\</SharedAssetsPath>
78
<!-- https://github.com/dotnet/msbuild/issues/2661 -->
89
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
910
<RunApiCompat>False</RunApiCompat>

‎Directory.Packages.props‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageVersion Include="Appium.WebDriver" Version="5.2.0" />
77
<PackageVersion Include="Avalonia.Angle.Windows.Natives" Version="2.1.27548.20260419" />
88
<PackageVersion Include="Avalonia.BuildServices" Version="11.3.2" />
9-
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.2" />
9+
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
1010
<PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
1111
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
1212
<PackageVersion Include="Dotnet.Bundle" Version="0.9.13" />
@@ -23,6 +23,9 @@
2323
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
2424
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
2525
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
26+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.4" />
27+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.4" />
28+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
2629
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.14.0" />
2730
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0" />
2831
<PackageVersion Include="Microsoft.CSharp" Version="4.5.0" />
@@ -79,4 +82,4 @@
7982
<ItemGroup>
8083
<GlobalPackageReference Include="Microsoft.VisualStudio.SlnGen" Version="8.5.17" PrivateAssets="all" />
8184
</ItemGroup>
82-
</Project>
85+
</Project>

‎api/Avalonia.Headless.nupkg.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4+
<Suppression>
5+
<DiagnosticId>CP0002</DiagnosticId>
6+
<Target>M:Avalonia.Headless.HeadlessWindowExtensions.GetOpenPopups(Avalonia.Controls.TopLevel)</Target>
7+
<Left>baseline/Avalonia.Headless/lib/net10.0/Avalonia.Headless.dll</Left>
8+
<Right>current/Avalonia.Headless/lib/net10.0/Avalonia.Headless.dll</Right>
9+
</Suppression>
10+
<Suppression>
11+
<DiagnosticId>CP0002</DiagnosticId>
12+
<Target>M:Avalonia.Headless.HeadlessWindowExtensions.GetOpenPopups(Avalonia.Controls.TopLevel)</Target>
13+
<Left>baseline/Avalonia.Headless/lib/net8.0/Avalonia.Headless.dll</Left>
14+
<Right>current/Avalonia.Headless/lib/net8.0/Avalonia.Headless.dll</Right>
15+
</Suppression>
16+
</Suppressions>

‎api/Avalonia.nupkg.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
33
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4+
<Suppression>
5+
<DiagnosticId>CP0002</DiagnosticId>
6+
<Target>M:Avalonia.Data.Core.UntypedBindingExpressionBase.get_IsDataValidationEnabled</Target>
7+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
8+
<Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
9+
</Suppression>
10+
<Suppression>
11+
<DiagnosticId>CP0002</DiagnosticId>
12+
<Target>M:Avalonia.Data.Core.UntypedBindingExpressionBase.Start</Target>
13+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
14+
<Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
15+
</Suppression>
416
<Suppression>
517
<DiagnosticId>CP0002</DiagnosticId>
618
<Target>M:Avalonia.Input.PointerEventArgs.#ctor(Avalonia.Interactivity.RoutedEvent,System.Object,Avalonia.Input.IPointer,Avalonia.Visual,Avalonia.Point,System.UInt64,Avalonia.Input.PointerPointProperties,Avalonia.Input.KeyModifiers,System.Lazy{System.Collections.Generic.IReadOnlyList{Avalonia.Input.Raw.RawPointerPoint}})</Target>
@@ -55,6 +67,18 @@
5567
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
5668
<Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
5769
</Suppression>
70+
<Suppression>
71+
<DiagnosticId>CP0002</DiagnosticId>
72+
<Target>M:Avalonia.Data.Core.UntypedBindingExpressionBase.get_IsDataValidationEnabled</Target>
73+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
74+
<Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
75+
</Suppression>
76+
<Suppression>
77+
<DiagnosticId>CP0002</DiagnosticId>
78+
<Target>M:Avalonia.Data.Core.UntypedBindingExpressionBase.Start</Target>
79+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
80+
<Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
81+
</Suppression>
5882
<Suppression>
5983
<DiagnosticId>CP0002</DiagnosticId>
6084
<Target>M:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.SetFrameThemeVariant(Avalonia.Platform.PlatformThemeVariant)</Target>

0 commit comments

Comments
 (0)