From e1ba54a206d9d50395670f65816fd6459a47c2b6 Mon Sep 17 00:00:00 2001 From: Joni Savolainen Date: Fri, 21 Oct 2022 20:09:23 +0300 Subject: [PATCH] feat(UxmlTraitAttribute): move from UIComponents.Experimental namespace to UIComponents BREAKING CHANGE: UxmlTraitAttribute has been moved from the UIComponents.Experimental namespace to UIComponents. --- .../Roslyn/NestedRoslynTestComponent.cs | 4 +--- .../Roslyn/RoslynTestComponent.cs | 3 +-- .../Roslyn/RoslynTestVisualElement.cs | 3 +-- Assets/UIComponents/Core/Experimental.meta | 3 --- .../{Experimental => }/UxmlTraitAttribute.cs | 2 +- .../UxmlTraitAttribute.cs.meta | 0 .../Roslyn/UIComponents.Roslyn.Generation.dll | Bin 43008 -> 43008 bytes .../Roslyn/UIComponents.Roslyn.Generation.pdb | Bin 21932 -> 21932 bytes .../Resources/UxmlTraitAttribute.cs | 2 +- .../Utilities/TraitTestFixture.cs | 1 - .../UxmlAugmentGeneratorSnapshotTests.cs | 12 ++---------- .../Generators/Uxml/UxmlAugmentGenerator.cs | 2 +- 12 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 Assets/UIComponents/Core/Experimental.meta rename Assets/UIComponents/Core/{Experimental => }/UxmlTraitAttribute.cs (98%) rename Assets/UIComponents/Core/{Experimental => }/UxmlTraitAttribute.cs.meta (100%) diff --git a/Assets/UIComponents.Tests/Roslyn/NestedRoslynTestComponent.cs b/Assets/UIComponents.Tests/Roslyn/NestedRoslynTestComponent.cs index 8bebb7ed..e2f179a1 100644 --- 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 index 89eb6afb..e83bdef8 100644 --- 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 index 1fe44bb2..f2031307 100644 --- 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 deleted file mode 100644 index 76acf723..00000000 --- a/Assets/UIComponents/Core/Experimental.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 309601ad136b4268aa6b4add84172cc5 -timeCreated: 1664686564 \ No newline at end of file diff --git a/Assets/UIComponents/Core/Experimental/UxmlTraitAttribute.cs b/Assets/UIComponents/Core/UxmlTraitAttribute.cs similarity index 98% rename from Assets/UIComponents/Core/Experimental/UxmlTraitAttribute.cs rename to Assets/UIComponents/Core/UxmlTraitAttribute.cs index 25c4f761..2e447f57 100644 --- a/Assets/UIComponents/Core/Experimental/UxmlTraitAttribute.cs +++ b/Assets/UIComponents/Core/UxmlTraitAttribute.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using UnityEngine.TestTools; -namespace UIComponents.Experimental +namespace UIComponents { /// /// When used in Unity 2021.2 or later, this attribute will generate diff --git a/Assets/UIComponents/Core/Experimental/UxmlTraitAttribute.cs.meta b/Assets/UIComponents/Core/UxmlTraitAttribute.cs.meta similarity index 100% rename from Assets/UIComponents/Core/Experimental/UxmlTraitAttribute.cs.meta rename to Assets/UIComponents/Core/UxmlTraitAttribute.cs.meta diff --git a/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.dll b/Assets/UIComponents/Roslyn/UIComponents.Roslyn.Generation.dll index 4652f4873605d6f1a07118049910ce93a0e7fe8b..ab6b61892b1487483876e7c49eb984406992d245 100644 GIT binary patch delta 855 zcmZuvZAep57(VaarnS}3ncLL6+rIAIb(^sg(IPS{lOg6PHHILOSp878u9Cux?303) zjTa&cQU@u0L2+e%gi&Nge?ls>FQW*lAP`y*7(r)ivxqKSc+PX)=Q+=N-qSP1^h_~l zPb&8kvfc0vGQpj7rTW4X-y zQdwhss(>PVTi{t$sV2d|7DCk06BR{;2{b`DWvGAnLUM#&dt z2+~hG`dyuQEKi87eh2AqCM1hcTvhL-?}*%#Kf9)@pd44X<;&mNeFZu~mU)QpywkfC zJ6iikx?&IIx?V9Wcjk5T0|GTZhN_0>KTKcnFh=?es>VBnG~$guTh?gpmvBqiQ**g# z;FYm_ZxO!hyRarjE}u)0)TnYi&XR`cf!wvlx4ElSp8h5i*c`FwAtvANuLj%*Mp+wO QP%tkx$k~JQ5bV*mgE delta 887 zcmZuvZAep57(VaWrZqpBA35i?o143LS2s&Bu|kc$7$MQ{D@KH*mqIPtF6@KDbXoCp^nxtB2CIoP{zd&}GbQh)CqFS6wPcM0tI`#O4^Bq20?c?CQK2s zR8kFFC_MSBR=SQJLkZO2OM@w~E}pmtctfNhpCY{o(Y1d}4DhMaYg{&(Ab>iql*VnqMotSNp5t=h4L;zqU=C-wTKI~N zO+!$GkZu!0eTBMlB}VL~sBJFlDPRXjHGN`@#VDj4EKhgElqQ8sq~qvMx9|Ahr3^=E znpzlDph~fUkSL|JD>)*cl_uRn&NK&pq~;D7!A^4?jLHwqN}yDWBN@~2MXO#EQnD6( zmQ354(L!xRN%_}ftnEL-Ult1#V>+J?tysyoLnj9KR_H;e&;yhBS>Q5ajl@k)?_w=_ zb_Xxm%MrK8GIi*U1!mEQqE&$Vc+mQTarTIru#Ao3wxk*Jzm?0fU+kudaXfLKsbpeQ z$!A9il9or8?UZgSPe?{Z8S&Q;q9H7IRP1N}h>Xc!Z0{W4!raC*?LN{<+@zLBq@Fag z`2=YpM@fSmXfD%h8s0Wkz3Pf}+#MXPuK!T+Q7-HjHMvuTw|xW-I4RTeu^4Cndc2P% z;Q?$;Vqs;`{DcKw>C4b8)om}YJaV<9CbO0wwk`p@vrSH42fb<}>;M1& diff --git a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Resources/UxmlTraitAttribute.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/Resources/UxmlTraitAttribute.cs index 12715353..db5f62b1 100644 --- 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 index 3f4bb7d9..c3101562 100644 --- 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/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/UxmlAugmentGeneratorSnapshotTests.cs b/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/UxmlAugmentGeneratorSnapshotTests.cs index 8ebbc942..8996bb49 100644 --- a/UIComponents.Roslyn/UIComponents.Roslyn.Generation.Tests/UxmlAugmentGeneratorSnapshotTests.cs +++ b/UIComponents.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 index 15806a92..e40a4a25 100644 --- 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