diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.Execute.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.Execute.cs
index 5def3ccb8..caf2f213c 100644
--- a/src/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.Execute.cs
+++ b/src/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.Execute.cs
@@ -1113,13 +1113,13 @@ public static ImmutableArray<MemberDeclarationSyntax> GetOnPropertyChangeMethods
         /// <summary>
         /// Gets a <see cref="CompilationUnitSyntax"/> instance with the cached args of a specified type.
         /// </summary>
-        /// <param name="ContainingTypeName">The name of the generated type.</param>
-        /// <param name="ArgsTypeName">The argument type name.</param>
+        /// <param name="containingTypeName">The name of the generated type.</param>
+        /// <param name="argsTypeName">The argument type name.</param>
         /// <param name="names">The sequence of property names to cache args for.</param>
         /// <returns>A <see cref="CompilationUnitSyntax"/> instance with the sequence of cached args, if any.</returns>
         private static CompilationUnitSyntax? GetKnownPropertyChangingOrChangedArgsSyntax(
-            string ContainingTypeName,
-            string ArgsTypeName,
+            string containingTypeName,
+            string argsTypeName,
             ImmutableArray<string> names)
         {
             if (names.IsEmpty)
@@ -1134,6 +1134,10 @@ public static ImmutableArray<MemberDeclarationSyntax> GetOnPropertyChangeMethods
             // #nullable enable
             // namespace CommunityToolkit.Mvvm.ComponentModel.__Internals
             // {
+            //     /// <summary>
+            //     /// A helper type providing cached, reusable <see cref="<ARGS_TYPE_NAME>"/> instances
+            //     /// for all properties generated with <see cref="global::CommunityToolkit.Mvvm.ComponentModel.ObservablePropertyAttribute"/>.
+            //     /// </summary>
             //     [global::System.CodeDom.Compiler.GeneratedCode("...", "...")]
             //     [global::System.Diagnostics.DebuggerNonUserCode]
             //     [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
@@ -1150,14 +1154,19 @@ public static ImmutableArray<MemberDeclarationSyntax> GetOnPropertyChangeMethods
                     Comment("// <auto-generated/>"),
                     Trivia(PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true)),
                     Trivia(NullableDirectiveTrivia(Token(SyntaxKind.EnableKeyword), true)))).AddMembers(
-                ClassDeclaration(ContainingTypeName).AddModifiers(
+                ClassDeclaration(containingTypeName).AddModifiers(
                     Token(SyntaxKind.InternalKeyword),
                     Token(SyntaxKind.StaticKeyword)).AddAttributeLists(
                         AttributeList(SingletonSeparatedList(
                             Attribute(IdentifierName($"global::System.CodeDom.Compiler.GeneratedCode"))
                             .AddArgumentListArguments(
                                 AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ObservablePropertyGenerator).FullName))),
-                                AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ObservablePropertyGenerator).Assembly.GetName().Version.ToString())))))),
+                                AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ObservablePropertyGenerator).Assembly.GetName().Version.ToString()))))))
+                        .WithOpenBracketToken(Token(TriviaList(
+                            Comment("/// <summary>"),
+                            Comment($"/// A helper type providing cached, reusable <see cref=\"{argsTypeName}\"/> instances"),
+                            Comment("/// for all properties generated with <see cref=\"global::CommunityToolkit.Mvvm.ComponentModel.ObservablePropertyAttribute\"/>."),
+                            Comment("/// </summary>")), SyntaxKind.OpenBracketToken, TriviaList())),
                         AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))),
                         AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))),
                         AttributeList(SingletonSeparatedList(
@@ -1168,31 +1177,32 @@ public static ImmutableArray<MemberDeclarationSyntax> GetOnPropertyChangeMethods
                             AttributeArgument(LiteralExpression(
                                 SyntaxKind.StringLiteralExpression,
                                 Literal("This type is not intended to be used directly by user code")))))))
-                    .AddMembers(names.Select(name => CreateFieldDeclaration(ArgsTypeName, name)).ToArray())))
+                    .AddMembers(names.Select(name => CreateFieldDeclaration(argsTypeName, name)).ToArray())))
                 .NormalizeWhitespace();
         }
 
         /// <summary>
         /// Creates a field declaration for a cached property changing/changed name.
         /// </summary>
-        /// <param name="typeName">The field type name (either <see cref="PropertyChangedEventArgs"/> or <see cref="PropertyChangingEventArgs"/>).</param>
+        /// <param name="fullyQualifiedTypeName">The field fully qualified type name (either <see cref="PropertyChangedEventArgs"/> or <see cref="PropertyChangingEventArgs"/>).</param>
         /// <param name="propertyName">The name of the cached property name.</param>
         /// <returns>A <see cref="FieldDeclarationSyntax"/> instance for the input cached property name.</returns>
-        private static FieldDeclarationSyntax CreateFieldDeclaration(string typeName, string propertyName)
+        private static FieldDeclarationSyntax CreateFieldDeclaration(string fullyQualifiedTypeName, string propertyName)
         {
             // Create a static field with a cached property changed/changing argument for a specified property.
             // This code produces a field declaration as follows:
             //
+            // /// <summary>The cached <see cref="<TYPE_NAME>"/> instance for all "<PROPERTY_NAME>" generated properties.</summary>
             // [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             // [global::System.Obsolete("This field is not intended to be referenced directly by user code")]
             // public static readonly <ARG_TYPE> <PROPERTY_NAME> = new("<PROPERTY_NAME>");
             return
                 FieldDeclaration(
-                VariableDeclaration(IdentifierName(typeName))
+                VariableDeclaration(IdentifierName(fullyQualifiedTypeName))
                 .AddVariables(
                     VariableDeclarator(Identifier(propertyName))
                     .WithInitializer(EqualsValueClause(
-                        ObjectCreationExpression(IdentifierName(typeName))
+                        ObjectCreationExpression(IdentifierName(fullyQualifiedTypeName))
                         .AddArgumentListArguments(Argument(
                             LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(propertyName))))))))
                 .AddModifiers(
@@ -1202,7 +1212,10 @@ private static FieldDeclarationSyntax CreateFieldDeclaration(string typeName, st
                 .AddAttributeLists(
                     AttributeList(SingletonSeparatedList(
                         Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                        AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
+                        AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never")))))
+                    .WithOpenBracketToken(Token(TriviaList(
+                        Comment($"/// <summary>The cached <see cref=\"{fullyQualifiedTypeName}\"/> instance for all \"{propertyName}\" generated properties.</summary>")),
+                        SyntaxKind.OpenBracketToken, TriviaList())),
                     AttributeList(SingletonSeparatedList(
                         Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
                         AttributeArgument(LiteralExpression(
diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.Execute.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.Execute.cs
index fb85b1836..3ff64228b 100644
--- a/src/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.Execute.cs
+++ b/src/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.Execute.cs
@@ -96,6 +96,9 @@ public static CompilationUnitSyntax GetSyntax(bool isDynamicallyAccessedMembersA
 
             // Prepare the base attributes with are always present:
             //
+            // /// <summary>
+            // /// A helper type with generated validation stubs for types deriving from <see cref="global::CommunityToolkit.Mvvm.ComponentModel.ObservableValidator"/>.
+            // /// </summary>
             // [global::System.CodeDom.Compiler.GeneratedCode("...", "...")]
             // [global::System.Diagnostics.DebuggerNonUserCode]
             // [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
@@ -105,7 +108,11 @@ public static CompilationUnitSyntax GetSyntax(bool isDynamicallyAccessedMembersA
                 AttributeList(SingletonSeparatedList(
                     Attribute(IdentifierName($"global::System.CodeDom.Compiler.GeneratedCode")).AddArgumentListArguments(
                         AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ObservableValidatorValidateAllPropertiesGenerator).FullName))),
-                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ObservableValidatorValidateAllPropertiesGenerator).Assembly.GetName().Version.ToString())))))));
+                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ObservableValidatorValidateAllPropertiesGenerator).Assembly.GetName().Version.ToString()))))))
+                .WithOpenBracketToken(Token(TriviaList(
+                    Comment("/// <summary>"),
+                    Comment("/// A helper type with generated validation stubs for types deriving from <see cref=\"global::CommunityToolkit.Mvvm.ComponentModel.ObservableValidator\"/>."),
+                    Comment("/// </summary>")), SyntaxKind.OpenBracketToken, TriviaList())));
             attributes.Add(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))));
             attributes.Add(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))));
             attributes.Add(
@@ -176,8 +183,14 @@ public static CompilationUnitSyntax GetSyntax(ValidationInfo validationInfo)
             // #pragma warning disable
             // namespace CommunityToolkit.Mvvm.ComponentModel.__Internals
             // {
+            //     /// <inheritdoc/>
             //     partial class __ObservableValidatorExtensions
             //     {
+            //         /// <summary>
+            //         /// Creates a validation stub for <see cref="<INSTANCE_TYPE>"/> objects.
+            //         /// </summary>
+            //         /// <param name="_">Dummy parameter, only used to disambiguate the method signature.</param>
+            //         /// <returns>A validation stub for <see cref="<INSTANCE_TYPE>"/> objects.</returns>
             //         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             //         [global::System.Obsolete("This method is not intended to be called directly by user code")]
             //         public static global::System.Action<object> CreateAllPropertiesValidator(<INSTANCE_TYPE> _)
@@ -197,13 +210,20 @@ public static CompilationUnitSyntax GetSyntax(ValidationInfo validationInfo)
                 NamespaceDeclaration(IdentifierName("CommunityToolkit.Mvvm.ComponentModel.__Internals")).WithLeadingTrivia(TriviaList(
                     Comment("// <auto-generated/>"),
                     Trivia(PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true)))).AddMembers(
-                ClassDeclaration("__ObservableValidatorExtensions").AddModifiers(Token(SyntaxKind.PartialKeyword)).AddMembers(
+                ClassDeclaration("__ObservableValidatorExtensions").AddModifiers(
+                    Token(TriviaList(Comment("/// <inheritdoc/>")), SyntaxKind.PartialKeyword, TriviaList())).AddMembers(
                 MethodDeclaration(
                     GenericName("global::System.Action").AddTypeArgumentListArguments(PredefinedType(Token(SyntaxKind.ObjectKeyword))),
                     Identifier("CreateAllPropertiesValidator")).AddAttributeLists(
                         AttributeList(SingletonSeparatedList(
                             Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                            AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
+                            AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never")))))
+                        .WithOpenBracketToken(Token(TriviaList(
+                            Comment("/// <summary>"),
+                            Comment($"/// Creates a validation stub for <see cref=\"{validationInfo.TypeName}\"/> objects."),
+                            Comment("/// </summary>"),
+                            Comment("/// <param name=\"_\">Dummy parameter, only used to disambiguate the method signature.</param>"),
+                            Comment($"/// <returns>A validation stub for <see cref=\"{validationInfo.TypeName}\"/> objects.</returns>")), SyntaxKind.OpenBracketToken, TriviaList())),
                         AttributeList(SingletonSeparatedList(
                             Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
                             AttributeArgument(LiteralExpression(
diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.Execute.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.Execute.cs
index 6a50d4b62..516a3bd2d 100644
--- a/src/CommunityToolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.Execute.cs
+++ b/src/CommunityToolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.Execute.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Immutable;
 using System.Linq;
+using CommunityToolkit.Mvvm.SourceGenerators.ComponentModel.Models;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using CommunityToolkit.Mvvm.SourceGenerators.Helpers;
 using CommunityToolkit.Mvvm.SourceGenerators.Messaging.Models;
@@ -74,6 +75,9 @@ public static CompilationUnitSyntax GetSyntax(bool isDynamicallyAccessedMembersA
 
             // Prepare the base attributes with are always present:
             //
+            // /// <summary>
+            // /// A helper type with generated registration stubs for types implementing <see cref="global::CommunityToolkit.Mvvm.Messaging.IRecipient{T}"/>.
+            // /// </summary>
             // [global::System.CodeDom.Compiler.GeneratedCode("...", "...")]
             // [global::System.Diagnostics.DebuggerNonUserCode]
             // [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
@@ -83,7 +87,11 @@ public static CompilationUnitSyntax GetSyntax(bool isDynamicallyAccessedMembersA
                 AttributeList(SingletonSeparatedList(
                     Attribute(IdentifierName($"global::System.CodeDom.Compiler.GeneratedCode")).AddArgumentListArguments(
                         AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(IMessengerRegisterAllGenerator).FullName))),
-                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(IMessengerRegisterAllGenerator).Assembly.GetName().Version.ToString())))))));
+                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(IMessengerRegisterAllGenerator).Assembly.GetName().Version.ToString()))))))
+                .WithOpenBracketToken(Token(TriviaList(
+                    Comment("/// <summary>"),
+                    Comment("/// A helper type with generated registration stubs for types implementing <see cref=\"global::CommunityToolkit.Mvvm.Messaging.IRecipient{T}\"/>."),
+                    Comment("/// </summary>")), SyntaxKind.OpenBracketToken, TriviaList())));
             attributes.Add(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))));
             attributes.Add(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))));
             attributes.Add(
@@ -146,6 +154,11 @@ public static CompilationUnitSyntax GetSyntax(RecipientInfo recipientInfo)
             // with no tokens, which is the most common scenario and will help particularly with AOT.
             // This code will produce a syntax tree as follows:
             //
+            // /// <summary>
+            // /// Creates a message registration stub for <see cref="<RECIPIENT_TYPE>"/> objects.
+            // /// </summary>
+            // /// <param name="_">Dummy parameter, only used to disambiguate the method signature.</param>
+            // /// <returns>A message registration stub for <see cref="<RECIPIENT_TYPE>"/> objects.</returns>
             // [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             // [global::System.Obsolete("This method is not intended to be called directly by user code")]
             // public static global::System.Action<global::CommunityToolkit.Mvvm.Messaging.IMessenger, object> CreateAllMessagesRegistrator(<RECIPIENT_TYPE> _)
@@ -166,7 +179,13 @@ public static CompilationUnitSyntax GetSyntax(RecipientInfo recipientInfo)
                     Identifier("CreateAllMessagesRegistrator")).AddAttributeLists(
                         AttributeList(SingletonSeparatedList(
                             Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                            AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
+                            AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never")))))
+                        .WithOpenBracketToken(Token(TriviaList(
+                            Comment("/// <summary>"),
+                            Comment($"/// Creates a message registration stub for <see cref=\"{recipientInfo.TypeName}\"/> objects."),
+                            Comment("/// </summary>"),
+                            Comment("/// <param name=\"_\">Dummy parameter, only used to disambiguate the method signature.</param>"),
+                            Comment($"/// <returns>A message registration stub for <see cref=\"{recipientInfo.TypeName}\"/> objects.</returns>")), SyntaxKind.OpenBracketToken, TriviaList())),
                         AttributeList(SingletonSeparatedList(
                             Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
                             AttributeArgument(LiteralExpression(
@@ -199,6 +218,12 @@ public static CompilationUnitSyntax GetSyntax(RecipientInfo recipientInfo)
             // Note: the generic overload has a different name to simplify the lookup with reflection.
             // This code will produce a syntax tree as follows:
             //
+            // /// <summary>
+            // /// Creates a message registration stub for <see cref="<RECIPIENT_TYPE>"/> objects, with an input token.
+            // /// </summary>
+            // /// <typeparam name="TToken">The type of tokens that will be used to register messages.
+            // /// <param name="_">Dummy parameter, only used to disambiguate the method signature.</param>
+            // /// <returns>A message registration stub for <see cref="<RECIPIENT_TYPE>"/> objects.</returns>
             // [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             // [global::System.Obsolete("This method is not intended to be called directly by user code")]
             // public static global::System.Action<global::CommunityToolkit.Mvvm.Messaging.IMessenger, object, TToken> CreateAllMessagesRegistratorWithToken<TToken>(<RECIPIENT_TYPE> _)
@@ -221,7 +246,14 @@ public static CompilationUnitSyntax GetSyntax(RecipientInfo recipientInfo)
                     Identifier("CreateAllMessagesRegistratorWithToken")).AddAttributeLists(
                         AttributeList(SingletonSeparatedList(
                             Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                            AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
+                            AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never")))))
+                        .WithOpenBracketToken(Token(TriviaList(
+                            Comment("/// <summary>"),
+                            Comment($"/// Creates a message registration stub for <see cref=\"{recipientInfo.TypeName}\"/> objects."),
+                            Comment("/// </summary>"),
+                            Comment("/// <typeparam name=\"TToken\">The type of tokens that will be used to register messages.</typeparam>"),
+                            Comment("/// <param name=\"_\">Dummy parameter, only used to disambiguate the method signature.</param>"),
+                            Comment($"/// <returns>A message registration stub for <see cref=\"{recipientInfo.TypeName}\"/> objects.</returns>")), SyntaxKind.OpenBracketToken, TriviaList())),
                         AttributeList(SingletonSeparatedList(
                             Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
                             AttributeArgument(LiteralExpression(
@@ -261,6 +293,7 @@ public static CompilationUnitSyntax GetSyntax(RecipientInfo recipientInfo)
             // #pragma warning disable
             // namespace CommunityToolkit.Mvvm.Messaging.__Internals
             // {
+            //     /// <inheritdoc/>
             //     partial class __IMessengerExtensions
             //     {
             //         <GENERATED_MEMBERS>
@@ -271,7 +304,8 @@ public static CompilationUnitSyntax GetSyntax(RecipientInfo recipientInfo)
                 NamespaceDeclaration(IdentifierName("CommunityToolkit.Mvvm.Messaging.__Internals")).WithLeadingTrivia(TriviaList(
                     Comment("// <auto-generated/>"),
                     Trivia(PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true)))).AddMembers(
-                ClassDeclaration("__IMessengerExtensions").AddModifiers(Token(SyntaxKind.PartialKeyword))
+                ClassDeclaration("__IMessengerExtensions").AddModifiers(
+                    Token(TriviaList(Comment("/// <inheritdoc/>")), SyntaxKind.PartialKeyword, TriviaList()))
                 .AddMembers(defaultChannelMethodDeclaration, customChannelMethodDeclaration)))
                 .NormalizeWhitespace();
         }
diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/Models/HierarchyInfo.Syntax.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/Models/HierarchyInfo.Syntax.cs
index e2e52a43c..0d03495d5 100644
--- a/src/CommunityToolkit.Mvvm.SourceGenerators/Models/HierarchyInfo.Syntax.cs
+++ b/src/CommunityToolkit.Mvvm.SourceGenerators/Models/HierarchyInfo.Syntax.cs
@@ -30,13 +30,14 @@ public CompilationUnitSyntax GetCompilationUnit(
         // Create the partial type declaration with the given member declarations.
         // This code produces a class declaration as follows:
         //
+        // /// <inheritdoc/>
         // partial <TYPE_KIND> TYPE_NAME>
         // {
         //     <MEMBERS>
         // }
         TypeDeclarationSyntax typeDeclarationSyntax =
             Hierarchy[0].GetSyntax()
-            .AddModifiers(Token(SyntaxKind.PartialKeyword))
+            .AddModifiers(Token(TriviaList(Comment("/// <inheritdoc/>")), SyntaxKind.PartialKeyword, TriviaList()))
             .AddMembers(memberDeclarations.ToArray());
 
         // Add the base list, if present
@@ -50,7 +51,7 @@ public CompilationUnitSyntax GetCompilationUnit(
         {
             typeDeclarationSyntax =
                 parentType.GetSyntax()
-                .AddModifiers(Token(SyntaxKind.PartialKeyword))
+                .AddModifiers(Token(TriviaList(Comment("/// <inheritdoc/>")), SyntaxKind.PartialKeyword, TriviaList()))
                 .AddMembers(typeDeclarationSyntax);
         }
 
@@ -67,6 +68,10 @@ public CompilationUnitSyntax GetCompilationUnit(
 
         if (Namespace is "")
         {
+            // Special case for top level types with no namespace: we need to re-add the
+            // inheritdoc XML comment, as otherwise the call below would remove it.
+            syntaxTriviaList = syntaxTriviaList.Add(Comment("/// <inheritdoc/>"));
+
             // If there is no namespace, attach the pragma directly to the declared type,
             // and skip the namespace declaration. This will produce code as follows:
             //
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Test_SourceGeneratorsCodegen.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Test_SourceGeneratorsCodegen.cs
index aa8aa0d17..0062d61dc 100644
--- a/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Test_SourceGeneratorsCodegen.cs
+++ b/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Test_SourceGeneratorsCodegen.cs
@@ -42,6 +42,7 @@ partial class MyViewModel : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <inheritdoc cref="name"/>
@@ -98,6 +99,7 @@ public string Name
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <inheritdoc cref="name"/>
@@ -175,6 +177,7 @@ partial class MyViewModel : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <inheritdoc cref="id"/>
@@ -252,6 +255,7 @@ partial class MyViewModel<T> : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -308,6 +312,7 @@ public T Content
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -390,6 +395,7 @@ partial class MyViewModel<T> : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -446,6 +452,7 @@ public T Content
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -525,6 +532,7 @@ partial class MyViewModel<T> : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -581,6 +589,7 @@ public T Content
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -659,6 +668,7 @@ partial class MyViewModel<T> : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -734,6 +744,7 @@ partial class MyViewModel : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <inheritdoc cref="name"/>
@@ -810,6 +821,7 @@ partial class MyViewModel : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <inheritdoc cref="id"/>
@@ -886,6 +898,7 @@ partial class MyViewModel<T> : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -963,6 +976,7 @@ partial class MyViewModel<T> : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -1040,6 +1054,7 @@ partial class MyViewModel<T> : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel<T>
                 {
                     /// <inheritdoc cref="content"/>
@@ -1133,6 +1148,7 @@ public DefaultValueAttribute(object value)
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <inheritdoc cref="a"/>
@@ -1238,6 +1254,7 @@ public DefaultValueAttribute(object value)
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <summary>The backing field for <see cref="TestCommand"/>.</summary>
@@ -1301,6 +1318,7 @@ private partial void Test2()
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <summary>The backing field for <see cref="Test1Command"/>.</summary>
@@ -1320,6 +1338,7 @@ partial class MyViewModel
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <summary>The backing field for <see cref="Test2Command"/>.</summary>
@@ -1386,6 +1405,7 @@ public ValueAttribute(object value)
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <summary>The backing field for <see cref="Test1Command"/>.</summary>
@@ -1409,6 +1429,7 @@ partial class MyViewModel
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class MyViewModel
                 {
                     /// <summary>The backing field for <see cref="Test2Command"/>.</summary>
@@ -1456,8 +1477,10 @@ partial class MyViewModel<T> : ObservableObject
             #nullable enable
             namespace MyApp
             {
+                /// <inheritdoc/>
                 partial class Foo
                 {
+                    /// <inheritdoc/>
                     partial class MyViewModel<T>
                     {
                         /// <inheritdoc cref="a"/>
@@ -1515,6 +1538,166 @@ public string? A
 #endif
     }
 
+    [TestMethod]
+    public void ObservableProperty_ValidateGeneratedCachedArguments()
+    {
+        string source = """
+            using System.ComponentModel;
+            using CommunityToolkit.Mvvm.ComponentModel;
+
+            namespace MyApp;
+            
+            partial class MyViewModel : ObservableObject
+            {
+                [ObservableProperty]
+                private string? name;
+            }
+            """;
+
+        string result = """
+            // <auto-generated/>
+            #pragma warning disable
+            #nullable enable
+            namespace MyApp
+            {
+                /// <inheritdoc/>
+                partial class MyViewModel
+                {
+                    /// <inheritdoc cref="name"/>
+                    [global::System.CodeDom.Compiler.GeneratedCode("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "8.2.0.0")]
+                    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+                    public string? Name
+                    {
+                        get => name;
+                        set
+                        {
+                            if (!global::System.Collections.Generic.EqualityComparer<string?>.Default.Equals(name, value))
+                            {
+                                OnNameChanging(value);
+                                OnNameChanging(default, value);
+                                OnPropertyChanging(global::CommunityToolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangingArgs.Name);
+                                name = value;
+                                OnNameChanged(value);
+                                OnNameChanged(default, value);
+                                OnPropertyChanged(global::CommunityToolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedArgs.Name);
+                            }
+                        }
+                    }
+
+                    /// <summary>Executes the logic for when <see cref="Name"/> is changing.</summary>
+                    /// <param name="value">The new property value being set.</param>
+                    /// <remarks>This method is invoked right before the value of <see cref="Name"/> is changed.</remarks>
+                    [global::System.CodeDom.Compiler.GeneratedCode("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "8.2.0.0")]
+                    partial void OnNameChanging(string? value);
+                    /// <summary>Executes the logic for when <see cref="Name"/> is changing.</summary>
+                    /// <param name="oldValue">The previous property value that is being replaced.</param>
+                    /// <param name="newValue">The new property value being set.</param>
+                    /// <remarks>This method is invoked right before the value of <see cref="Name"/> is changed.</remarks>
+                    [global::System.CodeDom.Compiler.GeneratedCode("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "8.2.0.0")]
+                    partial void OnNameChanging(string? oldValue, string? newValue);
+                    /// <summary>Executes the logic for when <see cref="Name"/> just changed.</summary>
+                    /// <param name="value">The new property value that was set.</param>
+                    /// <remarks>This method is invoked right after the value of <see cref="Name"/> is changed.</remarks>
+                    [global::System.CodeDom.Compiler.GeneratedCode("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "8.2.0.0")]
+                    partial void OnNameChanged(string? value);
+                    /// <summary>Executes the logic for when <see cref="Name"/> just changed.</summary>
+                    /// <param name="oldValue">The previous property value that was replaced.</param>
+                    /// <param name="newValue">The new property value that was set.</param>
+                    /// <remarks>This method is invoked right after the value of <see cref="Name"/> is changed.</remarks>
+                    [global::System.CodeDom.Compiler.GeneratedCode("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "8.2.0.0")]
+                    partial void OnNameChanged(string? oldValue, string? newValue);
+                }
+            }
+            """;
+
+        string changingArgs = """
+            // <auto-generated/>
+            #pragma warning disable
+            #nullable enable
+            namespace CommunityToolkit.Mvvm.ComponentModel.__Internals
+            {
+                /// <summary>
+                /// A helper type providing cached, reusable <see cref="global::System.ComponentModel.PropertyChangingEventArgs"/> instances
+                /// for all properties generated with <see cref="global::CommunityToolkit.Mvvm.ComponentModel.ObservablePropertyAttribute"/>.
+                /// </summary>
+                [global::System.CodeDom.Compiler.GeneratedCode("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "8.2.0.0")]
+                [global::System.Diagnostics.DebuggerNonUserCode]
+                [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+                [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+                [global::System.Obsolete("This type is not intended to be used directly by user code")]
+                internal static class __KnownINotifyPropertyChangingArgs
+                {
+                    /// <summary>The cached <see cref="global::System.ComponentModel.PropertyChangingEventArgs"/> instance for all "Name" generated properties.</summary>
+                    [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+                    [global::System.Obsolete("This field is not intended to be referenced directly by user code")]
+                    public static readonly global::System.ComponentModel.PropertyChangingEventArgs Name = new global::System.ComponentModel.PropertyChangingEventArgs("Name");
+                }
+            }
+            """;
+
+        string changedArgs = """
+            // <auto-generated/>
+            #pragma warning disable
+            #nullable enable
+            namespace CommunityToolkit.Mvvm.ComponentModel.__Internals
+            {
+                /// <summary>
+                /// A helper type providing cached, reusable <see cref="global::System.ComponentModel.PropertyChangedEventArgs"/> instances
+                /// for all properties generated with <see cref="global::CommunityToolkit.Mvvm.ComponentModel.ObservablePropertyAttribute"/>.
+                /// </summary>
+                [global::System.CodeDom.Compiler.GeneratedCode("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "8.2.0.0")]
+                [global::System.Diagnostics.DebuggerNonUserCode]
+                [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+                [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+                [global::System.Obsolete("This type is not intended to be used directly by user code")]
+                internal static class __KnownINotifyPropertyChangedArgs
+                {
+                    /// <summary>The cached <see cref="global::System.ComponentModel.PropertyChangedEventArgs"/> instance for all "Name" generated properties.</summary>
+                    [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+                    [global::System.Obsolete("This field is not intended to be referenced directly by user code")]
+                    public static readonly global::System.ComponentModel.PropertyChangedEventArgs Name = new global::System.ComponentModel.PropertyChangedEventArgs("Name");
+                }
+            }
+            """;
+
+        VerifyGenerateSources(source, new[] { new ObservablePropertyGenerator() }, ("MyApp.MyViewModel.g.cs", result), ("__KnownINotifyPropertyChangingArgs.g.cs", changingArgs), ("__KnownINotifyPropertyChangedArgs.g.cs", changedArgs));
+    }
+
+    [TestMethod]
+    public void RelayCommandMethodInTopLevelTypeWithNoNamespace_PreservesInheritdoc()
+    {
+        string source = """
+            using CommunityToolkit.Mvvm.Input;
+            
+            partial class MyViewModel
+            {
+                [RelayCommand]
+                private void Test()
+                {
+                }
+            }
+            """;
+
+        string result = """
+            // <auto-generated/>
+            #pragma warning disable
+            #nullable enable
+            /// <inheritdoc/>
+            partial class MyViewModel
+            {
+                /// <summary>The backing field for <see cref="TestCommand"/>.</summary>
+                [global::System.CodeDom.Compiler.GeneratedCode("CommunityToolkit.Mvvm.SourceGenerators.RelayCommandGenerator", "8.2.0.0")]
+                private global::CommunityToolkit.Mvvm.Input.RelayCommand? testCommand;
+                /// <summary>Gets an <see cref="global::CommunityToolkit.Mvvm.Input.IRelayCommand"/> instance wrapping <see cref="Test"/>.</summary>
+                [global::System.CodeDom.Compiler.GeneratedCode("CommunityToolkit.Mvvm.SourceGenerators.RelayCommandGenerator", "8.2.0.0")]
+                [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+                public global::CommunityToolkit.Mvvm.Input.IRelayCommand TestCommand => testCommand ??= new global::CommunityToolkit.Mvvm.Input.RelayCommand(new global::System.Action(Test));
+            }
+            """;
+
+        VerifyGenerateSources(source, new[] { new RelayCommandGenerator() }, ("MyViewModel.Test.g.cs", result));
+    }
+
     /// <summary>
     /// Generates the requested sources
     /// </summary>