com.wallstop-studios.dxmessaging 2.2.0 → 3.1.0

package/Samples~/UI Buttons + Inspector/WallstopStudios.DxMessaging.UIButtons.Sample.asmdef.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: e475c165078bed643a9e5b28abb34c94
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: e475c165078bed643a9e5b28abb34c94
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Samples~/UI Buttons + Inspector.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 54a9de7795e63374ea588cd687ad1184
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 54a9de7795e63374ea588cd687ad1184
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/SourceGenerators/Directory.Build.props

@@ -1,9 +1,56 @@
 <Project>
-  <PropertyGroup Condition="'$(MSBuildProjectName)' == 'WallstopStudios.DxMessaging.SourceGenerators.Tests'">
+  <!--
+    Redirect ALL build output for every project under SourceGenerators/ into the
+    repo's Unity-ignored, git-ignored .artifacts/ tree.
+
+    WHY: this repo IS a Unity UPM package and the repo root is the package root,
+    so Unity imports everything under it that is not in a Unity-ignored location.
+    Unity ignores files/folders whose names start with '.' (e.g. .artifacts) or
+    end with '~'. If a SourceGenerators project builds its obj/ or bin/ in-tree,
+    Unity imports those build outputs. The analyzer/source-generator DLLs there
+    have the SAME assembly names as the correctly-configured shipped analyzers in
+    Editor/Analyzers/, but their Unity-auto-generated .meta lack the
+    RoslynAnalyzer label / validateReferences:0 / all-platforms-disabled config.
+    Unity then fails to resolve their Microsoft.CodeAnalysis reference and the
+    duplicate shadows the real analyzers, so the source generator never runs and
+    every [Dx*Message] type fails to implement its generated interface
+    (CS0315/CS0452) project-wide.
+
+    Building these projects is REQUIRED by the dev workflow (the main projects'
+    PostBuildCopyAnalyzers target copies the freshly-built DLL into
+    Editor/Analyzers/), so the build MUST go somewhere Unity ignores.
+
+    HOW: redirect per-project obj/ and bin/ to
+    $(SolutionDir).artifacts/$(MSBuildProjectName)/{obj,bin}/$(Configuration)/.
+    BaseIntermediateOutputPath is set here because Directory.Build.props is
+    imported BEFORE the .NET SDK's default-path logic (Sdk.props) that derives
+    obj/ paths and before NuGet restore writes project.assets.json; setting it
+    here ensures even 'dotnet restore' writes obj/project.assets.json under
+    .artifacts/ instead of an in-tree obj/. IntermediateOutputPath (the
+    Configuration-scoped obj subfolder) and OutputPath (bin) are set for the
+    build itself. $(TargetPath) therefore resolves under .artifacts/, and the
+    PostBuildCopyAnalyzers targets still copy the built DLL into
+    Editor/Analyzers/ correctly.
+  -->
+  <PropertyGroup>
     <SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)..\</SolutionDir>
-    <ArtifactsRoot>$(SolutionDir).artifacts/SourceGenerators.Tests/</ArtifactsRoot>
-    <IntermediateOutputPath>$(ArtifactsRoot)obj/$(Configuration)/</IntermediateOutputPath>
+    <ArtifactsRoot Condition="'$(ArtifactsRoot)' == ''"
+      >$(SolutionDir).artifacts/$(MSBuildProjectName)/</ArtifactsRoot>
+    <!-- Set BaseIntermediateOutputPath early so NuGet restore's obj/ (and
+         project.assets.json) is written under .artifacts/, never in-tree. The
+         trailing slash is required by the SDK's path-joining logic. -->
+    <BaseIntermediateOutputPath>$(ArtifactsRoot)obj/</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)/</IntermediateOutputPath>
     <OutputPath>$(ArtifactsRoot)bin/$(Configuration)/</OutputPath>
     <VSTestResultsDirectory>$(ArtifactsRoot)TestResults/</VSTestResultsDirectory>
+    <LangVersion>10.0</LangVersion>
+    <Deterministic>true</Deterministic>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <CopyAnalyzerPayload Condition="'$(CopyAnalyzerPayload)' == ''">true</CopyAnalyzerPayload>
+    <AnalyzerPayloadOutputDir Condition="'$(AnalyzerPayloadOutputDir)' == ''"
+      >$([System.IO.Path]::Combine('$(SolutionDir)', 'Editor', 'Analyzers'))</AnalyzerPayloadOutputDir>
   </PropertyGroup>
 </Project>

package/SourceGenerators/Directory.Build.props.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 5b80e1cf4c3c72a43bbd48e4667f00f7
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 5b80e1cf4c3c72a43bbd48e4667f00f7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/SourceGenerators/WallstopStudios.DxMessaging.SourceGenerators/DxAutoConstructorGenerator.cs

@@ -13,8 +13,8 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.CodeAnalysis.Text;
 
-    [Generator(LanguageNames.CSharp)]
-    public sealed class DxAutoConstructorGenerator : IIncrementalGenerator
+    [Generator]
+    public sealed class DxAutoConstructorGenerator : ISourceGenerator
     {
         private static readonly DiagnosticDescriptor NonPartialContainerDiagnostic = new(
             id: "DXMSG003",
@@ -57,46 +57,34 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
         );
 
         /// <summary>
-        /// Configures the incremental generator pipeline that discovers annotated types and emits constructors.
+        /// Configures syntax collection for annotated types that need generated constructors.
         /// </summary>
         /// <param name="context">Initialization context provided by Roslyn.</param>
-        public void Initialize(IncrementalGeneratorInitializationContext context)
+        public void Initialize(GeneratorInitializationContext context)
         {
-            // Find all class/struct/record declarations that have attribute lists
-            IncrementalValuesProvider<TypeDeclarationSyntax> potentialTypeDeclarations =
-                context.SyntaxProvider.CreateSyntaxProvider(
-                    predicate: static (node, _) => IsSyntaxTargetForGeneration(node),
-                    transform: static (ctx, _) => (TypeDeclarationSyntax)ctx.Node
-                );
+            context.RegisterForSyntaxNotifications(static () => new TypeSyntaxReceiver());
+        }
 
-            // Get semantic info for potential types
-            IncrementalValuesProvider<TypeToGenerateInfo?> semanticTargets =
-                potentialTypeDeclarations
-                    .Combine(context.CompilationProvider)
-                    .Select(
-                        static (data, ct) =>
-                            GetSemanticTargetForGeneration(data.Left, data.Right, ct)
-                    );
+        public void Execute(GeneratorExecutionContext context)
+        {
+            if (context.SyntaxReceiver is not TypeSyntaxReceiver receiver)
+            {
+                return;
+            }
 
-            // Filter out nulls (types that aren't valid for auto-gen constructor)
-            IncrementalValuesProvider<TypeToGenerateInfo> validSemanticTargets = semanticTargets
+            ImmutableArray<TypeToGenerateInfo> typesToGenerate = receiver
+                .Candidates.Select(typeDeclarationSyntax =>
+                    GetSemanticTargetForGeneration(
+                        typeDeclarationSyntax,
+                        context.Compilation,
+                        context.CancellationToken
+                    )
+                )
                 .Where(static target => target.HasValue)
-                .Select(static (target, _) => target!.Value);
-
-            // Collect all valid types for generation
-            IncrementalValueProvider<ImmutableArray<TypeToGenerateInfo>> collectedTargets =
-                validSemanticTargets.Collect();
-
-            IncrementalValueProvider<(
-                Compilation,
-                ImmutableArray<TypeToGenerateInfo>
-            )> compilationAndTypes = context.CompilationProvider.Combine(collectedTargets);
+                .Select(static target => target!.Value)
+                .ToImmutableArray();
 
-            // Register the source output step
-            context.RegisterSourceOutput(
-                compilationAndTypes,
-                static (spc, source) => Execute(source.Item1, source.Item2, spc)
-            );
+            Execute(typesToGenerate, context);
         }
 
         private static bool IsSyntaxTargetForGeneration(SyntaxNode node) =>
@@ -105,7 +93,11 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
                 typeDecl.IsKind(SyntaxKind.ClassDeclaration)
                 || typeDecl.IsKind(SyntaxKind.StructDeclaration)
                 || typeDecl.IsKind(SyntaxKind.RecordDeclaration)
-                || typeDecl.IsKind(SyntaxKind.RecordStructDeclaration)
+                || string.Equals(
+                    typeDecl.Kind().ToString(),
+                    "RecordStructDeclaration",
+                    StringComparison.Ordinal
+                )
             );
 
         private static TypeToGenerateInfo? GetSemanticTargetForGeneration(
@@ -163,9 +155,8 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
         }
 
         private static void Execute(
-            Compilation compilation,
             ImmutableArray<TypeToGenerateInfo> typesToGenerate,
-            SourceProductionContext context
+            GeneratorExecutionContext context
         )
         {
             if (typesToGenerate.IsDefaultOrEmpty)
@@ -235,7 +226,11 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
                 }
 
                 // Generate the partial class/struct with the constructor
-                string generatedSource = GenerateConstructorSource(compilation, typeInfo, context);
+                string generatedSource = GenerateConstructorSource(
+                    context.Compilation,
+                    typeInfo,
+                    context
+                );
                 string hintName =
                     $"{typeInfo.TypeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}.AutoGenConstructor.g.cs"
                         .Replace("global::", "")
@@ -250,7 +245,7 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
         private static string GenerateConstructorSource(
             Compilation compilation,
             TypeToGenerateInfo typeInfo,
-            SourceProductionContext spc
+            GeneratorExecutionContext spc
         )
         {
             INamedTypeSymbol typeSymbol = typeInfo.TypeSymbol;
@@ -290,10 +285,11 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
                     _ => "internal",
                 };
 
+                bool containerIsRecord = IsRecordDeclaration(container);
                 string containerKind = container.TypeKind switch
                 {
-                    TypeKind.Class => container.IsRecord ? "record class" : "class",
-                    TypeKind.Struct => container.IsRecord ? "record struct" : "struct",
+                    TypeKind.Class => containerIsRecord ? "record class" : "class",
+                    TypeKind.Struct => containerIsRecord ? "record struct" : "struct",
                     _ => "class",
                 };
 
@@ -323,10 +319,11 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
                         + ">"
                     : string.Empty;
             string typeName = typeSymbol.Name + typeGenericParams;
+            bool typeIsRecord = IsRecordDeclaration(typeSymbol);
             string typeKind = typeSymbol.TypeKind switch
             {
-                TypeKind.Class => typeSymbol.IsRecord ? "record class" : "class",
-                TypeKind.Struct => typeSymbol.IsRecord ? "record struct" : "struct",
+                TypeKind.Class => typeIsRecord ? "record class" : "class",
+                TypeKind.Struct => typeIsRecord ? "record struct" : "struct",
                 _ => throw new InvalidOperationException(
                     "Unsupported type kind for constructor generation"
                 ),
@@ -524,25 +521,30 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
                 containersClose.Append(currentIndent).AppendLine("}");
             }
 
-            return $$"""
-                // <auto-generated by DxAutoGenConstructorGenerator/>
-                #pragma warning disable
-                #nullable enable annotations
-
-                {{namespaceBlockOpen}}
-                {{containersOpen}}{{innerIndent}}{{typeAccessibility}} partial {{typeKind}} {{typeName}}
-                {{innerIndent}}{
-                {{Indent}}    /// <summary>
-                {{Indent}}    /// Auto-generated constructor by DxAutoGenConstructorGenerator.
-                {{Indent}}    /// </summary>
-                {{innerIndent}}    {{constructorAccessibility}} {{typeSymbol.Name}}({{constructorParams}})
-                {{innerIndent}}    {
-                {{constructorBody}}
-                {{innerIndent}}    }
-                {{innerIndent}}}
-                {{containersClose}}
-                {{namespaceBlockClose}}
-                """;
+            return string.Join(
+                "\r\n",
+                new[]
+                {
+                    "// <auto-generated by DxAutoGenConstructorGenerator/>",
+                    "#pragma warning disable",
+                    "#nullable enable annotations",
+                    string.Empty,
+                    namespaceBlockOpen,
+                    $"{containersOpen}{innerIndent}{typeAccessibility} partial {typeKind} {typeName}",
+                    $"{innerIndent}{{",
+                    $"{Indent}    /// <summary>",
+                    $"{Indent}    /// Auto-generated constructor by DxAutoGenConstructorGenerator.",
+                    $"{Indent}    /// </summary>",
+                    $"{innerIndent}    {constructorAccessibility} {typeSymbol.Name}({constructorParams})",
+                    $"{innerIndent}    {{",
+                    $"{constructorBody}",
+                    $"{innerIndent}    }}",
+                    $"{innerIndent}}}",
+                    $"{containersClose}",
+                    namespaceBlockClose,
+                    string.Empty,
+                }
+            );
         }
 
         private static string FormatLiteral(object value, ITypeSymbol type)
@@ -651,6 +653,23 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
             }
         }
 
+        private static bool IsRecordDeclaration(INamedTypeSymbol symbol)
+        {
+            foreach (SyntaxReference syntaxReference in symbol.DeclaringSyntaxReferences)
+            {
+                if (syntaxReference.GetSyntax() is TypeDeclarationSyntax declaration)
+                {
+                    string kind = declaration.Kind().ToString();
+                    if (kind.IndexOf("Record", StringComparison.Ordinal) >= 0)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
         private static List<INamedTypeSymbol> GetNonPartialContainers(INamedTypeSymbol typeSymbol)
         {
             List<INamedTypeSymbol> result = new();
@@ -694,5 +713,19 @@ namespace WallstopStudios.DxMessaging.SourceGenerators
 
             return true;
         }
+
+        private sealed class TypeSyntaxReceiver : ISyntaxReceiver
+        {
+            public List<TypeDeclarationSyntax> Candidates { get; } =
+                new List<TypeDeclarationSyntax>();
+
+            public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
+            {
+                if (IsSyntaxTargetForGeneration(syntaxNode))
+                {
+                    Candidates.Add((TypeDeclarationSyntax)syntaxNode);
+                }
+            }
+        }
     }
 }

package/SourceGenerators/WallstopStudios.DxMessaging.SourceGenerators/DxAutoConstructorGenerator.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 1b72dc77d3697c1d6bc2f3e1d262f9af
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 1b72dc77d3697c1d6bc2f3e1d262f9af
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: