Skip to content

Commit 1e4d024

Browse files
flabbetflabbet
authored
Merge branch 'AvaloniaUI:master' into master
2 parents a4e514e + 884051e commit 1e4d024

File tree

90 files changed

+3883
-990
lines changed

Some content is hidden

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

90 files changed

+3883
-990
lines changed

‎Avalonia.Desktop.slnf‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"projects": [
55
"packages\\Avalonia\\Avalonia.csproj",
66
"samples\\AppWithoutLifetime\\AppWithoutLifetime.csproj",
7-
"samples\\ControlCatalog.NetCore\\ControlCatalog.NetCore.csproj",
7+
"samples\\ControlCatalog.Desktop\\ControlCatalog.Desktop.csproj",
88
"samples\\ControlCatalog\\ControlCatalog.csproj",
99
"samples\\GpuInterop\\GpuInterop.csproj",
1010
"samples\\IntegrationTestApp\\IntegrationTestApp.csproj",
@@ -46,7 +46,6 @@
4646
"src\\tools\\Avalonia.Generators\\Avalonia.Generators.csproj",
4747
"src\\tools\\DevAnalyzers\\DevAnalyzers.csproj",
4848
"src\\tools\\DevGenerators\\DevGenerators.csproj",
49-
"src\\Windows\\Avalonia.Direct2D1\\Avalonia.Direct2D1.csproj",
5049
"src\\Windows\\Avalonia.Win32.Automation\\Avalonia.Win32.Automation.csproj",
5150
"src\\Windows\\Avalonia.Win32.Interoperability\\Avalonia.Win32.Interoperability.csproj",
5251
"src\\Windows\\Avalonia.Win32\\Avalonia.Win32.csproj",
@@ -56,8 +55,6 @@
5655
"tests\\Avalonia.Controls.UnitTests\\Avalonia.Controls.UnitTests.csproj",
5756
"tests\\Avalonia.DesignerSupport.TestApp\\Avalonia.DesignerSupport.TestApp.csproj",
5857
"tests\\Avalonia.DesignerSupport.Tests\\Avalonia.DesignerSupport.Tests.csproj",
59-
"tests\\Avalonia.Direct2D1.RenderTests\\Avalonia.Direct2D1.RenderTests.csproj",
60-
"tests\\Avalonia.Direct2D1.UnitTests\\Avalonia.Direct2D1.UnitTests.csproj",
6158
"tests\\Avalonia.Generators.Tests\\Avalonia.Generators.Tests.csproj",
6259
"tests\\Avalonia.IntegrationTests.Appium\\Avalonia.IntegrationTests.Appium.csproj",
6360
"tests\\Avalonia.LeakTests\\Avalonia.LeakTests.csproj",

‎Avalonia.sln‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
9090
build\EmbedXaml.props = build\EmbedXaml.props
9191
build\HarfBuzzSharp.props = build\HarfBuzzSharp.props
9292
build\ImageSharp.props = build\ImageSharp.props
93-
build\JetBrains.dotMemoryUnit.props = build\JetBrains.dotMemoryUnit.props
9493
build\Microsoft.CSharp.props = build\Microsoft.CSharp.props
9594
build\Microsoft.Reactive.Testing.props = build\Microsoft.Reactive.Testing.props
9695
build\Moq.props = build\Moq.props
@@ -286,6 +285,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Headless.XUnit.Per
286285
EndProject
287286
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Headless.XUnit.PerTest.UnitTests", "tests\Avalonia.Headless.XUnit.PerTest.UnitTests\Avalonia.Headless.XUnit.PerTest.UnitTests.csproj", "{26918642-829D-4FA2-B60A-BE8D83F4E063}"
288287
EndProject
288+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.IntegrationTests.Win32", "tests\Avalonia.IntegrationTests.Win32\Avalonia.IntegrationTests.Win32.csproj", "{11522B0D-BF31-42D5-8FC5-41E58F319AF9}"
289+
EndProject
289290
Global
290291
GlobalSection(SolutionConfigurationPlatforms) = preSolution
291292
Debug|Any CPU = Debug|Any CPU
@@ -660,6 +661,10 @@ Global
660661
{26918642-829D-4FA2-B60A-BE8D83F4E063}.Debug|Any CPU.Build.0 = Debug|Any CPU
661662
{26918642-829D-4FA2-B60A-BE8D83F4E063}.Release|Any CPU.ActiveCfg = Release|Any CPU
662663
{26918642-829D-4FA2-B60A-BE8D83F4E063}.Release|Any CPU.Build.0 = Release|Any CPU
664+
{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
665+
{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
666+
{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
667+
{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Release|Any CPU.Build.0 = Release|Any CPU
663668
EndGlobalSection
664669
GlobalSection(SolutionProperties) = preSolution
665670
HideSolutionNode = FALSE
@@ -743,6 +748,7 @@ Global
743748
{09EC467F-0F25-4E6F-A836-2BAEC8F6AB0C} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
744749
{342D2657-2F84-493C-B74B-9D2CAE5D9DAB} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
745750
{26918642-829D-4FA2-B60A-BE8D83F4E063} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
751+
{11522B0D-BF31-42D5-8FC5-41E58F319AF9} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
746752
EndGlobalSection
747753
GlobalSection(ExtensibilityGlobals) = postSolution
748754
SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}

‎NuGet.Config‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,18 @@
44
<packageSources>
55
<clear />
66
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
7+
<add key="azure-dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
78
</packageSources>
9+
<packageSourceMapping>
10+
<clear />
11+
</packageSourceMapping>
12+
<auditSources>
13+
<clear />
14+
</auditSources>
15+
<disabledPackageSources>
16+
<clear />
17+
</disabledPackageSources>
18+
<fallbackPackageFolders>
19+
<clear />
20+
</fallbackPackageFolders>
821
</configuration>

‎api/Avalonia.nupkg.xml‎

Lines changed: 194 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?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">
44
<Suppression>
@@ -43,12 +43,96 @@
4343
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
4444
<Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
4545
</Suppression>
46+
<Suppression>
47+
<DiagnosticId>CP0002</DiagnosticId>
48+
<Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(Avalonia.Media.IEffect)</Target>
49+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
50+
<Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
51+
</Suppression>
4652
<Suppression>
4753
<DiagnosticId>CP0002</DiagnosticId>
4854
<Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
4955
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
5056
<Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
5157
</Suppression>
58+
<Suppression>
59+
<DiagnosticId>CP0002</DiagnosticId>
60+
<Target>F:Avalonia.Controls.TextBlock.LetterSpacingProperty</Target>
61+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
62+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
63+
</Suppression>
64+
<Suppression>
65+
<DiagnosticId>CP0002</DiagnosticId>
66+
<Target>F:Avalonia.Controls.TextBox.LetterSpacingProperty</Target>
67+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
68+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
69+
</Suppression>
70+
<Suppression>
71+
<DiagnosticId>CP0002</DiagnosticId>
72+
<Target>M:Avalonia.Controls.Design.CreatePreviewWithControl(System.Object)</Target>
73+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
74+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
75+
</Suppression>
76+
<Suppression>
77+
<DiagnosticId>CP0002</DiagnosticId>
78+
<Target>M:Avalonia.Controls.Design.GetDataContext(Avalonia.Controls.Templates.IDataTemplate)</Target>
79+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
80+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
81+
</Suppression>
82+
<Suppression>
83+
<DiagnosticId>CP0002</DiagnosticId>
84+
<Target>M:Avalonia.Controls.Design.GetPreviewWith(Avalonia.Controls.Templates.IDataTemplate)</Target>
85+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
86+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
87+
</Suppression>
88+
<Suppression>
89+
<DiagnosticId>CP0002</DiagnosticId>
90+
<Target>M:Avalonia.Controls.Design.GetPreviewWith(Avalonia.Styling.IStyle)</Target>
91+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
92+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
93+
</Suppression>
94+
<Suppression>
95+
<DiagnosticId>CP0002</DiagnosticId>
96+
<Target>M:Avalonia.Controls.Design.SetDataContext(Avalonia.Controls.Templates.IDataTemplate,System.Object)</Target>
97+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
98+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
99+
</Suppression>
100+
<Suppression>
101+
<DiagnosticId>CP0002</DiagnosticId>
102+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.AvaloniaObject,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
103+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
104+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
105+
</Suppression>
106+
<Suppression>
107+
<DiagnosticId>CP0002</DiagnosticId>
108+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.ResourceDictionary,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
109+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
110+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
111+
</Suppression>
112+
<Suppression>
113+
<DiagnosticId>CP0002</DiagnosticId>
114+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.Templates.IDataTemplate,Avalonia.Controls.Control)</Target>
115+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
116+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
117+
</Suppression>
118+
<Suppression>
119+
<DiagnosticId>CP0002</DiagnosticId>
120+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.Templates.IDataTemplate,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
121+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
122+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
123+
</Suppression>
124+
<Suppression>
125+
<DiagnosticId>CP0002</DiagnosticId>
126+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Styling.IStyle,Avalonia.Controls.Control)</Target>
127+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
128+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
129+
</Suppression>
130+
<Suppression>
131+
<DiagnosticId>CP0002</DiagnosticId>
132+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Styling.IStyle,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
133+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
134+
<Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
135+
</Suppression>
52136
<Suppression>
53137
<DiagnosticId>CP0002</DiagnosticId>
54138
<Target>F:Avalonia.Media.Fonts.FontCollectionBase._glyphTypefaceCache</Target>
@@ -97,12 +181,96 @@
97181
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
98182
<Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
99183
</Suppression>
184+
<Suppression>
185+
<DiagnosticId>CP0002</DiagnosticId>
186+
<Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(Avalonia.Media.IEffect)</Target>
187+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
188+
<Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
189+
</Suppression>
100190
<Suppression>
101191
<DiagnosticId>CP0002</DiagnosticId>
102192
<Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
103193
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
104194
<Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
105195
</Suppression>
196+
<Suppression>
197+
<DiagnosticId>CP0002</DiagnosticId>
198+
<Target>F:Avalonia.Controls.TextBlock.LetterSpacingProperty</Target>
199+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
200+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
201+
</Suppression>
202+
<Suppression>
203+
<DiagnosticId>CP0002</DiagnosticId>
204+
<Target>F:Avalonia.Controls.TextBox.LetterSpacingProperty</Target>
205+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
206+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
207+
</Suppression>
208+
<Suppression>
209+
<DiagnosticId>CP0002</DiagnosticId>
210+
<Target>M:Avalonia.Controls.Design.CreatePreviewWithControl(System.Object)</Target>
211+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
212+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
213+
</Suppression>
214+
<Suppression>
215+
<DiagnosticId>CP0002</DiagnosticId>
216+
<Target>M:Avalonia.Controls.Design.GetDataContext(Avalonia.Controls.Templates.IDataTemplate)</Target>
217+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
218+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
219+
</Suppression>
220+
<Suppression>
221+
<DiagnosticId>CP0002</DiagnosticId>
222+
<Target>M:Avalonia.Controls.Design.GetPreviewWith(Avalonia.Controls.Templates.IDataTemplate)</Target>
223+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
224+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
225+
</Suppression>
226+
<Suppression>
227+
<DiagnosticId>CP0002</DiagnosticId>
228+
<Target>M:Avalonia.Controls.Design.GetPreviewWith(Avalonia.Styling.IStyle)</Target>
229+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
230+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
231+
</Suppression>
232+
<Suppression>
233+
<DiagnosticId>CP0002</DiagnosticId>
234+
<Target>M:Avalonia.Controls.Design.SetDataContext(Avalonia.Controls.Templates.IDataTemplate,System.Object)</Target>
235+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
236+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
237+
</Suppression>
238+
<Suppression>
239+
<DiagnosticId>CP0002</DiagnosticId>
240+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.AvaloniaObject,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
241+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
242+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
243+
</Suppression>
244+
<Suppression>
245+
<DiagnosticId>CP0002</DiagnosticId>
246+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.ResourceDictionary,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
247+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
248+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
249+
</Suppression>
250+
<Suppression>
251+
<DiagnosticId>CP0002</DiagnosticId>
252+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.Templates.IDataTemplate,Avalonia.Controls.Control)</Target>
253+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
254+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
255+
</Suppression>
256+
<Suppression>
257+
<DiagnosticId>CP0002</DiagnosticId>
258+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.Templates.IDataTemplate,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
259+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
260+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
261+
</Suppression>
262+
<Suppression>
263+
<DiagnosticId>CP0002</DiagnosticId>
264+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Styling.IStyle,Avalonia.Controls.Control)</Target>
265+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
266+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
267+
</Suppression>
268+
<Suppression>
269+
<DiagnosticId>CP0002</DiagnosticId>
270+
<Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Styling.IStyle,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
271+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
272+
<Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
273+
</Suppression>
106274
<Suppression>
107275
<DiagnosticId>CP0002</DiagnosticId>
108276
<Target>M:Avalonia.Dialogs.Internal.ManagedFileChooserFilterViewModel.#ctor(Avalonia.Platform.Storage.FilePickerFileType)</Target>
@@ -139,6 +307,24 @@
139307
<Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Dialogs.dll</Left>
140308
<Right>current/Avalonia/lib/netstandard2.0/Avalonia.Dialogs.dll</Right>
141309
</Suppression>
310+
<Suppression>
311+
<DiagnosticId>CP0002</DiagnosticId>
312+
<Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PopEffect</Target>
313+
<Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
314+
<Right>target/netstandard2.0/Avalonia.Base.dll</Right>
315+
</Suppression>
316+
<Suppression>
317+
<DiagnosticId>CP0002</DiagnosticId>
318+
<Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(Avalonia.Media.IEffect)</Target>
319+
<Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
320+
<Right>target/netstandard2.0/Avalonia.Base.dll</Right>
321+
</Suppression>
322+
<Suppression>
323+
<DiagnosticId>CP0006</DiagnosticId>
324+
<Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(System.Nullable{Avalonia.Rect},Avalonia.Media.IEffect)</Target>
325+
<Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
326+
<Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
327+
</Suppression>
142328
<Suppression>
143329
<DiagnosticId>CP0006</DiagnosticId>
144330
<Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.String,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
@@ -229,6 +415,12 @@
229415
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
230416
<Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
231417
</Suppression>
418+
<Suppression>
419+
<DiagnosticId>CP0006</DiagnosticId>
420+
<Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(System.Nullable{Avalonia.Rect},Avalonia.Media.IEffect)</Target>
421+
<Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
422+
<Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
423+
</Suppression>
232424
<Suppression>
233425
<DiagnosticId>CP0006</DiagnosticId>
234426
<Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.String,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
@@ -445,4 +637,4 @@
445637
<Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
446638
<Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
447639
</Suppression>
448-
</Suppressions>
640+
</Suppressions>

‎azure-pipelines-integrationtests.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,16 @@ jobs:
8787
displayName: 'Build test project'
8888
inputs:
8989
command: 'build'
90-
projects: 'tests\Avalonia.IntegrationTests.Appium\Avalonia.IntegrationTests.Appium.csproj'
90+
projects: 'tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj'
91+
92+
- task: DotNetCoreCLI@2
93+
displayName: 'Run Win32 Integration Tests'
94+
inputs:
95+
command: 'run'
96+
projects: 'tests/Avalonia.IntegrationTests.Win32/Avalonia.IntegrationTests.Win32.csproj'
9197

9298
- task: VSTest@2
93-
displayName: 'Run Integration Tests'
99+
displayName: 'Run Appium Integration Tests'
94100
inputs:
95101
testAssemblyVer2: '**\bin\**\Avalonia.IntegrationTests.Appium.dll'
96102
runSettingsFile: 'tests\Avalonia.IntegrationTests.Appium\record-video.runsettings'

‎build/JetBrains.dotMemoryUnit.props‎

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

‎docs/build.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ curl -sSL https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scri
3333
## Build and Run Avalonia
3434

3535
```bash
36-
cd samples\ControlCatalog.NetCore
36+
cd samples\ControlCatalog.Desktop
3737
dotnet restore
3838
dotnet run
3939
```
@@ -47,7 +47,7 @@ If you want to open Avalonia in Visual Studio you have two options:
4747

4848
Avalonia requires Visual Studio 2022 or newer. The free Visual Studio Community edition works fine.
4949

50-
Build and run `ControlCatalog.NetCore` project to see the sample application.
50+
Build and run `ControlCatalog.Desktop` project to see the sample application.
5151

5252
### Visual Studio Troubleshooting
5353

0 commit comments

Comments
 (0)