michaldengusiak · Oct 6, 2026 · Sep 28, 2026 · Sep 28, 2026 · Sep 28, 2026 · Sep 28, 2026
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -98,11 +98,16 @@ jobs:
           # Keep current repo LAST. Do not duplicate SAM_UI earlier in the list.
           $buildOrder = @(
             'SAM'
+            'SAM_Mollier'
             'SAM_Systems'
             'SAM_Windows'
-            'SAM_Mollier'
             'SAM_gbXML'
             'SAM_SolarCalculator'
+            # Must precede SAM_Tas: SAM_Tas\benchmark\SAM.Analytical.Tas.Benchmark references
+            # SAM_Validation\build\SAM.Analytical.Benchmark.dll by HintPath, and without it it fails
+            # CS0234. Same slot as BuildAlls_v4.csproj uses locally. Needs only SAM and SAM_Mollier,
+            # both already above.
+            'SAM_Validation'
             'SAM_Tas'
             'SAM_Excel'
             'SAM_GEM'
@@ -123,7 +128,18 @@ jobs:
             # Current sow branch: base_ref on PR events, ref_name on push events.
             $sowRef = if ($baseRef -match '^sow/') { $baseRef } elseif ($refName -match '^sow/') { $refName } else { '' }
             if ($sowRef -and $sowRef -ne $headRef) { $candidates += $sowRef }
-            $candidates += 'sow/2026-Q2'
+            # Canonical quarter branch (strip suffixes like -update-optimization): e.g. sow/2026-Q3.
+            # On push events base_ref is empty and ref_name may be a feature branch off a sow branch,
+            # so without this the dep clone falls back to master and misses in-quarter API changes.
+            $canonical = ''
+            foreach ($cref in @($headRef, $baseRef, $refName)) {
+              if ($cref -match 'sow/(\d{4})-Q(\d)') { $canonical = "sow/$($Matches[1])-Q$($Matches[2])"; break }
+            }
+            if ($canonical -and $candidates -notcontains $canonical) { $candidates += $canonical }
+            # Hard fallbacks to the active quarter branches (in priority order).
+            foreach ($fb in @('sow/2026-Q3', 'sow/2026-Q2')) {
+              if ($candidates -notcontains $fb) { $candidates += $fb }
+            }
             # Use the auth-token form so private deps (e.g. SAM_Solver) don't prompt
             $url = if ($token) { "https://$token@github.com/$org/$r.git" } else { "https://github.com/$org/$r.git" }
             $cloned = $false
@@ -170,11 +186,16 @@ jobs:
           # Keep current repo LAST. SAM_Solver must be built before SAM_UI.
           $buildOrder = @(
             'SAM'
+            'SAM_Mollier'
             'SAM_Systems'
             'SAM_Windows'
-            'SAM_Mollier'
             'SAM_gbXML'
             'SAM_SolarCalculator'
+            # Must precede SAM_Tas: SAM_Tas\benchmark\SAM.Analytical.Tas.Benchmark references
+            # SAM_Validation\build\SAM.Analytical.Benchmark.dll by HintPath, and without it it fails
+            # CS0234. Same slot as BuildAlls_v4.csproj uses locally. Needs only SAM and SAM_Mollier,
+            # both already above.
+            'SAM_Validation'
             'SAM_Tas'
             'SAM_Excel'
             'SAM_GEM'

diff --git a/Application/SAM Analytical Mollier/SAM Analytical Mollier.csproj b/Application/SAM Analytical Mollier/SAM Analytical Mollier.csproj
@@ -11,7 +11,7 @@
 	  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
-    <Configurations>Debug;Release;net48-windows</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>SAM.ico</ApplicationIcon>

diff --git a/Application/SAM Analytical/SAM Analytical.csproj b/Application/SAM Analytical/SAM Analytical.csproj
@@ -11,7 +11,7 @@
 	  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
-    <Configurations>Debug;Release;net48-windows</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>SAM.ico</ApplicationIcon>
@@ -50,11 +50,9 @@
     <Reference Include="SAM.Core">
       <HintPath>..\..\..\SAM\build\SAM.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="SAM.Geometry">
       <HintPath>..\..\..\SAM\build\SAM.Geometry.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\SAM.png" />
@@ -153,7 +151,7 @@
     <PackageReference Include="HelixToolkit.Wpf">
       <Version>2.27.0</Version>
     </PackageReference>
-    <PackageReference Include="HoneybeeSchema" Version="1.5901.5" />
+    <PackageReference Include="HoneybeeSchema" Version="$(HoneybeeSchemaVersion)" />
     <PackageReference Include="NetOfficeFw.Excel">
       <Version>1.9.7</Version>
     </PackageReference>

diff --git a/Application/SAM Geometry/SAM Geometry.csproj b/Application/SAM Geometry/SAM Geometry.csproj
@@ -9,7 +9,7 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
-    <Configurations>Debug;Release;net48-windows</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <OutputPath>..\..\build\</OutputPath>
@@ -24,8 +24,6 @@
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data.DataSetExtensions" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\WPF\SAM.Geometry.UI.WPF\SAM.Geometry.UI.WPF.csproj" />

diff --git a/Application/SAM Weather/SAM Weather.csproj b/Application/SAM Weather/SAM Weather.csproj
@@ -10,7 +10,7 @@
 	  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
-    <Configurations>Debug;Release;net48-windows</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>SAM.ico</ApplicationIcon>
@@ -22,8 +22,6 @@
     <Reference Include="SAM.Weather">
       <HintPath>..\..\..\SAM\build\SAM.Weather.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\WPF\SAM.Weather.UI.WPF\SAM.Weather.UI.WPF.csproj" />

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -23,6 +23,15 @@
     <Deterministic>true</Deterministic>
   </PropertyGroup>
 
+  <!--
+    Centralised HoneybeeSchema version. Must stay in lock-step with SAM_LadybugTools
+    (currently 2.6.0): SAM_UI calls into SAM.Analytical.LadybugTools, which is compiled
+    against this version, so a mismatch causes runtime TypeLoad errors.
+  -->
+  <PropertyGroup>
+    <HoneybeeSchemaVersion>2.6.0</HoneybeeSchemaVersion>
+  </PropertyGroup>
+
   <!--
     Projects where SDK assembly-attribute generation is disabled (legacy AssemblyInfo.cs
     with GenerateAssemblyInfo=false) OR projects where the SDK doesn't auto-generate

diff --git a/Grasshopper/SAM.Analytical.UI.Grasshopper/Component/SAMAnalyticalPrintAHU.cs b/Grasshopper/SAM.Analytical.UI.Grasshopper/Component/SAMAnalyticalPrintAHU.cs
@@ -1,4 +1,7 @@
-using Grasshopper.Kernel;
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright (c) 2020-2026 Michal Dengusiak & Jakub Ziolkowski and contributors
+
+using Grasshopper.Kernel;
 using SAM.Analytical.Grasshopper;
 using SAM.Analytical.UI.Grasshopper.Properties;
 using SAM.Core.Grasshopper;
@@ -31,7 +34,7 @@ public class SAMAnalyticalPrintAHU : GH_SAMVariableOutputParameterComponent
         /// </summary>
         public SAMAnalyticalPrintAHU()
           : base("SAMAnalytical.PrintAHU", "SAMAnalytical.PrintAHU",
-              "Print Room Data Sheets",
+              "Exports Air Handling Unit schedules to an Excel workbook using a predefined template",
               "SAM", "UI")
         {
         }
@@ -68,7 +71,7 @@ protected override GH_SAMParam[] Outputs
             {
                 List<GH_SAMParam> result = new List<GH_SAMParam>();
                 result.Add(new GH_SAMParam(new GooAnalyticalModelParam() { Name = "analytcialModel", NickName = "analytcialModel", Description = "SAM Analytical Model", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
-                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_Boolean() { Name = "successful", NickName = "successful", Description = "Correctly imported?", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
+                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_Boolean() { Name = "successful", NickName = "successful", Description = "Returns True if the component ran without errors", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
                 return result.ToArray();
             }
         }

diff --git a/Grasshopper/SAM.Analytical.UI.Grasshopper/Component/SAMAnalyticalPrintRDS.cs b/Grasshopper/SAM.Analytical.UI.Grasshopper/Component/SAMAnalyticalPrintRDS.cs
@@ -1,4 +1,7 @@
-using Grasshopper.Kernel;
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright (c) 2020-2026 Michal Dengusiak & Jakub Ziolkowski and contributors
+
+using Grasshopper.Kernel;
 using SAM.Analytical.Grasshopper;
 using SAM.Analytical.UI.Grasshopper.Properties;
 using SAM.Core.Grasshopper;
@@ -68,7 +71,7 @@ protected override GH_SAMParam[] Outputs
             {
                 List<GH_SAMParam> result = new List<GH_SAMParam>();
                 result.Add(new GH_SAMParam(new GooAnalyticalModelParam() { Name = "analyticalModel", NickName = "analyticalModel", Description = "SAM Analytical Model", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
-                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_Boolean() { Name = "successful", NickName = "successful", Description = "Correctly imported?", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
+                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_Boolean() { Name = "successful", NickName = "successful", Description = "Returns True if the component ran without errors", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
                 return result.ToArray();
             }
         }

diff --git a/Grasshopper/SAM.Analytical.UI.Grasshopper/SAM.Analytical.UI.Grasshopper.csproj b/Grasshopper/SAM.Analytical.UI.Grasshopper/SAM.Analytical.UI.Grasshopper.csproj
@@ -12,7 +12,7 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
 	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-	  <Configurations>Debug;Release;net48-windows</Configurations>
+	  <Configurations>Debug;Release</Configurations>
     <OutputPath>..\..\build\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
@@ -58,8 +58,6 @@
     <Reference Include="SAM.Geometry.Grasshopper.Mollier">
       <HintPath>..\..\..\SAM_Mollier\build\SAM.Geometry.Grasshopper.Mollier.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Grasshopper">

diff --git a/Grasshopper/SAM.Analytical.UI.WPF.Grasshopper/Component/SAMAnalyticalMultitaskerWorkflow.cs b/Grasshopper/SAM.Analytical.UI.WPF.Grasshopper/Component/SAMAnalyticalMultitaskerWorkflow.cs
@@ -43,7 +43,7 @@ public class SAMAnalyticalMultitaskerWorkflow : GH_SAMVariableOutputParameterCom
         /// </summary>
         public SAMAnalyticalMultitaskerWorkflow()
           : base("SAMAnalytical.MultitaskerWorkflow", "SAMAnalytical.MultitaskerWorkflow",
-              "MultitaskerWorkflow",
+              "Runs the full TAS thermal simulation workflow (export, sizing, simulation) for multiple analytical models in batch",
               "SAM WIP", "Tas")
         {
         }
@@ -56,16 +56,16 @@ protected override GH_SAMParam[] Inputs
             get
             {
                 List<GH_SAMParam> result = new List<GH_SAMParam>();
-                result.Add(new GH_SAMParam(new GooAnalyticalModelParam { Name = "_analyticalModels", NickName = "_analyticalModels", Description = "AnalyticalModels", Access = GH_ParamAccess.list }, ParamVisibility.Binding));
-                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_String() { Name = "_directory", NickName = "_directory", Description = "Directory", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
+                result.Add(new GH_SAMParam(new GooAnalyticalModelParam { Name = "_analyticalModels", NickName = "_analyticalModels", Description = "List of SAM Analytical Models to process through the TAS workflow", Access = GH_ParamAccess.list }, ParamVisibility.Binding));
+                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_String() { Name = "_directory", NickName = "_directory", Description = "Root output directory for TBD, TSD and results files", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
 
                 result.Add(new GH_SAMParam(new Weather.Grasshopper.GooWeatherDataParam() { Name = "weatherData_", NickName = "weatherData_", Description = "SAM WeatherData", Access = GH_ParamAccess.item, Optional = true }, ParamVisibility.Binding));
                 result.Add(new GH_SAMParam(new GooAnalyticalObjectParam() { Name = "coolingDesignDays_", NickName = "coolingDesignDays_", Description = "The SAM Analytical Design Days for Cooling", Access = GH_ParamAccess.list, Optional = true }, ParamVisibility.Voluntary));
                 result.Add(new GH_SAMParam(new GooAnalyticalObjectParam() { Name = "heatingDesignDays_", NickName = "heatingDesignDays_", Description = "The SAM Analytical Design Days for Heating", Access = GH_ParamAccess.list, Optional = true }, ParamVisibility.Voluntary));
 
                 global::Grasshopper.Kernel.Parameters.Param_Boolean @boolean = null;
 
-                boolean = new global::Grasshopper.Kernel.Parameters.Param_Boolean() { Name = "_addIZAMs_", NickName = "_addIZAMs_", Description = "Add IZAMs", Access = GH_ParamAccess.item };
+                boolean = new global::Grasshopper.Kernel.Parameters.Param_Boolean() { Name = "_addIZAMs_", NickName = "_addIZAMs_", Description = "If True, adds internal zone air mass (IZAM) elements to the TAS model", Access = GH_ParamAccess.item };
                 @boolean.SetPersistentData(true);
                 result.Add(new GH_SAMParam(boolean, ParamVisibility.Voluntary));
 
@@ -125,7 +125,7 @@ protected override GH_SAMParam[] Outputs
                 List<GH_SAMParam> result = [];
                 result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_String() { Name = "CaseDescriptions", NickName = "CaseDescriptions", Description = "CaseDescriptions", Access = GH_ParamAccess.list }, ParamVisibility.Binding));
                 result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_String() { Name = "Directories", NickName = "Directories", Description = "Directories", Access = GH_ParamAccess.list }, ParamVisibility.Binding));
-                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_Boolean() { Name = "successful", NickName = "successful", Description = "successful", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
+                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_Boolean() { Name = "successful", NickName = "successful", Description = "Returns True if the workflow completed without being cancelled", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
                 return [.. result];
             }
         }
@@ -349,9 +349,17 @@ protected override void SolveInstance(IGH_DataAccess dataAccess)
                 }
             }
 
-            Dictionary<string, AnalyticalModel> dictionary = Modify.RunWorkflow(analyticalModels, workflowSettings, directory, parallel, maxDegreeOfParallelism);
+            // The cancellable overload, not the compatibility one: that discards the cancelled flag, and a
+            // cancelled batch would then be indistinguishable from a complete one here - the count warning
+            // below is not enough, since a partial batch that happens to be short for an unrelated reason
+            // reads the same. Successful must not be true for a run the user stopped.
+            Dictionary<string, AnalyticalModel> dictionary = Modify.RunWorkflow(analyticalModels, workflowSettings, directory, System.Threading.CancellationToken.None, out bool cancelled, parallel, maxDegreeOfParallelism);
 
-            if (analyticalModels.Count != dictionary.Count)
+            if (cancelled)
+            {
+                AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, "Workflow cancelled. The models listed below are the ones that finished; partially written .tbd/.tsd files may remain in the output directory.");
+            }
+            else if (analyticalModels.Count != (dictionary == null ? 0 : dictionary.Count))
             {
                 AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, "Some of the models could not be calculated.");
             }
@@ -370,7 +378,7 @@ protected override void SolveInstance(IGH_DataAccess dataAccess)
 
             if (index_successful != -1)
             {
-                dataAccess.SetData(index_successful, true);
+                dataAccess.SetData(index_successful, !cancelled);
             }
         }
 

diff --git a/Grasshopper/SAM.Analytical.UI.WPF.Grasshopper/SAM.Analytical.UI.WPF.Grasshopper.csproj b/Grasshopper/SAM.Analytical.UI.WPF.Grasshopper/SAM.Analytical.UI.WPF.Grasshopper.csproj
@@ -12,7 +12,7 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
 	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-	  <Configurations>Debug;Release;net48-windows</Configurations>
+	  <Configurations>Debug;Release</Configurations>
     <OutputPath>..\..\build\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
@@ -65,8 +65,6 @@
     <Reference Include="SAM.Weather.Grasshopper">
       <HintPath>..\..\..\SAM\build\SAM.Weather.Grasshopper.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Grasshopper">

diff --git a/...re.Mollier.UI.Grasshopper/Component/SAMMollierCreateCoolingProcessByDryBulbTemperature.cs b/...re.Mollier.UI.Grasshopper/Component/SAMMollierCreateCoolingProcessByDryBulbTemperature.cs
@@ -1,4 +1,7 @@
-using Grasshopper.Kernel;
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright (c) 2020-2026 Michal Dengusiak & Jakub Ziolkowski and contributors
+
+using Grasshopper.Kernel;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -39,7 +42,7 @@ protected override GH_SAMParam[] Inputs
                 param_Number = new global::Grasshopper.Kernel.Parameters.Param_Number() { Name = "_dryBulbTemperature", NickName = "_dryBulbTemperature", Description = "Dry Bulb Temperature [°C]", Access = GH_ParamAccess.item };
                 result.Add(new GH_SAMParam(param_Number, ParamVisibility.Binding));
 
-                param_Number = new global::Grasshopper.Kernel.Parameters.Param_Number() { Name = "_efficiency_", NickName = "_efficiency_", Description = "Efficiency recomended [0.75-1]", Access = GH_ParamAccess.item, Optional = true };
+                param_Number = new global::Grasshopper.Kernel.Parameters.Param_Number() { Name = "_efficiency_", NickName = "_efficiency_", Description = "Efficiency recommended [0.75-1]", Access = GH_ParamAccess.item, Optional = true };
                 param_Number.SetPersistentData(1.0);
                 result.Add(new GH_SAMParam(param_Number, ParamVisibility.Binding));
 

diff --git a/...re.Mollier.UI.Grasshopper/Component/SAMMollierCreateCoolingProcessByEnthalpyDifference.cs b/...re.Mollier.UI.Grasshopper/Component/SAMMollierCreateCoolingProcessByEnthalpyDifference.cs
@@ -1,4 +1,7 @@
-using Grasshopper.Kernel;
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright (c) 2020-2026 Michal Dengusiak & Jakub Ziolkowski and contributors
+
+using Grasshopper.Kernel;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -33,7 +36,7 @@ protected override GH_SAMParam[] Inputs
             {
                 List<GH_SAMParam> result = new List<GH_SAMParam>();
                 result.Add(new GH_SAMParam(new GooMollierPointParam() { Name = "_start", NickName = "_start", Description = "Start Mollier Point for MollierProcess", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
-                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_Number() { Name = "_enthalpyDifference", NickName = "_enthalpyDifference", Description = "Enthalpy Difference [kJ]", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
+                result.Add(new GH_SAMParam(new global::Grasshopper.Kernel.Parameters.Param_Number() { Name = "_enthalpyDifference", NickName = "_enthalpyDifference", Description = "Enthalpy Difference [kJ/kg]", Access = GH_ParamAccess.item }, ParamVisibility.Binding));
                 global::Grasshopper.Kernel.Parameters.Param_Colour param_Colour = null;
                 param_Colour = new global::Grasshopper.Kernel.Parameters.Param_Colour() { Name = "_color_", NickName = "_color_", Description = "Colour RGB", Access = GH_ParamAccess.item, Optional = true };
                 result.Add(new GH_SAMParam(param_Colour, ParamVisibility.Voluntary));