unic · asiaboron · Nov 29, 2022 · May 22, 2023 · May 22, 2023 · May 22, 2023
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,4 +1,10 @@
 mode: ContinuousDeployment
 branches:  
    master:  
-      regex: ^master$|^main$
+      regex: ^master$|^main$
+   sc10xm:
+      regex: ^feature/sitecore-10-xm$
+      mode: ContinuousDelivery
+      increment: Major
+      tag: "sc10xm"
+      source-branches: []
diff --git a/README.md b/README.md
@@ -11,6 +11,12 @@ Sitecore Authors and Marketers to create amazing web form experiences.
 
 ## Changelog
 
+### 6.0
+
+* Upgrade Sitecore from 9.3 to 10.3
+* Remove XP-only features to gain XM compatibility
+* Improve *.config files for easier updates in non-Bob folder structure
+
 ### 5.0
 
 * Migration to GitHub public repository, AppVeyor and NuGet.org

diff --git a/...d/Flex Load Rules/Load Field Value From Contact__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml b/...d/Flex Load Rules/Load Field Value From Contact__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml
diff --git a/...ation/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact_.yml b/...ation/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact_.yml
diff --git a/...d/Flex Load Rules/Load Field Value from Contact__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml b/...d/Flex Load Rules/Load Field Value from Contact__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml
diff --git a/...ation/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Simple C.yml b/...ation/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Simple C.yml
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Identify Contact.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Identify Contact.yml
diff --git a/...ation/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Email Address fro.yml b/...ation/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Email Address fro.yml
diff --git a/...ation/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Field from Field_.yml b/...ation/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Field from Field_.yml
diff --git a/...ation/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Language from Cur.yml b/...ation/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Language from Cur.yml
diff --git a/...ation/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Simple Contact Field from.yml b/...ation/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Simple Contact Field from.yml
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml
@@ -12,7 +12,6 @@ SharedFields:
     {DF5C2C2F-4A48-4206-9DFB-0DCDE27E2233}
     {A63884CE-54F1-4134-8A29-05017D5317F6}
     {77613F9B-AC9A-4229-B97A-ACD6FBFCB252}
-    {9A7F5FA1-E267-4BF2-8D3C-4D487792B636}
     {03B67200-F3F4-49C9-ADC5-31512371825D}
     {F8239638-A672-491F-BBD4-A59CD3090C8B}
 Languages:

diff --git a/...alization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml b/...alization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml
@@ -8,9 +8,7 @@ SharedFields:
 - ID: "1172f251-dad4-4efb-a329-0c63500e4f1e"
   Hint: __Masters
   Type: TreelistEx
-  Value: |
-    {9A7F5FA1-E267-4BF2-8D3C-4D487792B636}
-    {DF5C2C2F-4A48-4206-9DFB-0DCDE27E2233}
+  Value: "{DF5C2C2F-4A48-4206-9DFB-0DCDE27E2233}"
 Languages:
 - Language: en
   Versions:

diff --git a/...ization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration.yml b/...ization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration.yml
diff --git a/...on/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal.yml b/...on/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal.yml
diff --git a/...lization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values.yml b/...lization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values.yml