diff --git a/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.dll b/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.dll
index ab018aaa..b3b70d67 100644
Binary files a/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.dll and b/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.dll differ
diff --git a/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.pdb b/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.pdb
index 42604588..52c6168c 100644
Binary files a/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.pdb and b/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.pdb differ
diff --git a/Assets/UIComponents/package.json b/Assets/UIComponents/package.json
index 6842f5d9..90d57c83 100644
--- a/Assets/UIComponents/package.json
+++ b/Assets/UIComponents/package.json
@@ -1,7 +1,7 @@
 {
     "name": "io.savolainen.uicomponents",
     "displayName": "UIComponents",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "description": "A small front-end framework for Unity's UIToolkit.",
     "unity": "2021.3",
     "author": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b891e6c..0e938860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 
 
+# [1.0.0-beta.5](https://github.com/jonisavo/uicomponents/compare/v1.0.0-beta.4...v1.0.0-beta.5) (2023-09-21)
+
+
+### Features
+
+* add abstract DependencyConsumer base class for DI consumers ([#108](https://github.com/jonisavo/uicomponents/issues/108)) ([424143b](https://github.com/jonisavo/uicomponents/commit/424143be87d25f4b70b90c37e5049da338f3a4a7))
+* drop requirement of Logger field from dependency injection codegen ([9489002](https://github.com/jonisavo/uicomponents/commit/94890023a4b1243b2f0ccd88010d09b16e426770))
+
+
+### Performance Improvements
+
+* **codegen:** do not iterate through Object class's members ([b562ca7](https://github.com/jonisavo/uicomponents/commit/b562ca713d18f9f48ce19f9bdd7a69b239008c93))
+
 # [1.0.0-beta.4](https://github.com/jonisavo/uicomponents/compare/v1.0.0-beta.3...v1.0.0-beta.4) (2023-07-08)
 
 
diff --git a/README.md b/README.md
index 77e7eee8..a18311d6 100644
--- a/README.md
+++ b/README.md
@@ -172,7 +172,7 @@ Alternatively, merge this snippet to your `Packages/manifest.json` file:
         }
     ],
     "dependencies": {
-        "io.savolainen.uicomponents": "1.0.0-beta.4"
+        "io.savolainen.uicomponents": "1.0.0-beta.5"
     }
 }
 ```
@@ -182,12 +182,12 @@ Alternatively, merge this snippet to your `Packages/manifest.json` file:
 Add this under `dependencies` in your `Packages/manifest.json` file:
 
 ```
-"io.savolainen.uicomponents": "https://github.com/jonisavo/uicomponents.git#upm/v1.0.0-beta.4"
+"io.savolainen.uicomponents": "https://github.com/jonisavo/uicomponents.git#upm/v1.0.0-beta.5"
 ```
 
-This will install version 1.0.0-beta.4.
+This will install version 1.0.0-beta.5.
 
-To update, change `upm/v1.0.0-beta.4` to point to the latest version.
+To update, change `upm/v1.0.0-beta.5` to point to the latest version.
 
 ### With .unitypackage
 
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Adds_Override_Keyword_When_Used_On_UIComponent.00ConsumerComponent.Dependencies.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Adds_Override_Keyword_When_Used_On_UIComponent.00ConsumerComponent.Dependencies.g.verified.cs
index 1d66f1ac..3b6db2ff 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Adds_Override_Keyword_When_Used_On_UIComponent.00ConsumerComponent.Dependencies.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Adds_Override_Keyword_When_Used_On_UIComponent.00ConsumerComponent.Dependencies.g.verified.cs
@@ -12,14 +12,14 @@
 
 public partial class ConsumerComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<UIComponents.IAssetResolver, UIComponents.ResourcesAssetResolver>(),
         UIComponents.DependencyInjection.Dependency.SingletonFor<UIComponents.ILogger, UIComponents.DebugLogger>(),
         UIComponents.DependencyInjection.Dependency.SingletonFor<IMyDependency, MyDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public override IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Adds_Override_Keyword_When_Used_On_UIComponent.01UIComponentWithNoOwnDependencies.Dependencies.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Adds_Override_Keyword_When_Used_On_UIComponent.01UIComponentWithNoOwnDependencies.Dependencies.g.verified.cs
index 7bd08487..1cc2ae35 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Adds_Override_Keyword_When_Used_On_UIComponent.01UIComponentWithNoOwnDependencies.Dependencies.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Adds_Override_Keyword_When_Used_On_UIComponent.01UIComponentWithNoOwnDependencies.Dependencies.g.verified.cs
@@ -12,13 +12,13 @@
 
 public partial class UIComponentWithNoOwnDependencies
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<UIComponents.IAssetResolver, UIComponents.ResourcesAssetResolver>(),
         UIComponents.DependencyInjection.Dependency.SingletonFor<UIComponents.ILogger, UIComponents.DebugLogger>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public override IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_For_Dependency_Inheritance.00ConsumerClass.Dependencies.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_For_Dependency_Inheritance.00ConsumerClass.Dependencies.g.verified.cs
index 96248ed4..a91b2011 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_For_Dependency_Inheritance.00ConsumerClass.Dependencies.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_For_Dependency_Inheritance.00ConsumerClass.Dependencies.g.verified.cs
@@ -12,13 +12,13 @@
 
 public partial class ConsumerClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<IMyDependency, MyDependency>(),
         UIComponents.DependencyInjection.Dependency.SingletonFor<ISecondDependency, SecondDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_For_Dependency_Inheritance.01SecondConsumerClass.Dependencies.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_For_Dependency_Inheritance.01SecondConsumerClass.Dependencies.g.verified.cs
index 1767c4c9..1cfd5f7c 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_For_Dependency_Inheritance.01SecondConsumerClass.Dependencies.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_For_Dependency_Inheritance.01SecondConsumerClass.Dependencies.g.verified.cs
@@ -12,14 +12,14 @@
 
 public partial class SecondConsumerClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<IMyDependency, MyDependency>(),
         UIComponents.DependencyInjection.Dependency.SingletonFor<ISecondDependency, SecondDependency>(),
         UIComponents.DependencyInjection.Dependency.SingletonFor<IThirdDependency, ThirdDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public override IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Assembly_Declarations_With_Class_Declarations.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Assembly_Declarations_With_Class_Declarations.verified.cs
index 82bc07ae..fbb329fc 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Assembly_Declarations_With_Class_Declarations.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Assembly_Declarations_With_Class_Declarations.verified.cs
@@ -12,12 +12,12 @@
 
 public partial class ConsumerClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<IMyDependency, ConsumerDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Inherited_Dependencies.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Inherited_Dependencies.verified.cs
index 7e1ca77a..52829da2 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Inherited_Dependencies.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Inherited_Dependencies.verified.cs
@@ -12,13 +12,13 @@
 
 public partial class SecondConsumerClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<IMyDependency, OverriddenMyDependency>(),
         UIComponents.DependencyInjection.Dependency.SingletonFor<ISecondDependency, OverriddenSecondDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public override IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Scope.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Scope.verified.cs
index f85d2ad6..686557a3 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Scope.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Allows_Overriding_Scope.verified.cs
@@ -12,12 +12,12 @@
 
 public partial class ConsumerClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.TransientFor<IMyDependency, MyDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Assembly_Declaration.00ConsumerClass.Dependencies.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Assembly_Declaration.00ConsumerClass.Dependencies.g.verified.cs
index 39e981d0..6e6669bc 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Assembly_Declaration.00ConsumerClass.Dependencies.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Assembly_Declaration.00ConsumerClass.Dependencies.g.verified.cs
@@ -12,13 +12,13 @@
 
 public partial class ConsumerClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<IMyDependency, MyDependency>(),
         UIComponents.DependencyInjection.Dependency.TransientFor<ISecondDependency, SecondDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Assembly_Declaration.01ConsumerStruct.Dependencies.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Assembly_Declaration.01ConsumerStruct.Dependencies.g.verified.cs
index becea471..c98d3d98 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Assembly_Declaration.01ConsumerStruct.Dependencies.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Assembly_Declaration.01ConsumerStruct.Dependencies.g.verified.cs
@@ -12,13 +12,13 @@
 
 public partial struct ConsumerStruct
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<IMyDependency, MyDependency>(),
         UIComponents.DependencyInjection.Dependency.TransientFor<ISecondDependency, SecondDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Type_Declaration.00ConsumerClass.Dependencies.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Type_Declaration.00ConsumerClass.Dependencies.g.verified.cs
index 39e981d0..6e6669bc 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Type_Declaration.00ConsumerClass.Dependencies.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Type_Declaration.00ConsumerClass.Dependencies.g.verified.cs
@@ -12,13 +12,13 @@
 
 public partial class ConsumerClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<IMyDependency, MyDependency>(),
         UIComponents.DependencyInjection.Dependency.TransientFor<ISecondDependency, SecondDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Type_Declaration.01ConsumerStruct.Dependencies.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Type_Declaration.01ConsumerStruct.Dependencies.g.verified.cs
index b1201da9..7440a453 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Type_Declaration.01ConsumerStruct.Dependencies.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Generates_Dependencies_From_Type_Declaration.01ConsumerStruct.Dependencies.g.verified.cs
@@ -12,13 +12,13 @@
 
 public partial struct ConsumerStruct
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<IMyDependency, MyDependency>(),
         UIComponents.DependencyInjection.Dependency.TransientFor<ISecondDependency, SecondDependency>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Handles_Multiple_Namespaces.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Handles_Multiple_Namespaces.verified.cs
index e8cfe9d8..1af247c1 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Handles_Multiple_Namespaces.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/DependencyAugmentGeneratorSnapshotTests.It_Handles_Multiple_Namespaces.verified.cs
@@ -15,14 +15,14 @@ namespace MyLibrary.GUI.Components
 {
 public partial class MyGUIComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static readonly IDependency[] UIC_Dependencies = new IDependency[] {
         UIComponents.DependencyInjection.Dependency.SingletonFor<UIComponents.IAssetResolver, UIComponents.ResourcesAssetResolver>(),
         UIComponents.DependencyInjection.Dependency.SingletonFor<UIComponents.ILogger, UIComponents.DebugLogger>(),
         UIComponents.DependencyInjection.Dependency.SingletonFor<IService, Service>()
     };
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public override IEnumerable<IDependency> GetDependencies()
     {
         return UIC_Dependencies;
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Allows_Overriding_Priority.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Allows_Overriding_Priority.verified.cs
index 259a84e2..95ae9f3a 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Allows_Overriding_Priority.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Allows_Overriding_Priority.verified.cs
@@ -11,10 +11,10 @@
 
 public partial class PriorityEffectComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static UIComponentEffectAttribute[] UIC_EffectAttributes;
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static void UIC_InitializeEffectAttributes()
     {
         UIC_EffectAttributes = new [] {
@@ -24,7 +24,7 @@ private static void UIC_InitializeEffectAttributes()
         Array.Sort(UIC_EffectAttributes);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_ApplyEffects()
     {
         if (UIC_EffectAttributes == null)
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Generates_Code_For_Applying_Effects.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Generates_Code_For_Applying_Effects.verified.cs
index 1a9973aa..6dfcf329 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Generates_Code_For_Applying_Effects.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Generates_Code_For_Applying_Effects.verified.cs
@@ -11,10 +11,10 @@
 
 public partial class BasicEffectComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static UIComponentEffectAttribute[] UIC_EffectAttributes;
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static void UIC_InitializeEffectAttributes()
     {
         UIC_EffectAttributes = new [] {
@@ -24,7 +24,7 @@ private static void UIC_InitializeEffectAttributes()
         Array.Sort(UIC_EffectAttributes);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_ApplyEffects()
     {
         if (UIC_EffectAttributes == null)
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.00BaseEffectComponent.Effects.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.00BaseEffectComponent.Effects.g.verified.cs
index 681b9480..55b7bca2 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.00BaseEffectComponent.Effects.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.00BaseEffectComponent.Effects.g.verified.cs
@@ -11,10 +11,10 @@
 
 public partial class BaseEffectComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static UIComponentEffectAttribute[] UIC_EffectAttributes;
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static void UIC_InitializeEffectAttributes()
     {
         UIC_EffectAttributes = new [] {
@@ -23,7 +23,7 @@ private static void UIC_InitializeEffectAttributes()
         Array.Sort(UIC_EffectAttributes);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_ApplyEffects()
     {
         if (UIC_EffectAttributes == null)
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.01SecondSubclassEffectComponent.Effects.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.01SecondSubclassEffectComponent.Effects.g.verified.cs
index e7129398..feea7781 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.01SecondSubclassEffectComponent.Effects.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.01SecondSubclassEffectComponent.Effects.g.verified.cs
@@ -11,10 +11,10 @@
 
 public partial class SecondSubclassEffectComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static UIComponentEffectAttribute[] UIC_EffectAttributes;
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static void UIC_InitializeEffectAttributes()
     {
         UIC_EffectAttributes = new [] {
@@ -25,7 +25,7 @@ private static void UIC_InitializeEffectAttributes()
         Array.Sort(UIC_EffectAttributes);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_ApplyEffects()
     {
         if (UIC_EffectAttributes == null)
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.02SubclassEffectComponent.Effects.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.02SubclassEffectComponent.Effects.g.verified.cs
index 9f430732..2cf338a5 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.02SubclassEffectComponent.Effects.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/EffectAugmentGeneratorSnapshotTests.It_Works_With_Subclasses.02SubclassEffectComponent.Effects.g.verified.cs
@@ -11,10 +11,10 @@
 
 public partial class SubclassEffectComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static UIComponentEffectAttribute[] UIC_EffectAttributes;
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private static void UIC_InitializeEffectAttributes()
     {
         UIC_EffectAttributes = new [] {
@@ -24,7 +24,7 @@ private static void UIC_InitializeEffectAttributes()
         Array.Sort(UIC_EffectAttributes);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_ApplyEffects()
     {
         if (UIC_EffectAttributes == null)
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Allows_Overriding_Base_Class_Attribute.00BaseLayoutComponent.Layout.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Allows_Overriding_Base_Class_Attribute.00BaseLayoutComponent.Layout.g.verified.cs
index beb5fab6..d84da5ae 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Allows_Overriding_Base_Class_Attribute.00BaseLayoutComponent.Layout.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Allows_Overriding_Base_Class_Attribute.00BaseLayoutComponent.Layout.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class BaseLayoutComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<VisualTreeAsset> UIC_StartLayoutLoad()
     {
         return AssetResolver.LoadAsset<VisualTreeAsset>("Components/BaseLayoutComponent");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Allows_Overriding_Base_Class_Attribute.01OverriddenLayoutComponent.Layout.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Allows_Overriding_Base_Class_Attribute.01OverriddenLayoutComponent.Layout.g.verified.cs
index 832d92f8..2546d44f 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Allows_Overriding_Base_Class_Attribute.01OverriddenLayoutComponent.Layout.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Allows_Overriding_Base_Class_Attribute.01OverriddenLayoutComponent.Layout.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class OverriddenLayoutComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<VisualTreeAsset> UIC_StartLayoutLoad()
     {
         return AssetResolver.LoadAsset<VisualTreeAsset>("Components/OverriddenLayoutComponent");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Generates_Layout_Call.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Generates_Layout_Call.verified.cs
index 6c3f7c3d..8a9c1f68 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Generates_Layout_Call.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Generates_Layout_Call.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class LayoutTestComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<VisualTreeAsset> UIC_StartLayoutLoad()
     {
         return AssetResolver.LoadAsset<VisualTreeAsset>("Components/LayoutTestComponent");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00ParentClass.FirstNestedComponent.Layout.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00ParentClass.FirstNestedComponent.Layout.g.verified.cs
index 70a97bb6..38e28dc2 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00ParentClass.FirstNestedComponent.Layout.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00ParentClass.FirstNestedComponent.Layout.g.verified.cs
@@ -13,7 +13,7 @@ public partial class ParentClass
 {
 public partial class FirstNestedComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<VisualTreeAsset> UIC_StartLayoutLoad()
     {
         return AssetResolver.LoadAsset<VisualTreeAsset>("Components/FirstNestedComponent");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01ParentClass.SecondNestedComponent.Layout.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01ParentClass.SecondNestedComponent.Layout.g.verified.cs
index 7efaaf17..3f0c3249 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01ParentClass.SecondNestedComponent.Layout.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01ParentClass.SecondNestedComponent.Layout.g.verified.cs
@@ -13,7 +13,7 @@ public partial class ParentClass
 {
 private partial class SecondNestedComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<VisualTreeAsset> UIC_StartLayoutLoad()
     {
         return AssetResolver.LoadAsset<VisualTreeAsset>("Components/SecondNestedComponent");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Takes_AssetPrefixAttribute_Into_Account.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Takes_AssetPrefixAttribute_Into_Account.verified.cs
index 535f224f..ba9cd0c1 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Takes_AssetPrefixAttribute_Into_Account.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Takes_AssetPrefixAttribute_Into_Account.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class LayoutTestComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<VisualTreeAsset> UIC_StartLayoutLoad()
     {
         return AssetResolver.LoadAsset<VisualTreeAsset>("UI/Components/LayoutTestComponent");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.00BaseLayoutComponent.Layout.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.00BaseLayoutComponent.Layout.g.verified.cs
index beb5fab6..d84da5ae 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.00BaseLayoutComponent.Layout.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.00BaseLayoutComponent.Layout.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class BaseLayoutComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<VisualTreeAsset> UIC_StartLayoutLoad()
     {
         return AssetResolver.LoadAsset<VisualTreeAsset>("Components/BaseLayoutComponent");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.01SuperclassLayoutComponent.Layout.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.01SuperclassLayoutComponent.Layout.g.verified.cs
index a5c876da..87db6a38 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.01SuperclassLayoutComponent.Layout.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.01SuperclassLayoutComponent.Layout.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class SuperclassLayoutComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<VisualTreeAsset> UIC_StartLayoutLoad()
     {
         return AssetResolver.LoadAsset<VisualTreeAsset>("Components/BaseLayoutComponent");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.02ThirdLayoutComponent.Layout.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.02ThirdLayoutComponent.Layout.g.verified.cs
index 9f5a20aa..f41cf303 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.02ThirdLayoutComponent.Layout.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/LayoutAugmentGeneratorSnapshotTests.It_Uses_Base_Class_Attribute.02ThirdLayoutComponent.Layout.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class ThirdLayoutComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<VisualTreeAsset> UIC_StartLayoutLoad()
     {
         return AssetResolver.LoadAsset<VisualTreeAsset>("Components/BaseLayoutComponent");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Can_Be_Used_On_Non_UIComponent_Class.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Can_Be_Used_On_Non_UIComponent_Class.verified.cs
index 46fc95c8..d10113a9 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Can_Be_Used_On_Non_UIComponent_Class.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Can_Be_Used_On_Non_UIComponent_Class.verified.cs
@@ -12,7 +12,7 @@
 
 public partial class MyClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fieldName) where TField : class where TCastFrom : class
     {
         try
@@ -29,7 +29,7 @@ private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fie
         }
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected void UIC_PopulateProvideFields()
     {
         UIC_SetProvideField<IDependency, IDependency>(ref Dependency, "Dependency");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Does_Not_Generate_For_Non_Interface_Or_Class_Fields.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Does_Not_Generate_For_Non_Interface_Or_Class_Fields.verified.cs
index ddf3bfd1..2919e847 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Does_Not_Generate_For_Non_Interface_Or_Class_Fields.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Does_Not_Generate_For_Non_Interface_Or_Class_Fields.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class InvalidProvideComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fieldName) where TField : class where TCastFrom : class
     {
         try
@@ -28,7 +28,7 @@ private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fie
         }
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateProvideFields()
     {
         UIC_SetProvideField<IDependency, IDependency>(ref Dependency, "Dependency");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Generates_Provide_Calls.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Generates_Provide_Calls.verified.cs
index d1661ebb..212dc277 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Generates_Provide_Calls.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Generates_Provide_Calls.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class BasicProvideComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fieldName) where TField : class where TCastFrom : class
     {
         try
@@ -28,7 +28,7 @@ private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fie
         }
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateProvideFields()
     {
         UIC_SetProvideField<IDependency, IDependency>(ref Dependency, "Dependency");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs
index 687159ad..b4fada08 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs
@@ -14,7 +14,7 @@ namespace MyLibrary.GUI
 {
 public partial class GuiComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fieldName) where TField : class where TCastFrom : class
     {
         try
@@ -31,7 +31,7 @@ private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fie
         }
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateProvideFields()
     {
         UIC_SetProvideField<IService, IService>(ref service, "service");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Namespaces_And_Nested_Types.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Namespaces_And_Nested_Types.verified.cs
index 995789e8..6d196f5b 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Namespaces_And_Nested_Types.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Namespaces_And_Nested_Types.verified.cs
@@ -15,7 +15,7 @@ public partial class ParentClass
 {
 private partial class NestedProvideComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fieldName) where TField : class where TCastFrom : class
     {
         try
@@ -32,7 +32,7 @@ private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fie
         }
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateProvideFields()
     {
         UIC_SetProvideField<Dependencies.IDependency, Dependencies.IDependency>(ref Dependency, "Dependency");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.00BaseProvideComponent.Provide.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.00BaseProvideComponent.Provide.g.verified.cs
index 5697fd09..5a18bfdd 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.00BaseProvideComponent.Provide.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.00BaseProvideComponent.Provide.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class BaseProvideComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fieldName) where TField : class where TCastFrom : class
     {
         try
@@ -28,7 +28,7 @@ private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fie
         }
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateProvideFields()
     {
         UIC_SetProvideField<IDependency, IDependency>(ref Dependency, "Dependency");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.01SecondSubclassProvideComponent.Provide.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.01SecondSubclassProvideComponent.Provide.g.verified.cs
index 2303aea5..c2985781 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.01SecondSubclassProvideComponent.Provide.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.01SecondSubclassProvideComponent.Provide.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class SecondSubclassProvideComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fieldName) where TField : class where TCastFrom : class
     {
         try
@@ -28,7 +28,7 @@ private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fie
         }
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateProvideFields()
     {
         UIC_SetProvideField<AnotherDependency, IAnotherDependency>(ref ThirdDependency, "ThirdDependency");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.02SubclassProvideComponent.Provide.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.02SubclassProvideComponent.Provide.g.verified.cs
index 91be4c6b..02851a2d 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.02SubclassProvideComponent.Provide.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/ProvideAugmentGeneratorSnapshotTests.It_Handles_Subclasses.02SubclassProvideComponent.Provide.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class SubclassProvideComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fieldName) where TField : class where TCastFrom : class
     {
         try
@@ -28,7 +28,7 @@ private void UIC_SetProvideField<TField, TCastFrom>(ref TField value, string fie
         }
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateProvideFields()
     {
         UIC_SetProvideField<IAnotherDependency, IAnotherDependency>(ref AnotherDependency, "AnotherDependency");
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.Does_Not_Generate_If_Used_On_Class_Or_Method.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.Does_Not_Generate_If_Used_On_Class_Or_Method.verified.cs
index ecae1dd6..74c5c0d1 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.Does_Not_Generate_If_Used_On_Class_Or_Method.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.Does_Not_Generate_If_Used_On_Class_Or_Method.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class InvalidUsageQueryComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // element
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Generates_Basic_Queries.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Generates_Basic_Queries.verified.cs
index 2a83d460..b39b86f0 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Generates_Basic_Queries.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Generates_Basic_Queries.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class BasicQueryComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // element
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Arrays.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Arrays.verified.cs
index 4cbd0eeb..d5b4b8d4 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Arrays.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Arrays.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class ArrayQueryComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // elements
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs
index 6d50863c..52ca7ebf 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs
@@ -14,7 +14,7 @@ namespace MyLibrary.GUI
 {
 public partial class MyComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // element
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Lists.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Lists.verified.cs
index 8b8da103..8e37aebc 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Lists.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Lists.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class ListQueryComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // elements
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Multiple_Query_Attributes.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Multiple_Query_Attributes.verified.cs
index 36661642..65d60036 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Multiple_Query_Attributes.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Multiple_Query_Attributes.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class MultipleQueryComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // firstElement
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Namespace_And_Nested_Type.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Namespace_And_Nested_Type.verified.cs
index d312c35f..2ca49f6f 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Namespace_And_Nested_Type.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Namespace_And_Nested_Type.verified.cs
@@ -15,7 +15,7 @@ public partial class ParentClass
 {
 public partial class NestedComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // field
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00Parent.PTwo.PThree.PFour.FirstNestedComponent.Query.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00Parent.PTwo.PThree.PFour.FirstNestedComponent.Query.g.verified.cs
index 9bc4c071..c3edad14 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00Parent.PTwo.PThree.PFour.FirstNestedComponent.Query.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00Parent.PTwo.PThree.PFour.FirstNestedComponent.Query.g.verified.cs
@@ -19,7 +19,7 @@ internal partial class PFour
 {
 public partial class FirstNestedComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // field
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01Parent.PTwo.PThree.PFour.SecondNestedComponent.Query.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01Parent.PTwo.PThree.PFour.SecondNestedComponent.Query.g.verified.cs
index 14c5d33d..c19ad2f4 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01Parent.PTwo.PThree.PFour.SecondNestedComponent.Query.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01Parent.PTwo.PThree.PFour.SecondNestedComponent.Query.g.verified.cs
@@ -19,7 +19,7 @@ internal partial class PFour
 {
 private partial class SecondNestedComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // component
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Null_Arguments.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Null_Arguments.verified.cs
index a481ef9d..858dd8f8 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Null_Arguments.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Null_Arguments.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class NullQueryComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // elements
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.00BaseQueryComponent.Query.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.00BaseQueryComponent.Query.g.verified.cs
index c02664c1..e9a05343 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.00BaseQueryComponent.Query.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.00BaseQueryComponent.Query.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class BaseQueryComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // baseElement
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.01SecondSubclassQueryComponent.Query.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.01SecondSubclassQueryComponent.Query.g.verified.cs
index 7a122c5e..0d99991a 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.01SecondSubclassQueryComponent.Query.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.01SecondSubclassQueryComponent.Query.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class SecondSubclassQueryComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // subclassQueryComponent
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.02SubclassQueryComponent.Query.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.02SubclassQueryComponent.Query.g.verified.cs
index b9e1fe81..41ea9718 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.02SubclassQueryComponent.Query.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Subclasses.02SubclassQueryComponent.Query.g.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class SubclassQueryComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // subclassElements
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Using_Declaration_With_Alias.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Using_Declaration_With_Alias.verified.cs
index 2c71ebf2..917eb588 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Using_Declaration_With_Alias.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/QueryAugmentGeneratorSnapshotTests.It_Handles_Using_Declaration_With_Alias.verified.cs
@@ -11,7 +11,7 @@
 
 public partial class UsingAliasComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_PopulateQueryFields()
     {
         // firstButton
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Allows_Specifying_Method_Name.00CallbackHandler.RegistersEventCallbackAttribute.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Allows_Specifying_Method_Name.00CallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
index c662a327..55648f1e 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Allows_Specifying_Method_Name.00CallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Allows_Specifying_Method_Name.00CallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
@@ -10,13 +10,13 @@
 
 public partial class CallbackHandler
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<MyEvent>(MyEventHappened);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<MyEvent>(MyEventHappened);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Allows_Specifying_Method_Name.01OtherCallbackHandler.RegistersEventCallbackAttribute.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Allows_Specifying_Method_Name.01OtherCallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
index eef094b3..1f573411 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Allows_Specifying_Method_Name.01OtherCallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Allows_Specifying_Method_Name.01OtherCallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
@@ -10,14 +10,14 @@
 
 public partial class OtherCallbackHandler
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<MyEvent>(MyEventHappened);
         RegisterCallback<MyOtherEvent>(Callback);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<MyEvent>(MyEventHappened);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Does_Not_Generate_For_Abstract_Class.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Does_Not_Generate_For_Abstract_Class.verified.cs
index a7d234fb..a929217d 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Does_Not_Generate_For_Abstract_Class.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Does_Not_Generate_For_Abstract_Class.verified.cs
@@ -10,14 +10,14 @@
 
 public partial class CallbackHandler
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<MyEvent>(OnMyEvent);
         RegisterCallback<MyOtherEvent>(OnMyOtherEvent);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<MyEvent>(OnMyEvent);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Generates_Functions_For_Callbacks.00CallbackHandler.RegistersEventCallbackAttribute.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Generates_Functions_For_Callbacks.00CallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
index aa8a127b..a3aff0c0 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Generates_Functions_For_Callbacks.00CallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Generates_Functions_For_Callbacks.00CallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
@@ -10,13 +10,13 @@
 
 public partial class CallbackHandler
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<MyEvent>(OnMyEvent);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<MyEvent>(OnMyEvent);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Generates_Functions_For_Callbacks.01OtherCallbackHandler.RegistersEventCallbackAttribute.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Generates_Functions_For_Callbacks.01OtherCallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
index 7d8e95be..5d758688 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Generates_Functions_For_Callbacks.01OtherCallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Generates_Functions_For_Callbacks.01OtherCallbackHandler.RegistersEventCallbackAttribute.g.verified.cs
@@ -10,14 +10,14 @@
 
 public partial class OtherCallbackHandler
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<MyEvent>(OnMyEvent);
         RegisterCallback<MyOtherEvent>(OnMyOtherEvent);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<MyEvent>(OnMyEvent);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs
index 97d26229..09a178dc 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Common_Namespaces.verified.cs
@@ -13,13 +13,13 @@ namespace MyLibrary.Components
 {
 public partial class MyComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<Events.MyEvent>(OnEvent);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<Events.MyEvent>(OnEvent);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Interface_Inheritance.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Interface_Inheritance.verified.cs
index f7e43de7..743e0e4b 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Interface_Inheritance.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Interface_Inheritance.verified.cs
@@ -10,14 +10,14 @@
 
 public partial class EventHandler
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<MyEvent>(OnMyEvent);
         RegisterCallback<OtherEvent>(OnOtherEvent);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<MyEvent>(OnMyEvent);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types.verified.cs
index 6ba81e49..7c220156 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types.verified.cs
@@ -12,13 +12,13 @@ public partial class BaseClass
 {
 private partial class ClickHandler
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<OnClickEvent>(OnClick);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<OnClickEvent>(OnClick);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types_And_Namespace.00Tests.OnCallbackComponent.RegistersEventCallbackAttribute.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types_And_Namespace.00Tests.OnCallbackComponent.RegistersEventCallbackAttribute.g.verified.cs
index 30e096ef..bed7075d 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types_And_Namespace.00Tests.OnCallbackComponent.RegistersEventCallbackAttribute.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types_And_Namespace.00Tests.OnCallbackComponent.RegistersEventCallbackAttribute.g.verified.cs
@@ -14,13 +14,13 @@ public partial class Tests
 {
 private partial class OnCallbackComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<CallbackEvent>(OnCallback);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<CallbackEvent>(OnCallback);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types_And_Namespace.01Tests.OnEventComponent.RegistersEventCallbackAttribute.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types_And_Namespace.01Tests.OnEventComponent.RegistersEventCallbackAttribute.g.verified.cs
index f448dbb2..38658ab1 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types_And_Namespace.01Tests.OnEventComponent.RegistersEventCallbackAttribute.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/RegistersEventCallbackGeneratorSnapshotTests.It_Handles_Nested_Types_And_Namespace.01Tests.OnEventComponent.RegistersEventCallbackAttribute.g.verified.cs
@@ -14,13 +14,13 @@ public partial class Tests
 {
 private partial class OnEventComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_RegisterEventCallbacks()
     {
         RegisterCallback<Event>(OnEvent);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override void UIC_UnregisterEventCallbacks()
     {
         UnregisterCallback<Event>(OnEvent);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Generates_Stylesheet_Call.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Generates_Stylesheet_Call.verified.cs
index 2e0bb529..a7f7ff8f 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Generates_Stylesheet_Call.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Generates_Stylesheet_Call.verified.cs
@@ -11,14 +11,14 @@
 
 public partial class StylesheetTestComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private async Task<StyleSheetLoadTuple> UIC_GetSingleStyleSheet(string assetPath)
     {
         var styleSheet = await AssetResolver.LoadAsset<StyleSheet>(assetPath);
         return new StyleSheetLoadTuple(assetPath, styleSheet);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<StyleSheetLoadTuple>[] UIC_StartStyleSheetLoad()
     {
         var assetPaths = new string[] { "Components/StylesheetTestComponentStyle" };
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00ParentClass.FirstNestedComponent.Stylesheet.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00ParentClass.FirstNestedComponent.Stylesheet.g.verified.cs
index 0c289e94..19650a51 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00ParentClass.FirstNestedComponent.Stylesheet.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.00ParentClass.FirstNestedComponent.Stylesheet.g.verified.cs
@@ -13,14 +13,14 @@ public partial class ParentClass
 {
 public partial class FirstNestedComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private async Task<StyleSheetLoadTuple> UIC_GetSingleStyleSheet(string assetPath)
     {
         var styleSheet = await AssetResolver.LoadAsset<StyleSheet>(assetPath);
         return new StyleSheetLoadTuple(assetPath, styleSheet);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<StyleSheetLoadTuple>[] UIC_StartStyleSheetLoad()
     {
         var assetPaths = new string[] { "Components/FirstNestedStyle" };
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01ParentClass.SecondNestedComponent.Stylesheet.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01ParentClass.SecondNestedComponent.Stylesheet.g.verified.cs
index 3551ea45..878a9ce2 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01ParentClass.SecondNestedComponent.Stylesheet.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Handles_Nested_Types.01ParentClass.SecondNestedComponent.Stylesheet.g.verified.cs
@@ -13,14 +13,14 @@ public partial class ParentClass
 {
 private partial class SecondNestedComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private async Task<StyleSheetLoadTuple> UIC_GetSingleStyleSheet(string assetPath)
     {
         var styleSheet = await AssetResolver.LoadAsset<StyleSheet>(assetPath);
         return new StyleSheetLoadTuple(assetPath, styleSheet);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<StyleSheetLoadTuple>[] UIC_StartStyleSheetLoad()
     {
         var assetPaths = new string[] { "Components/SecondNestedStyle" };
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Inherits_Base_Class_Stylesheets.00ConcreteStylesheetComponent.Stylesheet.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Inherits_Base_Class_Stylesheets.00ConcreteStylesheetComponent.Stylesheet.g.verified.cs
index d0c7dc7a..36e2a8a2 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Inherits_Base_Class_Stylesheets.00ConcreteStylesheetComponent.Stylesheet.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Inherits_Base_Class_Stylesheets.00ConcreteStylesheetComponent.Stylesheet.g.verified.cs
@@ -11,14 +11,14 @@
 
 public partial class ConcreteStylesheetComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private async Task<StyleSheetLoadTuple> UIC_GetSingleStyleSheet(string assetPath)
     {
         var styleSheet = await AssetResolver.LoadAsset<StyleSheet>(assetPath);
         return new StyleSheetLoadTuple(assetPath, styleSheet);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<StyleSheetLoadTuple>[] UIC_StartStyleSheetLoad()
     {
         var assetPaths = new string[] { "Components/BaseStylesheet", "Components/StylesheetOne", "Components/StylesheetTwo" };
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Inherits_Base_Class_Stylesheets.01ThirdStylesheetComponent.Stylesheet.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Inherits_Base_Class_Stylesheets.01ThirdStylesheetComponent.Stylesheet.g.verified.cs
index d2d9ad87..aaddd4e2 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Inherits_Base_Class_Stylesheets.01ThirdStylesheetComponent.Stylesheet.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Inherits_Base_Class_Stylesheets.01ThirdStylesheetComponent.Stylesheet.g.verified.cs
@@ -11,14 +11,14 @@
 
 public partial class ThirdStylesheetComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private async Task<StyleSheetLoadTuple> UIC_GetSingleStyleSheet(string assetPath)
     {
         var styleSheet = await AssetResolver.LoadAsset<StyleSheet>(assetPath);
         return new StyleSheetLoadTuple(assetPath, styleSheet);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<StyleSheetLoadTuple>[] UIC_StartStyleSheetLoad()
     {
         var assetPaths = new string[] { "Components/BaseStylesheet", "Components/StylesheetOne", "Components/StylesheetTwo", "Components/StylesheetThree" };
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Takes_AssetPrefixAttribute_Into_Account.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Takes_AssetPrefixAttribute_Into_Account.verified.cs
index b15c7eb8..9df5d1d9 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Takes_AssetPrefixAttribute_Into_Account.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/StylesheetAugmentGeneratorSnapshotTests.It_Takes_AssetPrefixAttribute_Into_Account.verified.cs
@@ -11,14 +11,14 @@
 
 public partial class StylesheetTestComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     private async Task<StyleSheetLoadTuple> UIC_GetSingleStyleSheet(string assetPath)
     {
         var styleSheet = await AssetResolver.LoadAsset<StyleSheet>(assetPath);
         return new StyleSheetLoadTuple(assetPath, styleSheet);
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     protected override Task<StyleSheetLoadTuple>[] UIC_StartStyleSheetLoad()
     {
         var assetPaths = new string[] { "UI/Components/StylesheetTestComponentStyle" };
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Allows_Setting_Default_Value.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Allows_Setting_Default_Value.verified.cs
index 4f1ea894..88e7b9fb 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Allows_Setting_Default_Value.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Allows_Setting_Default_Value.verified.cs
@@ -10,17 +10,17 @@
 
 public partial class ComponentWithDefaultValueTraits
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<ComponentWithDefaultValueTraits, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlStringAttributeDescription m_Description = new UxmlStringAttributeDescription { name = "description" };
         UxmlIntAttributeDescription m_Lives = new UxmlIntAttributeDescription { name = "lives" };
         UxmlEnumAttributeDescription<Some.Place.Where.Enum.Is.TheEnum> m_MyValue = new UxmlEnumAttributeDescription<Some.Place.Where.Enum.Is.TheEnum> { name = "custom-value" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Allows_Specifying_Uxml_Name.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Allows_Specifying_Uxml_Name.verified.cs
index 2e9fc8af..d7e11abf 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Allows_Specifying_Uxml_Name.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Allows_Specifying_Uxml_Name.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class CustomNamespaceComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<CustomNamespaceComponent, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlIntAttributeDescription m_FieldTrait = new UxmlIntAttributeDescription { name = "custom-trait-name" };
         UxmlFloatAttributeDescription m_PropertyTrait = new UxmlFloatAttributeDescription { name = "my-property" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Bool_Traits.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Bool_Traits.verified.cs
index 6434e3e0..bfbc1353 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Bool_Traits.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Bool_Traits.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class BoolComponentWithUsing
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<BoolComponentWithUsing, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlBoolAttributeDescription m_FieldTrait = new UxmlBoolAttributeDescription { name = "field-trait" };
         UxmlBoolAttributeDescription m_PropertyTrait = new UxmlBoolAttributeDescription { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Both_Traits_And_UxmlFactory.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Both_Traits_And_UxmlFactory.verified.cs
index f202a8ae..e155227d 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Both_Traits_And_UxmlFactory.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Both_Traits_And_UxmlFactory.verified.cs
@@ -10,28 +10,28 @@
 
 public partial class ComponentWithUxmlNameAndTraits
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<ComponentWithUxmlNameAndTraits, UxmlTraits>
     {
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override string uxmlName
         {
             get { return "AwesomeUxmlName"; }
         }
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override string uxmlQualifiedName
         {
             get { return uxmlNamespace + "." + uxmlName; }
         }
     }
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlBoolAttributeDescription m_Value = new UxmlBoolAttributeDescription { name = "value" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Color_Traits.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Color_Traits.verified.cs
index 8da1cd33..09100189 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Color_Traits.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Color_Traits.verified.cs
@@ -11,16 +11,16 @@
 
 public partial class ColorComponentWithUsing
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<ColorComponentWithUsing, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlColorAttributeDescription m_FieldTrait = new UxmlColorAttributeDescription { name = "field-trait" };
         UxmlColorAttributeDescription m_PropertyTrait = new UxmlColorAttributeDescription { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Double_Traits.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Double_Traits.verified.cs
index 633480ae..8f25bee6 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Double_Traits.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Double_Traits.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class DoubleComponentWithUsing
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<DoubleComponentWithUsing, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlDoubleAttributeDescription m_FieldTrait = new UxmlDoubleAttributeDescription { name = "field-trait" };
         UxmlDoubleAttributeDescription m_PropertyTrait = new UxmlDoubleAttributeDescription { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Enum_Trait_With_Internal_Enum.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Enum_Trait_With_Internal_Enum.verified.cs
index dddcb6a0..a5b1665e 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Enum_Trait_With_Internal_Enum.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Enum_Trait_With_Internal_Enum.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class OwnEnumComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<OwnEnumComponent, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlEnumAttributeDescription<OwnEnumComponent.OwnEnum> m_FieldTrait = new UxmlEnumAttributeDescription<OwnEnumComponent.OwnEnum> { name = "field-trait" };
         UxmlEnumAttributeDescription<OwnEnumComponent.OwnEnum> m_PropertyTrait = new UxmlEnumAttributeDescription<OwnEnumComponent.OwnEnum> { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Enum_Traits.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Enum_Traits.verified.cs
index 6d6abaf0..8fc467b1 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Enum_Traits.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Enum_Traits.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class MyEnumComponentWithUsing
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<MyEnumComponentWithUsing, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlEnumAttributeDescription<MyEnum> m_FieldTrait = new UxmlEnumAttributeDescription<MyEnum> { name = "field-trait" };
         UxmlEnumAttributeDescription<MyEnum> m_PropertyTrait = new UxmlEnumAttributeDescription<MyEnum> { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Float_Traits.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Float_Traits.verified.cs
index 5f1a9758..fdb524c3 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Float_Traits.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Float_Traits.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class FloatComponentWithUsing
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<FloatComponentWithUsing, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlFloatAttributeDescription m_FieldTrait = new UxmlFloatAttributeDescription { name = "field-trait" };
         UxmlFloatAttributeDescription m_PropertyTrait = new UxmlFloatAttributeDescription { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_In_Namespace.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_In_Namespace.verified.cs
index f390c690..ce0ae8e0 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_In_Namespace.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_In_Namespace.verified.cs
@@ -12,16 +12,16 @@ namespace Custom.Components
 {
 public partial class CustomNamespaceComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<CustomNamespaceComponent, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlEnumAttributeDescription<Custom.Components.CustomNamespaceComponent.OwnEnum> m_FieldTrait = new UxmlEnumAttributeDescription<Custom.Components.CustomNamespaceComponent.OwnEnum> { name = "field-trait" };
         UxmlEnumAttributeDescription<Custom.Components.CustomNamespaceComponent.OwnEnum> m_PropertyTrait = new UxmlEnumAttributeDescription<Custom.Components.CustomNamespaceComponent.OwnEnum> { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Int_Traits.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Int_Traits.verified.cs
index 8e52d64f..8c118676 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Int_Traits.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Int_Traits.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class IntComponentWithUsing
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<IntComponentWithUsing, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlIntAttributeDescription m_FieldTrait = new UxmlIntAttributeDescription { name = "field-trait" };
         UxmlIntAttributeDescription m_PropertyTrait = new UxmlIntAttributeDescription { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Long_Traits.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Long_Traits.verified.cs
index 446d029b..3e10428e 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Long_Traits.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Long_Traits.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class LongComponentWithUsing
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<LongComponentWithUsing, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlLongAttributeDescription m_FieldTrait = new UxmlLongAttributeDescription { name = "field-trait" };
         UxmlLongAttributeDescription m_PropertyTrait = new UxmlLongAttributeDescription { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_String_Traits.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_String_Traits.verified.cs
index 1ce53a80..3bbc58a1 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_String_Traits.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_String_Traits.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class StringComponentWithUsing
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<StringComponentWithUsing, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlStringAttributeDescription m_FieldTrait = new UxmlStringAttributeDescription { name = "field-trait" };
         UxmlStringAttributeDescription m_PropertyTrait = new UxmlStringAttributeDescription { name = "property-trait" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.00FirstTraitClass.Uxml.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.00FirstTraitClass.Uxml.g.verified.cs
index 3d1cc7c3..f21e0a66 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.00FirstTraitClass.Uxml.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.00FirstTraitClass.Uxml.g.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class FirstTraitClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<FirstTraitClass, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlIntAttributeDescription m_FieldTrait = new UxmlIntAttributeDescription { name = "custom-trait-name" };
         UxmlFloatAttributeDescription m_PropertyTrait = new UxmlFloatAttributeDescription { name = "my-property" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.01SecondTraitClass.Uxml.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.01SecondTraitClass.Uxml.g.verified.cs
index 4fc6af99..8f913643 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.01SecondTraitClass.Uxml.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.01SecondTraitClass.Uxml.g.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class SecondTraitClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<SecondTraitClass, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlBoolAttributeDescription m_Enabled = new UxmlBoolAttributeDescription { name = "enabled" };
         UxmlLongAttributeDescription m_SomeValue = new UxmlLongAttributeDescription { name = "secret" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.02ThirdTraitClass.Uxml.g.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.02ThirdTraitClass.Uxml.g.verified.cs
index 36a85db8..47bf8a52 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.02ThirdTraitClass.Uxml.g.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_Traits_For_Many_Classes.02ThirdTraitClass.Uxml.g.verified.cs
@@ -10,15 +10,15 @@
 
 public partial class ThirdTraitClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<ThirdTraitClass, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlStringAttributeDescription m_Name = new UxmlStringAttributeDescription { name = "name" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_UxmlFactory_With_UxmlName.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_UxmlFactory_With_UxmlName.verified.cs
index 31dd1893..de456efb 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_UxmlFactory_With_UxmlName.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Generates_UxmlFactory_With_UxmlName.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class MyUxmlNameAttributeComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<MyUxmlNameAttributeComponent>
     {
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override string uxmlName
         {
             get { return "MyUxmlNameAttribute"; }
         }
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override string uxmlQualifiedName
         {
             get { return uxmlNamespace + "." + uxmlName; }
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Handles_Long_Member_Name_For_Trait.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Handles_Long_Member_Name_For_Trait.verified.cs
index 25466ca4..9f24f71f 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Handles_Long_Member_Name_For_Trait.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Handles_Long_Member_Name_For_Trait.verified.cs
@@ -10,15 +10,15 @@
 
 public partial class LongTraitNameComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<LongTraitNameComponent, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlIntAttributeDescription m_HereIsALongMemberNameWithALotOfComplexity123Test_Hello___WorldA = new UxmlIntAttributeDescription { name = "here-is-a-long-member-name-with-a-lot-of-complexity123-test-hello-world-a" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Handles_Subclass.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Handles_Subclass.verified.cs
index 7b40b44f..5c36dd1e 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Handles_Subclass.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Handles_Subclass.verified.cs
@@ -10,15 +10,15 @@
 
 public partial class MyComponentWithTraits
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<MyComponentWithTraits, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlDoubleAttributeDescription m_Trait = new UxmlDoubleAttributeDescription { name = "double-value" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.It_Uses_Initializer_As_Default_Trait_Value.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.It_Uses_Initializer_As_Default_Trait_Value.verified.cs
index 0a52f2e8..a2d67af8 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.It_Uses_Initializer_As_Default_Trait_Value.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.It_Uses_Initializer_As_Default_Trait_Value.verified.cs
@@ -11,17 +11,17 @@
 
 public partial class Test
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<Test, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlIntAttributeDescription m_Number = new UxmlIntAttributeDescription { name = "number" };
         UxmlColorAttributeDescription m_color = new UxmlColorAttributeDescription { name = "color" };
         UxmlStringAttributeDescription m_MyMessage = new UxmlStringAttributeDescription { name = "my-message" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Removes_Leading_And_Trailing_Underscores.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Removes_Leading_And_Trailing_Underscores.verified.cs
index 6875c952..d0cd77a3 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Removes_Leading_And_Trailing_Underscores.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Removes_Leading_And_Trailing_Underscores.verified.cs
@@ -10,17 +10,17 @@
 
 public partial class LongTraitNameComponent
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<LongTraitNameComponent, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlIntAttributeDescription m__member = new UxmlIntAttributeDescription { name = "member" };
         UxmlIntAttributeDescription m_memberTwo_ = new UxmlIntAttributeDescription { name = "member-two" };
         UxmlIntAttributeDescription m__member_three_ = new UxmlIntAttributeDescription { name = "member-three" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Works_On_Non_UIComponent_Type.verified.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Works_On_Non_UIComponent_Type.verified.cs
index ce4f52a8..924c6f0c 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Works_On_Non_UIComponent_Type.verified.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Snapshots/UxmlAugmentGeneratorSnapshotTests.Works_On_Non_UIComponent_Type.verified.cs
@@ -10,16 +10,16 @@
 
 public partial class NonUIComponentClass
 {
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlFactory : UxmlFactory<NonUIComponentClass, UxmlTraits> {}
 
-    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+    [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
     public new partial class UxmlTraits : VisualElement.UxmlTraits
     {
         UxmlIntAttributeDescription m_FieldTrait = new UxmlIntAttributeDescription { name = "custom-trait-name" };
         UxmlFloatAttributeDescription m_PropertyTrait = new UxmlFloatAttributeDescription { name = "my-property" };
 
-        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.4")]
+        [GeneratedCode("UIComponents.Roslyn.Generation", "1.0.0-beta.5")]
         public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
         {
             base.Init(ve, bag, cc);
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation/Constants.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation/Constants.cs
index 1180cf60..938b3b05 100644
--- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation/Constants.cs
+++ b/UIComponents.Roslyn/UIComponents.Roslyn.Generation/Constants.cs
@@ -3,7 +3,7 @@
     internal static class Constants
     {
         public const string ToolName = "UIComponents.Roslyn.Generation";
-        public const string Version = "1.0.0-beta.4";
+        public const string Version = "1.0.0-beta.5";
         public const string GeneratedCodeAttribute = "[GeneratedCode(\"" + ToolName + "\", \"" + Version + "\")]";
     }
 }