Update build system

AvaloniaBehaviors.sln

@@ -1,17 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28315.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Directory.Packages.props = tests\Directory.Packages.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9B9E3891-2366-4253-A952-D08BCEB71098}"
-	ProjectSection(SolutionItems) = preProject
-		samples\Directory.Packages.props = samples\Directory.Packages.props
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BehaviorsTestApplication", "samples\BehaviorsTestApplication\BehaviorsTestApplication.csproj", "{EA113F1A-D8D7-4142-9948-353270E7EBAE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Xaml.Behaviors", "src\Avalonia.Xaml.Behaviors\Avalonia.Xaml.Behaviors.csproj", "{2D9FCE6A-DF13-4037-BC33-7EDB06102A2E}"
@@ -82,6 +72,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Xaml.Interactions.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xaml.Behaviors", "src\Xaml.Behaviors\Xaml.Behaviors.csproj", "{4D130812-D955-4C68-B6A6-7D25F2C5DC0A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{451F0852-450F-40B4-8378-8994461024B8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2BDB1F89-9B32-45A8-AAE2-3DC61281F9FE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -145,12 +139,9 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{EA113F1A-D8D7-4142-9948-353270E7EBAE} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{2D9FCE6A-DF13-4037-BC33-7EDB06102A2E} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
 		{14006EB4-66E9-4B58-BF5F-5A1983BF4621} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
 		{ED03EEAD-938F-447B-BF0B-30857AE78BFF} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
-		{C2229490-39CA-4192-A28C-1B5EC186E027} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{80D2C64D-B560-475D-941F-D5F28DDB2591} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{40A43022-EBA7-4E1D-8BB0-2691E41B5622} = {2913483A-3E55-44AE-86BB-88511F372191}
 		{721A55B7-C5B0-44E2-803A-56E291C672FE} = {2913483A-3E55-44AE-86BB-88511F372191}
 		{0B395300-CACE-470D-81A9-69B922FB79DE} = {2913483A-3E55-44AE-86BB-88511F372191}
@@ -162,6 +153,9 @@ Global
 		{D647E09E-BBF2-4432-A4E0-80FBB921C1EE} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
 		{648FFF6A-A8F5-491C-AC1C-19FC2061D6B4} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
 		{4D130812-D955-4C68-B6A6-7D25F2C5DC0A} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
+		{EA113F1A-D8D7-4142-9948-353270E7EBAE} = {451F0852-450F-40B4-8378-8994461024B8}
+		{80D2C64D-B560-475D-941F-D5F28DDB2591} = {2BDB1F89-9B32-45A8-AAE2-3DC61281F9FE}
+		{C2229490-39CA-4192-A28C-1B5EC186E027} = {2BDB1F89-9B32-45A8-AAE2-3DC61281F9FE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E64CD420-15B1-487C-9806-41EBE6DC15A4}

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>11.3.0</VersionPrefix>
-    <VersionSuffix>beta1</VersionSuffix>
+    <VersionPrefix>11.2.6</VersionPrefix>
+    <VersionSuffix></VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
     <Copyright>Copyright © Wiesław Šoltés 2025</Copyright>

Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <AvaloniaVersion>11.3.0-beta1</AvaloniaVersion>
+    <AvaloniaVersion>11.2.6</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
@@ -11,11 +11,24 @@
     <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.Headless.XUnit" Version="$(AvaloniaVersion)" />
-    <PackageVersion Include="System.Runtime.Serialization.Formatters" Version="9.0.0" />
-  </ItemGroup>
-  <ItemGroup>
+    <PackageVersion Include="ReactiveGenerator" Version="0.12.0" />
+    <PackageVersion Include="Verify.Avalonia" Version="1.1.0" />
+    <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
+    <PackageVersion Include="Verify.ImageMagick" Version="3.6.0" />
+    <PackageVersion Include="Verify.Xunit" Version="29.2.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
+    <PackageVersion Include="xunit.assert" Version="2.9.3" />
+    <PackageVersion Include="xunit.core" Version="2.9.3" />
+    <PackageVersion Include="xunit.extensibility.core" Version="2.9.3" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.console" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="Nuke.Common" Version="5.3.0" />
+    <PackageVersion Include="Nuke.Common" Version="9.0.4" />
+    <PackageVersion Include="System.Runtime.Serialization.Formatters" Version="9.0.4" />
   </ItemGroup>
-</Project>
+</Project>

azure-pipelines.yml

@@ -6,7 +6,7 @@ resources:
       endpoint: wieslawsoltes
       type: github
       name: wieslawsoltes/BuildTemplates
-      ref: refs/tags/v2.0.0
+      ref: refs/tags/v2.9.1
 
 variables:
   BuildConfiguration: 'Release'
@@ -46,29 +46,29 @@ jobs:
       vmImage: 'windows-2022'
       BuildConfiguration: ${{ variables.BuildConfiguration }}
 
-  - template: Publish-PowerShell.yml@templates
-    parameters:
-      name: 'Publish_Windows'
-      vmImage: 'windows-2022'
-      BuildConfiguration: ${{ variables.BuildConfiguration }}
-      PublishFramework: ${{ variables.PublishFramework }}
-      PublishProject: ${{ variables.PublishProject }}
-      PublishRuntime: 'win-x64'
+#  - template: Publish-PowerShell.yml@templates
+#    parameters:
+#      name: 'Publish_Windows'
+#      vmImage: 'windows-2022'
+#      BuildConfiguration: ${{ variables.BuildConfiguration }}
+#      PublishFramework: ${{ variables.PublishFramework }}
+#      PublishProject: ${{ variables.PublishProject }}
+#      PublishRuntime: 'win-x64'
 
-  - template: Publish-Bash.yml@templates
-    parameters:
-      name: 'Publish_Linux'
-      vmImage: 'ubuntu-22.04'
-      BuildConfiguration: ${{ variables.BuildConfiguration }}
-      PublishFramework: ${{ variables.PublishFramework }}
-      PublishProject: ${{ variables.PublishProject }}
-      PublishRuntime: 'linux-x64'
+#  - template: Publish-Bash.yml@templates
+#    parameters:
+#      name: 'Publish_Linux'
+#      vmImage: 'ubuntu-22.04'
+#      BuildConfiguration: ${{ variables.BuildConfiguration }}
+#      PublishFramework: ${{ variables.PublishFramework }}
+#      PublishProject: ${{ variables.PublishProject }}
+#      PublishRuntime: 'linux-x64'
 
-  - template: Publish-Bash.yml@templates
-    parameters:
-      name: 'Publish_macOS_x64'
-      vmImage: 'macOS-14'
-      BuildConfiguration: ${{ variables.BuildConfiguration }}
-      PublishFramework: ${{ variables.PublishFramework }}
-      PublishProject: ${{ variables.PublishProject }}
-      PublishRuntime: 'osx-x64'
+#  - template: Publish-Bash.yml@templates
+#    parameters:
+#      name: 'Publish_macOS_x64'
+#      vmImage: 'macOS-14'
+#      BuildConfiguration: ${{ variables.BuildConfiguration }}
+#      PublishFramework: ${{ variables.PublishFramework }}
+#      PublishProject: ${{ variables.PublishProject }}
+#      PublishRuntime: 'osx-x64'

build/build/Build.cs

@@ -1,11 +1,10 @@
 using System.Collections.Generic;
+using System.Linq;
 using Nuke.Common;
 using Nuke.Common.Git;
 using Nuke.Common.ProjectModel;
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.IO;
-using static Nuke.Common.IO.FileSystemTasks;
-using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 
 class Build : NukeBuild
@@ -48,20 +47,21 @@ protected override void OnBuildInitialized()
         VersionSuffix = VersionSuffix ?? "";
     }
 
-    private void DeleteDirectories(IReadOnlyCollection<string> directories)
+    private void DeleteDirectories(IReadOnlyCollection<AbsolutePath> directories)
     {
         foreach (var directory in directories)
         {
-            DeleteDirectory(directory);
+            directory.DeleteDirectory();
         }
     }
 
     Target Clean => _ => _
         .Executes(() =>
         {
-            DeleteDirectories(GlobDirectories(SourceDirectory, "**/bin", "**/obj"));
-            DeleteDirectories(GlobDirectories(TestsDirectory, "**/bin", "**/obj"));
-            EnsureCleanDirectory(ArtifactsDirectory);
+
+            DeleteDirectories(SourceDirectory.GlobDirectories("**/bin", "**/obj"));
+            DeleteDirectories(TestsDirectory.GlobDirectories("**/bin", "**/obj"));
+            ArtifactsDirectory.CreateOrCleanDirectory();
         });
 
     Target Restore => _ => _
@@ -117,7 +117,7 @@ private void DeleteDirectories(IReadOnlyCollection<string> directories)
         .Executes(() =>
         {
             DotNetPublish(s => s
-                .SetProject(Solution.GetProject(PublishProject))
+                .SetProject( Solution.AllProjects.FirstOrDefault(x => x.Name == PublishProject))
                 .SetConfiguration(Configuration)
                 .SetVersionSuffix(VersionSuffix)
                 .SetFramework(PublishFramework)

src/Avalonia.Xaml.Interactivity/Interaction.cs

@@ -474,7 +474,7 @@ private static void StyledElement_ActualThemeVariantChanged_FromChangedEvent(obj
 
     // TopLevel Opened
 
-    private static void TopLevel_Opened_FromGetter(object sender, EventArgs e)
+    private static void TopLevel_Opened_FromGetter(object? sender, EventArgs e)
     {
         if (sender is not AvaloniaObject d)
         {
@@ -486,7 +486,7 @@ private static void TopLevel_Opened_FromGetter(object sender, EventArgs e)
         GetBehaviors(d).AttachedToLogicalTree();
     }
 
-    private static void TopLevel_Opened_FromChangedEvent(object sender, EventArgs e)
+    private static void TopLevel_Opened_FromChangedEvent(object? sender, EventArgs e)
     {
         if (sender is not AvaloniaObject d)
         {