feat(persistence)!: inline vs-solutionpersistence; rename SolutionModel → Solution; namespace cleanup

AssemblyInfo.cs

@@ -14,8 +14,10 @@
 [assembly: InternalsVisibleTo("Fallout.Cli.Tests")]
 [assembly: InternalsVisibleTo("Fallout.ProjectModel.Tests")]
 [assembly: InternalsVisibleTo("Fallout.SourceGenerators")]
-[assembly: InternalsVisibleTo("Fallout.SolutionModel")]
-[assembly: InternalsVisibleTo("Fallout.SolutionModel.Tests")]
+[assembly: InternalsVisibleTo("Fallout.Solution")]
+[assembly: InternalsVisibleTo("Fallout.Solution.Tests")]
+[assembly: InternalsVisibleTo("Fallout.Persistence.Solution")]
+[assembly: InternalsVisibleTo("Fallout.Persistence.Solution.Tests")]
 [assembly: InternalsVisibleTo("Fallout.Tooling")]
 [assembly: InternalsVisibleTo("Fallout.Tooling.Tests")]
 [assembly: InternalsVisibleTo("Fallout.Utilities.IO.Globbing")]

CHANGELOG.md

@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Breaking changes
 
+- **Inlined `vs-solutionpersistence` parser + renamed `Fallout.SolutionModel` → `Fallout.Solution`; namespace `Fallout.Common.ProjectModel` → `Fallout.Solutions`** (closes #248). The vendored Microsoft fork (`vendor/vs-solutionpersistence/`, submodule, fork-of-fork-of-Microsoft) is gone — sources inlined into a new `Fallout.Persistence.Solution` project under `src/Persistence/`. The facade was renamed and rehoused alongside it (`src/Persistence/Fallout.Solution/`), with the long-standing rebrand-era namespace mismatch (`Fallout.Common.ProjectModel`) fixed to match the assembly name (`Fallout.Solutions`, plural per BCL convention to avoid `Fallout.Solution.Solution` awkwardness).
+  - **Package IDs**: `Fallout.SolutionModel` → `Fallout.Solution`, `Fallout.VisualStudio.SolutionPersistence` → `Fallout.Persistence.Solution`. Consumers that explicitly referenced either need to update their `PackageReference`/`ProjectReference`.
+  - **Namespaces**: `Fallout.Common.ProjectModel` → `Fallout.Solutions`; `Microsoft.VisualStudio.SolutionPersistence.{Model,Serializer,Utilities,...}` → `Fallout.Persistence.Solution.{Model,Serializer,Utilities,...}`. Replace `using` statements accordingly. The `Nuke.Common.ProjectModel.*` transition-shim path is preserved (`ShimMarker.cs` now mirrors both `Fallout.Common.*` → `Nuke.Common.*` and `Fallout.Solutions.*` → `Nuke.Common.ProjectModel.*`), so NUKE-era consumer code using `using Nuke.Common.ProjectModel; [Solution] readonly Solution Solution;` keeps compiling.
+  - **Onion layering**: this PR establishes `src/Persistence/` as the layered home for persistence-ring code. Future persistence-related projects go under the same directory.
+  - **Visibility narrowing deferred**: parser types remain `public` for this PR; the IVT decorations in `Fallout.Persistence.Solution.csproj` are future-intent. Per-type internal narrowing will follow in a later PR (cascading `CS0050` analysis needed).
+  - **Codefix follow-up**: `Fallout.Migrate.Analyzers`'s `Nuke`→`Fallout` rewriter still produces `Fallout.Common.ProjectModel.*` rather than `Fallout.Solutions.*`. Tracked separately.
+  - **Consumer-compat sentinel updated**: `tests/Consumers/Fallout.Consumer.Local/` (added in the prior PR to detect exactly this kind of rename) had its `ProjectReference` path and `using` statement updated in this PR — that update IS the documented consumer migration recipe. `Nuke.Consumer` and `Fallout.Consumer.NuGet` (pinned to 11.0.8) were unaffected, confirming the shim coverage and prior-release stability hold.
+
 - **AES-GCM v2 secret format for `EncryptionUtility` — `parameters.json` encrypted values** (#214, closes #212). The secret-encryption scheme used by `fallout :secrets` is now AES-GCM with per-secret random salt + nonce and 600,000 PBKDF2-SHA256 iterations (OWASP 2023). Previous `v1:` (AES-CBC, static salt, 10,000 iterations, unauthenticated) values **continue to decrypt** — the `Decrypt` path dispatches on `v1:`/`v2:`/unprefixed-legacy. New `Encrypt` calls always emit `v2:`.
   - **On-disk format**: `v2:base64(salt[16] || nonce[12] || tag[16] || ciphertext)`. `v1:` was `v1:base64(salt-as-iv || ciphertext)` with a static `"Ivan Medvedev"` salt.
   - **Migration path**: existing `.fallout/parameters.json` files with `v1:` values stay readable. Re-running `fallout :secrets` to add or update **any** secret naturally re-encrypts that entry under `v2:` (existing `SaveSecrets` flow already calls `Encrypt` per value). A whole-file rekey command can be added if there's demand.

build/Build.GlobalSolution.cs

@@ -10,7 +10,7 @@
 using Fallout.Common;
 using Fallout.Common.Git;
 using Fallout.Common.IO;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Tools.GitHub;
 using Fallout.Common.Utilities;
 using Fallout.Utilities.Text.Yaml;
@@ -25,7 +25,7 @@ partial class Build
     AbsolutePath ExternalRepositoriesDirectory => RootDirectory / "external";
     AbsolutePath ExternalRepositoriesFile => ExternalRepositoriesDirectory / "repositories.yml";
 
-    IEnumerable<Fallout.Common.ProjectModel.Solution> ExternalSolutions
+    IEnumerable<Fallout.Solutions.Solution> ExternalSolutions
         => ExternalRepositories
             .Select(x => ExternalRepositoriesDirectory / x.GetGitHubName())
             .Select(x => x.GlobFiles("*.sln").Single())

build/Build.cs

@@ -13,7 +13,7 @@
 using Fallout.Common.Execution;
 using Fallout.Common.Git;
 using Fallout.Common.IO;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Tooling;
 using Fallout.Common.Tools.DotNet;
 using Fallout.Common.Tools.GitHub;
@@ -44,7 +44,7 @@ partial class Build
     GitRepository GitRepository => From<IHasGitRepository>().GitRepository;
 
     [Solution(GenerateProjects = true)] readonly Solution Solution;
-    Fallout.Common.ProjectModel.Solution IHasSolution.Solution => Solution;
+    Fallout.Solutions.Solution IHasSolution.Solution => Solution;
 
     AbsolutePath OutputDirectory => RootDirectory / "output";
     AbsolutePath SourceDirectory => RootDirectory / "source";
@@ -82,12 +82,12 @@ private static int ParseMajor(string informationalVersion)
         .When(!ScheduledTargets.Contains(((IPublish)this).Publish) && !ScheduledTargets.Contains(Install), _ => _
             .ClearProperties());
 
-    IEnumerable<(Fallout.Common.ProjectModel.Project Project, string Framework)> ICompile.PublishConfigurations =>
+    IEnumerable<(Fallout.Solutions.Project Project, string Framework)> ICompile.PublishConfigurations =>
         from project in new[] { Solution.Fallout_Cli, Solution.Fallout_MSBuildTasks }
         from framework in project.GetTargetFrameworks()
         select (project, framework);
 
-    IEnumerable<Fallout.Common.ProjectModel.Project> ITest.TestProjects => Partition.GetCurrent(Solution.GetAllProjects("*.Tests"));
+    IEnumerable<Fallout.Solutions.Project> ITest.TestProjects => Partition.GetCurrent(Solution.GetAllProjects("*.Tests"));
 
     [Parameter]
     public int TestDegreeOfParallelism { get; } = 1;

fallout.slnx

@@ -22,8 +22,8 @@
   <Project Path="src\Shims\Nuke.Components\Nuke.Components.csproj" />
   <Project Path="src\Fallout.MSBuildTasks\Fallout.MSBuildTasks.csproj" />
   <Project Path="src\Fallout.ProjectModel\Fallout.ProjectModel.csproj" />
-  <Project Path="src\Fallout.SolutionModel\Fallout.SolutionModel.csproj" />
-  <Project Path="src\Fallout.VisualStudio.SolutionPersistence\Fallout.VisualStudio.SolutionPersistence.csproj" />
+  <Project Path="src\Persistence\Fallout.Persistence.Solution\Fallout.Persistence.Solution.csproj" />
+  <Project Path="src\Persistence\Fallout.Solution\Fallout.Solution.csproj" />
   <Project Path="src\Fallout.SourceGenerators\Fallout.SourceGenerators.csproj" />
   <Project Path="src\Fallout.Tooling.Generator\Fallout.Tooling.Generator.csproj" />
   <Project Path="src\Fallout.Tooling\Fallout.Tooling.csproj" />
@@ -41,7 +41,7 @@
   <Project Path="tests\Nuke.Common.Shim.Tests\Nuke.Common.Shim.Tests.csproj" />
   <Project Path="tests\Nuke.Components.Shim.Tests\Nuke.Components.Shim.Tests.csproj" />
   <Project Path="tests\Fallout.ProjectModel.Tests\Fallout.ProjectModel.Tests.csproj" />
-  <Project Path="tests\Fallout.SolutionModel.Tests\Fallout.SolutionModel.Tests.csproj" />
+  <Project Path="tests\Fallout.Solution.Tests\Fallout.Solution.Tests.csproj" />
   <Project Path="tests\Fallout.SourceGenerators.Tests\Fallout.SourceGenerators.Tests.csproj" />
   <Project Path="tests\Consumers\Nuke.Consumer\Nuke.Consumer.csproj" />
   <Project Path="tests\Consumers\Fallout.Consumer.Local\Fallout.Consumer.Local.csproj" />

src/Fallout.Build/Fallout.Build.csproj

@@ -7,7 +7,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Fallout.Build.Shared\Fallout.Build.Shared.csproj" />
     <ProjectReference Include="..\Fallout.ProjectModel\Fallout.ProjectModel.csproj" />
-    <ProjectReference Include="..\Fallout.SolutionModel\Fallout.SolutionModel.csproj" />
+    <ProjectReference Include="..\Persistence\Fallout.Solution\Fallout.Solution.csproj" />
     <ProjectReference Include="..\Fallout.Tooling\Fallout.Tooling.csproj" />
     <ProjectReference Include="..\Fallout.Utilities\Fallout.Utilities.csproj" />
     <ProjectReference Include="..\Fallout.Utilities.IO.Globbing\Fallout.Utilities.IO.Globbing.csproj" />

src/Fallout.Build/Telemetry/Telemetry.cs

@@ -8,7 +8,7 @@
 using System.Reflection;
 using System.Threading;
 using Fallout.Common.IO;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Utilities;
 using static Fallout.Common.ControlFlow;
 
@@ -32,7 +32,7 @@
     private const string VersionPropertyName = "FalloutTelemetryVersion";
     private const string LegacyVersionPropertyName = "NukeTelemetryVersion";
 
     private static readonly int? s_confirmedVersion;
 
     static Telemetry()
     {

src/Fallout.Cli/Program.AddPackage.cs

@@ -8,7 +8,7 @@
 using Fallout.Common;
 using Fallout.Common.Execution;
 using Fallout.Common.IO;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Tooling;
 using Fallout.Common.Tools.DotNet;
 

src/Fallout.Cli/Program.Cake.cs

@@ -11,7 +11,7 @@
 using Fallout.Common;
 using Fallout.Common.Execution;
 using Fallout.Common.IO;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Tooling;
 using Fallout.Common.Utilities;
 using Fallout.Cli.Rewriting.Cake;

src/Fallout.Cli/Program.Update.cs

@@ -10,7 +10,7 @@
 using Fallout.Common;
 using Fallout.Common.Execution;
 using Fallout.Common.IO;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Tools.DotNet;
 using Fallout.Common.Utilities;
 using static Fallout.Common.Constants;

src/Fallout.Cli/ProjectUpdater.cs

@@ -7,7 +7,7 @@
 using System.Linq;
 using NuGet.Versioning;
 using Fallout.Common;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Tooling;
 using Fallout.Common.Utilities;
 

src/Fallout.Cli/Rewriting/Cake/ClassRewriter.cs

@@ -36,7 +36,7 @@ internal class ClassRewriter : SafeSyntaxRewriter
             "Fallout.Common",
             "Fallout.Common.Execution",
             "Fallout.Common.IO",
-            "Fallout.Common.ProjectModel",
+            "Fallout.Solutions",
             "Fallout.Common.Tooling",
             "Fallout.Common.Tools.DotNet",
             "Fallout.Common.Tools.GitVersion",

src/Fallout.Cli/templates/Build.cs

@@ -5,7 +5,7 @@
 using Fallout.Common.Execution;
 using Fallout.Common.Git;                                                                          // GIT
 using Fallout.Common.IO;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Tooling;
 using Fallout.Common.Tools.DotNet;                                                                 // DOTNET
 using Fallout.Common.Tools.GitVersion;                                                             // GITVERSION

src/Fallout.Common/Attributes/SolutionAttribute.cs

@@ -10,7 +10,9 @@
 using Fallout.Common.Utilities;
 using Serilog;
 
-namespace Fallout.Common.ProjectModel;
+using Fallout.Common;
+
+namespace Fallout.Solutions;
 
 /// <summary>
 ///     Injects an instance of <see cref="Solution"/>. The solution path is resolved in the following order:

src/Fallout.Common/CI/TeamCity/TeamCityAttribute.cs

@@ -13,7 +13,7 @@
 using Fallout.Common.CI.TeamCity.Configuration;
 using Fallout.Common.Execution;
 using Fallout.Common.IO;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Utilities;
 using Fallout.Common.Utilities.Collections;
 using Fallout.Common.ValueInjection;

src/Fallout.Common/Fallout.Common.csproj

@@ -13,7 +13,7 @@
     <ProjectReference Include="..\Fallout.Build\Fallout.Build.csproj" />
     <ProjectReference Include="..\Fallout.Build.Shared\Fallout.Build.Shared.csproj" />
     <ProjectReference Include="..\Fallout.ProjectModel\Fallout.ProjectModel.csproj" />
-    <ProjectReference Include="..\Fallout.SolutionModel\Fallout.SolutionModel.csproj" />
+    <ProjectReference Include="..\Persistence\Fallout.Solution\Fallout.Solution.csproj" />
     <ProjectReference Include="..\Fallout.Tooling\Fallout.Tooling.csproj" />
     <ProjectReference Include="..\Fallout.Utilities\Fallout.Utilities.csproj" />
     <ProjectReference Include="..\Fallout.Utilities.IO.Compression\Fallout.Utilities.IO.Compression.csproj" />

src/Fallout.Components/ICompile.cs

@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Fallout.Common;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Tooling;
 using Fallout.Common.Tools.DotNet;
 using Fallout.Common.Utilities;

src/Fallout.Components/IHasSolution.cs

@@ -6,7 +6,7 @@
 using System;
 using System.Linq;
 using Fallout.Common;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 
 namespace Fallout.Components;
 

src/Fallout.Components/ITest.cs

@@ -12,7 +12,7 @@
 using Fallout.Common.CI.GitHubActions;
 using Fallout.Common.CI.TeamCity;
 using Fallout.Common.IO;
-using Fallout.Common.ProjectModel;
+using Fallout.Solutions;
 using Fallout.Common.Tooling;
 using Fallout.Common.Tools.Coverlet;
 using Fallout.Common.Tools.DotNet;

src/Fallout.ProjectModel/Fallout.ProjectModel.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Fallout.SolutionModel\Fallout.SolutionModel.csproj" />
+    <ProjectReference Include="..\Persistence\Fallout.Solution\Fallout.Solution.csproj" />
     <ProjectReference Include="..\Fallout.Tooling\Fallout.Tooling.csproj" />
     <ProjectReference Include="..\Fallout.Utilities\Fallout.Utilities.csproj" />
   </ItemGroup>

src/Fallout.ProjectModel/Project.GetMSBuildProject.cs

@@ -3,7 +3,9 @@
 // Distributed under the MIT License.
 // https://github.com/ChrisonSimtian/Fallout/blob/main/LICENSE
 
-namespace Fallout.Common.ProjectModel;
+using Fallout.Common;
+
+namespace Fallout.Solutions;
 
 public static partial class ProjectExtensions
 {

src/Fallout.ProjectModel/Project.Items.cs

@@ -7,7 +7,9 @@
 using System.Linq;
 using Fallout.Common.Utilities;
 
-namespace Fallout.Common.ProjectModel;
+using Fallout.Common;
+
+namespace Fallout.Solutions;
 
 public static partial class ProjectExtensions
 {

src/Fallout.ProjectModel/Project.Misc.cs

@@ -7,7 +7,9 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Fallout.Common.ProjectModel;
+using Fallout.Common;
+
+namespace Fallout.Solutions;
 
 public static partial class ProjectExtensions
 {

src/Fallout.ProjectModel/Project.Properties.cs

@@ -5,7 +5,9 @@
 
 using Fallout.Common.Utilities;
 
-namespace Fallout.Common.ProjectModel;
+using Fallout.Common;
+
+namespace Fallout.Solutions;
 
 public static partial class ProjectExtensions
 {

src/Fallout.ProjectModel/ProjectModelTasks.cs

@@ -15,7 +15,9 @@
 using Serilog;
 #pragma warning disable CA2255
 
-namespace Fallout.Common.ProjectModel;
+using Fallout.Common;
+
+namespace Fallout.Solutions;
 
 public static class ProjectModelTasks
 {

src/Fallout.SourceGenerators/Fallout.SourceGenerators.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -13,12 +13,12 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Fallout.Build.Shared\Fallout.Build.Shared.csproj" />
-    <ProjectReference Include="..\Fallout.SolutionModel\Fallout.SolutionModel.csproj" />
+    <ProjectReference Include="..\Persistence\Fallout.Solution\Fallout.Solution.csproj" />
     <ProjectReference Include="..\Fallout.Utilities\Fallout.Utilities.csproj" />
     <ProjectReference Include="..\Fallout.Utilities.IO.Globbing\Fallout.Utilities.IO.Globbing.csproj" />
-    <!-- SolutionPersistence is vendored — source compiled into Fallout.VisualStudio.SolutionPersistence.
+    <!-- Persistence parser inlined into Fallout.Persistence.Solution.
          The generator runs inside Roslyn, so its dependency DLLs need to land in this project's output dir. -->
-    <ProjectReference Include="..\Fallout.VisualStudio.SolutionPersistence\Fallout.VisualStudio.SolutionPersistence.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Persistence\Fallout.Persistence.Solution\Fallout.Persistence.Solution.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildProjectDirectory)\..\Fallout.VisualStudio.SolutionPersistence\bin\$(Configuration)\netstandard2.0\Microsoft.VisualStudio.SolutionPersistence.dll" CopyToOutputDirectory="PreserveNewest" Visible="false" />
+    <None Include="$(MSBuildProjectDirectory)\..\Persistence\Fallout.Persistence.Solution\bin\$(Configuration)\netstandard2.0\Fallout.Persistence.Solution.dll" CopyToOutputDirectory="PreserveNewest" Visible="false" />
     <None Include="$(PkgScriban)\lib\netstandard2.0\*.*" CopyToOutputDirectory="PreserveNewest" Visible="false" />
   </ItemGroup>
 
@@ -40,11 +40,11 @@
   <Target Name="GetDependencyTargetPaths">
     <ItemGroup>
       <TargetPathWithTargetPlatformMoniker Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetFramework)\Fallout.Build.Shared.dll" IncludeRuntimeDependency="false" />
-      <TargetPathWithTargetPlatformMoniker Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetFramework)\Fallout.SolutionModel.dll" IncludeRuntimeDependency="false" />
+      <TargetPathWithTargetPlatformMoniker Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetFramework)\Fallout.Solution.dll" IncludeRuntimeDependency="false" />
       <TargetPathWithTargetPlatformMoniker Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetFramework)\Fallout.Utilities.dll" IncludeRuntimeDependency="false" />
       <TargetPathWithTargetPlatformMoniker Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetFramework)\Fallout.Utilities.IO.Globbing.dll" IncludeRuntimeDependency="false" />
 
-      <TargetPathWithTargetPlatformMoniker Include="$(MSBuildProjectDirectory)\..\Fallout.VisualStudio.SolutionPersistence\bin\$(Configuration)\netstandard2.0\Microsoft.VisualStudio.SolutionPersistence.dll" IncludeRuntimeDependency="false" />
+      <TargetPathWithTargetPlatformMoniker Include="$(MSBuildProjectDirectory)\..\Persistence\Fallout.Persistence.Solution\bin\$(Configuration)\netstandard2.0\Fallout.Persistence.Solution.dll" IncludeRuntimeDependency="false" />
       <TargetPathWithTargetPlatformMoniker Include="$(PkgScriban)\lib\$(TargetFramework)\*.dll" IncludeRuntimeDependency="false" />
     </ItemGroup>
   </Target>