fidarit · fidarit · May 21, 2025 · Jan 9, 2025 · Jan 29, 2025 · Jan 29, 2025
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -7,12 +7,11 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: | 
-            6.0.x
             8.0.x
       - name: Install dependencies
         run: dotnet restore

diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -1,15 +1,53 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Build Schema",
-  "$ref": "#/definitions/build",
   "definitions": {
-    "build": {
-      "type": "object",
+    "Host": {
+      "type": "string",
+      "enum": [
+        "AppVeyor",
+        "AzurePipelines",
+        "Bamboo",
+        "Bitbucket",
+        "Bitrise",
+        "GitHubActions",
+        "GitLab",
+        "Jenkins",
+        "Rider",
+        "SpaceAutomation",
+        "TeamCity",
+        "Terminal",
+        "TravisCI",
+        "VisualStudio",
+        "VSCode"
+      ]
+    },
+    "ExecutableTarget": {
+      "type": "string",
+      "enum": [
+        "CiAzureLinux",
+        "CiAzureOSX",
+        "CiAzureWindows",
+        "Clean",
+        "Compile",
+        "CreateNugetPackages",
+        "Package",
+        "RunCoreLibsTests",
+        "RunTests",
+        "ZipFiles"
+      ]
+    },
+    "Verbosity": {
+      "type": "string",
+      "description": "",
+      "enum": [
+        "Verbose",
+        "Normal",
+        "Minimal",
+        "Quiet"
+      ]
+    },
+    "NukeBuild": {
       "properties": {
-        "Configuration": {
-          "type": "string",
-          "description": "configuration"
-        },
         "Continue": {
           "type": "boolean",
           "description": "Indicates to continue a previously failed build attempt"
@@ -19,24 +57,8 @@
           "description": "Shows the help text for this build assembly"
         },
         "Host": {
-          "type": "string",
           "description": "Host for execution. Default is 'automatic'",
-          "enum": [
-            "AppVeyor",
-            "AzurePipelines",
-            "Bamboo",
-            "Bitrise",
-            "GitHubActions",
-            "GitLab",
-            "Jenkins",
-            "Rider",
-            "SpaceAutomation",
-            "TeamCity",
-            "Terminal",
-            "TravisCI",
-            "VisualStudio",
-            "VSCode"
-          ]
+          "$ref": "#/definitions/Host"
         },
         "NoLogo": {
           "type": "boolean",
@@ -57,22 +79,6 @@
             "type": "string"
           }
         },
-        "PublishFramework": {
-          "type": "string",
-          "description": "publish-framework"
-        },
-        "PublishProject": {
-          "type": "string",
-          "description": "publish-project"
-        },
-        "PublishRuntime": {
-          "type": "string",
-          "description": "publish-runtime"
-        },
-        "PublishSelfContained": {
-          "type": "boolean",
-          "description": "publish-self-contained"
-        },
         "Root": {
           "type": "string",
           "description": "Root directory during build execution"
@@ -81,51 +87,50 @@
           "type": "array",
           "description": "List of targets to be skipped. Empty list skips all dependencies",
           "items": {
-            "type": "string",
-            "enum": [
-              "Clean",
-              "Compile",
-              "Pack",
-              "Publish",
-              "Restore",
-              "Test"
-            ]
+            "$ref": "#/definitions/ExecutableTarget"
           }
         },
-        "Solution": {
-          "type": "string",
-          "description": "Path to a solution file that is automatically loaded"
-        },
         "Target": {
           "type": "array",
           "description": "List of targets to be invoked. Default is '{default_target}'",
           "items": {
-            "type": "string",
-            "enum": [
-              "Clean",
-              "Compile",
-              "Pack",
-              "Publish",
-              "Restore",
-              "Test"
-            ]
+            "$ref": "#/definitions/ExecutableTarget"
           }
         },
         "Verbosity": {
-          "type": "string",
           "description": "Logging verbosity during build execution. Default is 'Normal'",
-          "enum": [
-            "Minimal",
-            "Normal",
-            "Quiet",
-            "Verbose"
-          ]
+          "$ref": "#/definitions/Verbosity"
+        }
+      }
+    }
+  },
+  "allOf": [
+    {
+      "properties": {
+        "Configuration": {
+          "type": "string",
+          "description": "configuration"
         },
-        "VersionSuffix": {
+        "ForceNugetVersion": {
+          "type": "string",
+          "description": "force-nuget-version"
+        },
+        "SkipPreviewer": {
+          "type": "boolean",
+          "description": "skip-previewer"
+        },
+        "SkipTests": {
+          "type": "boolean",
+          "description": "skip-tests"
+        },
+        "Solution": {
           "type": "string",
-          "description": "version-suffix"
+          "description": "Path to a solution file that is automatically loaded. Default is Avalonia.Controls.TreeDataGrid.sln"
         }
       }
+    },
+    {
+      "$ref": "#/definitions/NukeBuild"
     }
-  }
-}
+  ]
+}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,5 +13,6 @@
   </PropertyGroup>
   <PropertyGroup>
     <AvaloniaVersion>11.0.0</AvaloniaVersion>
+    <AvaloniaSamplesVersion>11.2.8</AvaloniaSamplesVersion>
   </PropertyGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,6 +7,12 @@ pool:
   vmImage: ubuntu-latest
 
 steps:
+
+- task: UseDotNet@2
+  displayName: 'Use .NET SDK'
+  inputs:
+    version: 8.0.x
+
 - task: CmdLine@2
   displayName: 'Install Nuke'
   inputs:

diff --git a/global.json b/global.json
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
@@ -6,12 +6,12 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using Nuke.Common;
+using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
 using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Tools.MSBuild;
 using static Nuke.Common.EnvironmentInfo;
-using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 using static Nuke.Common.Tools.VSWhere.VSWhereTasks;
@@ -82,8 +82,7 @@ IReadOnlyCollection<Output> MsBuildCommon(
         return MSBuild(c => c
             .SetProjectFile(projectFile)
             // This is required for VS2019 image on Azure Pipelines
-            .When(Parameters.IsRunningOnWindows &&
-                  Parameters.IsRunningOnAzure, _ => _
+            .When(_ => Parameters.IsRunningOnWindows && Parameters.IsRunningOnAzure, _ => _
                 .AddProperty("JavaSdkDirectory", GetVariable<string>("JAVA_HOME_11_X64")))
             .AddProperty("PackageVersion", Parameters.Version)
             .AddProperty("iOSRoslynPathHackRequired", true)
@@ -95,13 +94,13 @@ IReadOnlyCollection<Output> MsBuildCommon(
 
     Target Clean => _ => _.Executes(() =>
     {
-        Parameters.BuildDirs.ForEach(DeleteDirectory);
-        Parameters.BuildDirs.ForEach(EnsureCleanDirectory);
-        EnsureCleanDirectory(Parameters.ArtifactsDir);
-        EnsureCleanDirectory(Parameters.NugetIntermediateRoot);
-        EnsureCleanDirectory(Parameters.NugetRoot);
-        EnsureCleanDirectory(Parameters.ZipRoot);
-        EnsureCleanDirectory(Parameters.TestResultsRoot);
+        Parameters.BuildDirs.ForEach(p => p.DeleteDirectory());
+        Parameters.BuildDirs.ForEach(p => p.CreateOrCleanDirectory());
+        Parameters.ArtifactsDir.CreateOrCleanDirectory();
+        Parameters.NugetIntermediateRoot.CreateOrCleanDirectory();
+        Parameters.NugetRoot.CreateOrCleanDirectory();
+        Parameters.ZipRoot.CreateOrCleanDirectory();
+        Parameters.TestResultsRoot.CreateOrCleanDirectory();
     });
 
     Target Compile => _ => _
@@ -110,7 +109,7 @@ IReadOnlyCollection<Output> MsBuildCommon(
         {
             if (Parameters.IsRunningOnWindows)
                 MsBuildCommon(Parameters.MSBuildSolution, c => c
-                    .SetProcessArgumentConfigurator(a => a.Add("/r"))
+                    .SetProcessAdditionalArguments("/r")
                     .AddTargets("Build")
                 );
 
@@ -122,41 +121,23 @@ IReadOnlyCollection<Output> MsBuildCommon(
                 );
         });
 
-    void RunCoreTest(string projectName)
-    {
-        Information($"Running tests from {projectName}");
-        var project = Solution.GetProject(projectName).NotNull("project != null");
-
-        foreach (var fw in project.GetTargetFrameworks())
-        {
-            if (fw.StartsWith("net4")
-                && RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
-                && Environment.GetEnvironmentVariable("FORCE_LINUX_TESTS") != "1")
-            {
-                Information($"Skipping {projectName} ({fw}) tests on Linux - https://github.com/mono/mono/issues/13969");
-                continue;
-            }
-
-            Information($"Running for {projectName} ({fw}) ...");
-
-            DotNetTest(c => c
-                .SetProjectFile(project)
-                .SetConfiguration(Parameters.Configuration)
-                .SetFramework(fw)
-                .EnableNoBuild()
-                .EnableNoRestore()
-                .When(Parameters.PublishTestResults, _ => _
-                    .SetLoggers("trx")
-                    .SetResultsDirectory(Parameters.TestResultsRoot)));
-        }
-    }
-
     Target RunCoreLibsTests => _ => _
         .OnlyWhenStatic(() => !Parameters.SkipTests)
         .DependsOn(Compile)
         .Executes(() =>
         {
-            RunCoreTest("Avalonia.Controls.TreeDataGrid.Tests");
+            foreach (var testProject in (RootDirectory / "tests").GlobFiles("**/*.csproj"))
+            {
+                Information($"Running tests from {testProject}");
+                DotNetTest(c => c
+                    .SetProjectFile(testProject)
+                    .SetConfiguration(Parameters.Configuration)
+                    .EnableNoBuild()
+                    .EnableNoRestore()
+                    .When(_ => Parameters.PublishTestResults, _ => _
+                        .SetLoggers("trx")
+                        .SetResultsDirectory(Parameters.TestResultsRoot)));
+            }
         });
 
     Target ZipFiles => _ => _

diff --git a/nukebuild/BuildParameters.cs b/nukebuild/BuildParameters.cs
@@ -56,7 +56,7 @@ public class BuildParameters
         public AbsolutePath BinRoot { get; }
         public AbsolutePath TestResultsRoot { get; }
         public string DirSuffix { get; }
-        public List<string> BuildDirs { get; }
+        public List<AbsolutePath> BuildDirs { get; }
         public string FileZipSuffix { get; }
         public AbsolutePath ZipCoreArtifacts { get; }
         public AbsolutePath ZipNuGetArtifacts { get; }
@@ -125,7 +125,7 @@ public BuildParameters(Build b)
             ZipRoot = ArtifactsDir / "zip";
             BinRoot = ArtifactsDir / "bin";
             TestResultsRoot = ArtifactsDir / "test-results";
-            BuildDirs = GlobDirectories(RootDirectory, "**bin").Concat(GlobDirectories(RootDirectory, "**obj")).ToList();
+            BuildDirs = RootDirectory.GlobDirectories("**bin").Concat(RootDirectory.GlobDirectories("**obj")).ToList();
             DirSuffix = Configuration;
             FileZipSuffix = Version + ".zip";
             ZipCoreArtifacts = ZipRoot / ("Avalonia-" + FileZipSuffix);

diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
     <NoWarn>CS0649;CS0169</NoWarn>
+    <NukeTelemetryVersion>1</NukeTelemetryVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="6.0.3" />
-    <PackageReference Include="xunit.runner.console" Version="2.3.1" />
-    <PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
+    <PackageReference Include="Nuke.Common" Version="9.0.4" />
+    <PackageReference Include="vswhere" Version="3.1.7" Condition=" '$(OS)' == 'Windows_NT' " />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/readme.md b/readme.md
@@ -20,10 +20,6 @@ An example of `TreeDataGrid` displaying flat data:
 
 ## Current Status
 
-The control is currently in *early beta*. As such there will be bugs, missing features and lacking docs, but the control should be generally usable and performant.
-
-**Note**:
-
 We accept issues and pull requests but we answer and review only pull requests and issues that are created by our customers. It's a quite big project and servicing all issues and pull requests will require more time than we have. But feel free to open issues and pull requests because they may be useful for us!
 
 ## Getting Started