feat(UxmlTraitAttribute): move from UIComponents.Experimental namespa…

…ce to UIComponents BREAKING CHANGE: UxmlTraitAttribute has been moved from the UIComponents.Experimental namespace to UIComponents.
jonisavo · Oct 21, 2022 · e1ba54a · e1ba54a
1 parent 7bfb5e0
commit e1ba54a
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 24 deletions.
diff --git a/Assets/UIComponents.Tests/Roslyn/NestedRoslynTestComponent.cs b/Assets/UIComponents.Tests/Roslyn/NestedRoslynTestComponent.cs
@@ -1,6 +1,4 @@
-using UIComponents.Experimental;
-
-namespace UIComponents.Tests.Roslyn
+namespace UIComponents.Tests.Roslyn
 {
     public partial class NestParentClass
     {

diff --git a/Assets/UIComponents.Tests/Roslyn/RoslynTestComponent.cs b/Assets/UIComponents.Tests/Roslyn/RoslynTestComponent.cs
@@ -1,5 +1,4 @@
-using UIComponents.Experimental;
-using UnityEngine;
+using UnityEngine;
 
 namespace UIComponents.Tests.Roslyn
 {

diff --git a/Assets/UIComponents.Tests/Roslyn/RoslynTestVisualElement.cs b/Assets/UIComponents.Tests/Roslyn/RoslynTestVisualElement.cs
@@ -1,5 +1,4 @@
-using UIComponents.Experimental;
-using UnityEngine.UIElements;
+using UnityEngine.UIElements;
 
 namespace UIComponents.Tests.Roslyn
 {

diff --git a/Assets/UIComponents/Core/Experimental.meta b/Assets/UIComponents/Core/Experimental.meta
diff --git a/...s/Core/Experimental/UxmlTraitAttribute.cs → ...s/UIComponents/Core/UxmlTraitAttribute.cs b/...s/Core/Experimental/UxmlTraitAttribute.cs → ...s/UIComponents/Core/UxmlTraitAttribute.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using UnityEngine.TestTools;
 
-namespace UIComponents.Experimental
+namespace UIComponents
 {
     /// <summary>
     /// When used in Unity 2021.2 or later, this attribute will generate

diff --git a/...e/Experimental/UxmlTraitAttribute.cs.meta → ...omponents/Core/UxmlTraitAttribute.cs.meta b/...e/Experimental/UxmlTraitAttribute.cs.meta → ...omponents/Core/UxmlTraitAttribute.cs.meta
diff --git a/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.dll b/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.dll
diff --git a/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.pdb b/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.pdb
diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Resources/UxmlTraitAttribute.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Resources/UxmlTraitAttribute.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace UIComponents.Experimental
+namespace UIComponents
 {
     [ExcludeFromCodeCoverage]
     [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)]

diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Utilities/TraitTestFixture.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Utilities/TraitTestFixture.cs
@@ -10,7 +10,6 @@ public Task Verify_Traits(string fieldTypeName, bool useUnityEngine = false)
 
             var source = $@"
 using UIComponents;
-using UIComponents.Experimental;
 
 public partial class {fieldTypeNameCap}ComponentWithUsing : UIComponent
 {{

diff --git a/...mponents.Roslyn/UIComponents.Roslyn.Generation.Tests/UxmlAugmentGeneratorSnapshotTests.cs b/...mponents.Roslyn/UIComponents.Roslyn.Generation.Tests/UxmlAugmentGeneratorSnapshotTests.cs
@@ -71,7 +71,7 @@ public Task Generates_Enum_Traits()
         public Task Does_Not_Generate_If_TraitAttribute_Type_IsMissing()
         {
             var source = @"
-using UIComponents.Experimental;
+using UIComponents;
 
 public class Test
 {
@@ -86,7 +86,7 @@ public class Test
         public Task Works_On_Non_UIComponent_Type()
         {
             var source = @"
-using UIComponents.Experimental;
+using UIComponents;
 
 public partial class NonUIComponentClass
 {
@@ -108,7 +108,6 @@ public Task Generates_Enum_Trait_With_Internal_Enum()
         {
             var source = @"
 using UIComponents;
-using UIComponents.Experimental;
 
 public partial class OwnEnumComponent : UIComponent
 {
@@ -136,7 +135,6 @@ public Task Generates_In_Namespace()
         {
             var source = @"
 using UIComponents;
-using UIComponents.Experimental;
 
 namespace Custom
 {
@@ -170,7 +168,6 @@ public Task Allows_Specifying_Uxml_Name()
         {
             var source = @"
 using UIComponents;
-using UIComponents.Experimental;
 
 public partial class CustomNamespaceComponent : UIComponent
 {
@@ -192,7 +189,6 @@ public Task Handles_Subclass()
         {
             var source = @"
 using UIComponents;
-using UIComponents.Experimental;
 
 public class MyComponent : UIComponent {}
 
@@ -210,7 +206,6 @@ public Task Allows_Setting_Default_Value()
         {
             var source = @"
 using UIComponents;
-using UIComponents.Experimental;
 
 namespace Some.Place.Where.Enum.Is
 {
@@ -241,7 +236,6 @@ public Task Generates_Traits_For_Many_Classes()
         {
             var source = @"
 using UIComponents;
-using UIComponents.Experimental;
 
 public partial class FirstTraitClass
 {
@@ -290,7 +284,6 @@ public Task Generates_Both_Traits_And_UxmlFactory()
         {
             var source = @"
 using UIComponents;
-using UIComponents.Experimental;
 
 [UxmlName(""AwesomeUxmlName"")]
 public partial class ComponentWithUxmlNameAndTraits : UIComponent
@@ -307,7 +300,6 @@ public Task Handles_Long_Member_Name_For_Trait()
         {
             var source = @"
 using UIComponents;
-using UIComponents.Experimental;
 
 public partial class LongTraitNameComponent : UIComponent
 {

diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation/Generators/Uxml/UxmlAugmentGenerator.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation/Generators/Uxml/UxmlAugmentGenerator.cs
@@ -25,7 +25,7 @@ internal class UxmlAugmentGenerator : AugmentGenerator<ClassMemberSyntaxReceiver
         protected override void OnBeforeExecute(GeneratorExecutionContext context)
         {
             _traitAttributeSymbol =
-                context.Compilation.GetTypeByMetadataName("UIComponents.Experimental.UxmlTraitAttribute");
+                context.Compilation.GetTypeByMetadataName("UIComponents.UxmlTraitAttribute");
             _uxmlNameAttributeSymbol =
                 context.Compilation.GetTypeByMetadataName("UIComponents.UxmlNameAttribute");
         }