Merge branch 'main' into issues/1131

Author: dwcullop

.github/workflows/pr-version-check.yml

@@ -35,7 +35,7 @@ jobs:
         $isBotBumpPr = ($env:PR_AUTHOR -eq 'github-actions[bot]') -and ($env:HEAD_REF -like 'bot/bump-*' -or $env:HEAD_REF -like 'bot/promote-*')
 
         $labels = $env:LABELS_JSON | ConvertFrom-Json
-        $isBreaking = $labels -contains 'breaking-change'
+        $isBreaking = $labels -contains 'breaking change'
         $isManualEdit = $labels -contains 'manual-version-edit'
 
         # Reject any human-authored PR that touches version.json unless explicitly
@@ -84,11 +84,11 @@ jobs:
         # Unconditional check: if this PR changes the major in version.json, it MUST be
         # labeled breaking-change. Catches unlabeled major-version edits.
         if ($headMajor -ne $baseMajor -and -not $isBreaking) {
-          throw "This PR changes version.json's major from $baseMajor to $headMajor but is not labeled 'breaking-change'. Major-version changes must be tagged."
+          throw "This PR changes version.json's major from $baseMajor to $headMajor but is not labeled 'breaking change'. Major-version changes must be tagged."
         }
 
         if (-not $isBreaking) {
-          Write-Host "PR is not labeled 'breaking-change' and does not change the major; no further checks."
+          Write-Host "PR is not labeled 'breaking change' and does not change the major; no further checks."
           exit 0
         }
 
@@ -122,9 +122,9 @@ jobs:
         $expectedMajor = $latestMajor + 1
         if ($headMajor -ne $expectedMajor) {
           if ($headMajor -le $latestMajor) {
-            $msg = "PR is labeled breaking-change but its version.json major ($headMajor) is not greater than the latest stable release major ($latestMajor; tag '$latestStable'). Run the 'Bump main to next major preview' workflow with next_major=$expectedMajor first, then rebase this PR onto the updated main."
+            $msg = "PR is labeled 'breaking change' but its version.json major ($headMajor) is not greater than the latest stable release major ($latestMajor; tag '$latestStable'). Run the 'Bump main to next major preview' workflow with next_major=$expectedMajor first, then rebase this PR onto the updated main."
           } else {
-            $msg = "PR is labeled breaking-change but its version.json major ($headMajor) skips past major $expectedMajor. Main must be at exactly latest_stable_major + 1 ($latestMajor + 1 = $expectedMajor). Reset main to $expectedMajor.0-preview.{height} before merging this PR."
+            $msg = "PR is labeled 'breaking change' but its version.json major ($headMajor) skips past major $expectedMajor. Main must be at exactly latest_stable_major + 1 ($latestMajor + 1 = $expectedMajor). Reset main to $expectedMajor.0-preview.{height} before merging this PR."
           }
           throw $msg
         }

src/Directory.Build.targets

@@ -3,6 +3,13 @@
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- Automatic file nesting, for .cs files-->
+    <Compile Update="**\*.*.cs">
+      <DependentUpon>$([System.Text.RegularExpressions.Regex]::Replace(%(Filename), '\.[^\.]+$', '.cs'))</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);P_LINQ;SUPPORTS_BINDINGLIST</DefineConstants>
   </PropertyGroup>

src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicate.cs

@@ -0,0 +1,6 @@
+namespace DynamicData.Tests.Cache;
+
+public static partial class FilterFixture
+{
+    public static partial class DynamicPredicate;
+}

src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateAndReFiltering.cs

@@ -0,0 +1,6 @@
+namespace DynamicData.Tests.Cache;
+
+public static partial class FilterFixture
+{
+    public static partial class DynamicPredicateAndReFiltering;
+}

src/DynamicData.Tests/Cache/FilterFixture.DynamicPredicateState.cs

@@ -0,0 +1,6 @@
+namespace DynamicData.Tests.Cache;
+
+public static partial class FilterFixture
+{
+    public static partial class DynamicPredicateState;
+}

src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Items.cs

@@ -0,0 +1,6 @@
+namespace DynamicData.Tests.Cache;
+
+public static partial class ToObservableChangeSetFixture
+{
+    public static partial class Items;
+}

src/DynamicData.Tests/Cache/ToObservableChangeSetFixture.Sequences.cs

@@ -0,0 +1,6 @@
+namespace DynamicData.Tests.Cache;
+
+public static partial class ToObservableChangeSetFixture
+{
+    public static partial class Sequences;
+}

src/DynamicData.Tests/List/ToObservableChangeSetFixture.Items.cs

@@ -0,0 +1,6 @@
+namespace DynamicData.Tests.List;
+
+public static partial class ToObservableChangeSetFixture
+{
+    public static partial class Items;
+}

src/DynamicData.Tests/List/ToObservableChangeSetFixture.Sequences.cs

@@ -0,0 +1,6 @@
+namespace DynamicData.Tests.List;
+
+public static partial class ToObservableChangeSetFixture
+{
+    public static partial class Sequences;
+}

src/DynamicData/Cache/Internal/ExpireAfter.cs

@@ -0,0 +1,7 @@
+// Copyright (c) 2011-2025 Roland Pheasant. All rights reserved.
+// Roland Pheasant licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+namespace DynamicData.Cache.Internal;
+
+internal static partial class ExpireAfter;