From fcc87ad5d7ffa16ab140a0b47b50918c0738bcdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Engel?= Date: Sat, 11 Feb 2017 22:09:05 +0100 Subject: [PATCH 1/4] Restructured Unicorn serialized content to follow Sitecore Helix structure --- Conjunction.sln | 16 ++-- .../Conjunction/Example Search Query Root.yml | 17 ---- .../Search Query Rule.yml | 14 --- .../Include/Demo/Demo.Serialization.config | 17 ++++ .../Demo.Content}/Conjunction.yml | 4 +- .../Demo.Content/Conjunction/DemoPage.yml | 35 ++++++++ .../Conjunction/SearchQueries.yml | 18 ++++ .../SearchQueries/Search Query Root.yml | 14 +++ .../SearchQueries/Search Query Root/A.yml | 14 +++ .../SearchQueries/Search Query Root/A/C.yml | 14 +++ .../SearchQueries/Search Query Root/A/D.yml | 14 +++ .../SearchQueries/Search Query Root/B.yml | 14 +++ .../SearchQueries/Search Query Root/B/E.yml | 14 +++ .../SearchQueries/Search Query Root/B/E/H.yml | 14 +++ .../SearchQueries/Search Query Root/B/F.yml | 14 +++ .../SearchQueries/Search Query Root/B/F/I.yml | 14 +++ .../SearchQueries/Search Query Root/B/F/J.yml | 14 +++ .../SearchQueries/Search Query Root/B/G.yml | 14 +++ .../SearchQueries/SearchQueryRoot.yml | 20 +++++ .../WhereCreatedDateIsGreaterThanO.yml | 23 +++++ .../SearchQueryRoot/WhereItemIdEquals.yml | 23 +++++ .../SearchQueryRoot/WhereNameEquals.yml | 23 +++++ .../Demo.Layouts/ConjunctionDemo.yml | 14 +++ .../ConjunctionDemo/ViewLayout1.yml | 22 +++++ .../Demo.Renderings/ConjunctionDemo.yml | 14 +++ .../DemoControllerRendering.yml | 21 +++++ .../Demo.Templates/ConjunctionDemo.yml | 22 +++++ .../Demo.Templates/ConjunctionDemo/Page.yml | 8 +- .../ConjunctionDemo/Page/Page.yml | 32 +++++++ ...n.Configs.Conjunction.DeveloperOnly.config | 86 ------------------- ...nfigs.Conjunction.Foundation - Copy.config | 86 ------------------- .../Conjunction.Foundation.Content/Web.config | 18 ---- ...ction.Foundation.Core.Serialization.config | 15 ++++ .../Code/Conjunction.Foundation.Core.csproj | 12 +-- src/Foundation/Core/Code/Web.Debug.config | 30 ------- src/Foundation/Core/Code/Web.Release.config | 31 ------- src/Foundation/Core/Code/Web.config | 29 ------- .../Conjunction.yml | 18 ++++ .../Conjunction/Settings.yml | 18 ++++ .../Settings/ComparisonOperators.yml | 18 ++++ .../Settings/ComparisonOperators/Between.yml | 21 +++++ .../Settings/ComparisonOperators/Contains.yml | 17 ++++ .../Settings/ComparisonOperators/Equal.yml | 17 ++++ .../GreaterThanOrEqual.yml | 21 +++++ .../ComparisonOperators/LessThanOrEqual.yml | 21 +++++ .../Conjunction/Settings/LogicalOperators.yml | 18 ++++ .../Settings/LogicalOperators/And.yml | 17 ++++ .../Settings/LogicalOperators/Or.yml | 17 ++++ .../Foundation.yml | 0 .../Foundation/ComparisonOperator.yml | 0 .../ComparisonOperator/__Standard Values.yml | 0 .../Foundation/ComparisonOperatorFolder.yml | 0 .../__Standard Values.yml | 0 .../Foundation/LogicalOperator.yml | 0 .../LogicalOperator/__Standard Values.yml | 0 .../Foundation/LogicalOperatorFolder.yml | 0 .../__Standard Values.yml | 0 .../Foundation/SearchQueryGrouping.yml | 0 .../SearchQueryGrouping/__Standard Values.yml | 0 .../Foundation/SearchQueryRoot.yml | 0 .../SearchQueryRoot/__Standard Values.yml | 0 .../Foundation/SearchQueryRule.yml | 0 .../SearchQueryRule/__Standard Values.yml | 0 .../Foundation/_ComparisonOperator.yml | 0 .../ComparisonOperator.yml | 0 .../ComparisonOperatorType.yml | 0 .../_IndexableEntityConfigurator.yml | 0 .../IndexableEntityConfigurator.yml | 0 .../IndexableEntityConfiguratorCon.yml | 0 .../Foundation/_LogicalOperator.yml | 0 .../_LogicalOperator/LogicalOperator.yml | 0 .../LogicalOperator/LogicalOperatorType.yml | 0 .../Foundation/_SearchQueryGrouping.yml | 0 .../SearchQueryGrouping.yml | 0 .../SearchQueryGroupingLogicalOper.yml | 0 .../Foundation/_SearchQueryRule.yml | 0 .../_SearchQueryRule/SearchQueryRule.yml | 0 .../SearchQueryRuleAssociatedPrope.yml | 0 .../SearchQueryRuleComparisonOpera.yml | 0 .../SearchQueryRuleDefaultValue.yml | 0 .../SearchQueryRuleDynamicValuePro.yml | 0 ...n.Serialization.DevSettings.config.example | 14 +++ .../Code}/App_Config/Include/Rainbow.config | 0 .../Unicorn/Unicorn.AutoPublish.config | 0 .../Unicorn/Unicorn.Configs.Default.example | 0 .../Unicorn.Configs.Dependency.config.example | 0 .../Unicorn.Configs.NewItemsOnly.example | 0 ...n.CustomSerializationFolder.config.example | 0 .../Unicorn/Unicorn.DataProvider.config | 0 .../Unicorn/Unicorn.Deployed.config.disabled | 0 .../Unicorn/Unicorn.Remote.config.disabled | 0 .../Include/Unicorn/Unicorn.UI.config | 0 .../App_Config/Include/Unicorn/Unicorn.config | 0 .../Unicorn.zSharedSecret.config.example | 0 ...njunction.Foundation.Serialization.csproj} | 37 +++++--- .../Code}/Properties/AssemblyInfo.cs | 8 +- .../Code}/packages.config | 2 + 97 files changed, 719 insertions(+), 349 deletions(-) delete mode 100644 serialization/Conjunction Developer Content/Content/Conjunction/Example Search Query Root.yml delete mode 100644 serialization/Conjunction Developer Content/Content/Conjunction/Example Search Query Root/Search Query Rule.yml create mode 100644 src/Demo/App_Config/Include/Demo/Demo.Serialization.config rename {serialization/Conjunction Developer Content/Content => src/Demo/Serialization/Demo.Content}/Conjunction.yml (84%) create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/DemoPage.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/C.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/D.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/E.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/E/H.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F/I.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F/J.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/G.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereCreatedDateIsGreaterThanO.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereItemIdEquals.yml create mode 100644 src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereNameEquals.yml create mode 100644 src/Demo/Serialization/Demo.Layouts/ConjunctionDemo.yml create mode 100644 src/Demo/Serialization/Demo.Layouts/ConjunctionDemo/ViewLayout1.yml create mode 100644 src/Demo/Serialization/Demo.Renderings/ConjunctionDemo.yml create mode 100644 src/Demo/Serialization/Demo.Renderings/ConjunctionDemo/DemoControllerRendering.yml create mode 100644 src/Demo/Serialization/Demo.Templates/ConjunctionDemo.yml rename serialization/Conjunction Foundation Content/Templates/Conjunction.yml => src/Demo/Serialization/Demo.Templates/ConjunctionDemo/Page.yml (65%) create mode 100644 src/Demo/Serialization/Demo.Templates/ConjunctionDemo/Page/Page.yml delete mode 100644 src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/z_Conjunction/Unicorn.Configs.Conjunction.DeveloperOnly.config delete mode 100644 src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/z_Conjunction/Unicorn.Configs.Conjunction.Foundation - Copy.config delete mode 100644 src/Foundation/Content/Conjunction.Foundation.Content/Web.config create mode 100644 src/Foundation/Core/Code/App_Config/Include/Conjunction/Conjunction.Foundation.Core.Serialization.config delete mode 100644 src/Foundation/Core/Code/Web.Debug.config delete mode 100644 src/Foundation/Core/Code/Web.Release.config delete mode 100644 src/Foundation/Core/Code/Web.config create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Between.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Contains.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Equal.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/GreaterThanOrEqual.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/LessThanOrEqual.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators/And.yml create mode 100644 src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators/Or.yml rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/ComparisonOperator.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/ComparisonOperator/__Standard Values.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/ComparisonOperatorFolder.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/ComparisonOperatorFolder/__Standard Values.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/LogicalOperator.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/LogicalOperator/__Standard Values.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/LogicalOperatorFolder.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/LogicalOperatorFolder/__Standard Values.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/SearchQueryGrouping.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/SearchQueryGrouping/__Standard Values.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/SearchQueryRoot.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/SearchQueryRoot/__Standard Values.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/SearchQueryRule.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/SearchQueryRule/__Standard Values.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_ComparisonOperator.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_ComparisonOperator/ComparisonOperator.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_ComparisonOperator/ComparisonOperator/ComparisonOperatorType.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_IndexableEntityConfigurator.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator/IndexableEntityConfiguratorCon.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_LogicalOperator.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_LogicalOperator/LogicalOperator.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_LogicalOperator/LogicalOperator/LogicalOperatorType.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_SearchQueryGrouping.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_SearchQueryGrouping/SearchQueryGrouping.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_SearchQueryGrouping/SearchQueryGrouping/SearchQueryGroupingLogicalOper.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_SearchQueryRule.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_SearchQueryRule/SearchQueryRule.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleAssociatedPrope.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleComparisonOpera.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDefaultValue.yml (100%) rename {serialization/Conjunction Foundation Content/Templates/Conjunction => src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates}/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDynamicValuePro.yml (100%) create mode 100644 src/Foundation/Serialization/Code/App_Config/Include/Conjunction/Conjunction.Foundation.Serialization.DevSettings.config.example rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Rainbow.config (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.AutoPublish.config (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.Configs.Default.example (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.Configs.Dependency.config.example (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.Configs.NewItemsOnly.example (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.CustomSerializationFolder.config.example (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.DataProvider.config (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.Deployed.config.disabled (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.UI.config (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.config (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/App_Config/Include/Unicorn/Unicorn.zSharedSecret.config.example (100%) rename src/Foundation/{Content/Conjunction.Foundation.Content/Conjunction.Foundation.Content.csproj => Serialization/Code/Conjunction.Foundation.Serialization.csproj} (69%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/Properties/AssemblyInfo.cs (83%) rename src/Foundation/{Content/Conjunction.Foundation.Content => Serialization/Code}/packages.config (74%) diff --git a/Conjunction.sln b/Conjunction.sln index ead6dcc..b166216 100644 --- a/Conjunction.sln +++ b/Conjunction.sln @@ -19,9 +19,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conjunction.Foundation.Mvc. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo", "src\Demo\Demo.csproj", "{D2BACCE4-7DC9-4E1F-AC2D-4DDA5FB66D35}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Content", "Content", "{EE02835B-50B3-475D-BBE0-41A8F6C1942C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serialization", "Serialization", "{1B3BC778-B42F-4C5C-B244-04801A2C3696}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conjunction.Foundation.Content", "src\Foundation\Content\Conjunction.Foundation.Content\Conjunction.Foundation.Content.csproj", "{28CFED63-5FE0-44A2-9CF0-86249F0FDC26}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conjunction.Foundation.Serialization", "src\Foundation\Serialization\Code\Conjunction.Foundation.Serialization.csproj", "{6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -49,10 +49,10 @@ Global {D2BACCE4-7DC9-4E1F-AC2D-4DDA5FB66D35}.Debug|Any CPU.Build.0 = Debug|Any CPU {D2BACCE4-7DC9-4E1F-AC2D-4DDA5FB66D35}.Release|Any CPU.ActiveCfg = Release|Any CPU {D2BACCE4-7DC9-4E1F-AC2D-4DDA5FB66D35}.Release|Any CPU.Build.0 = Release|Any CPU - {28CFED63-5FE0-44A2-9CF0-86249F0FDC26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28CFED63-5FE0-44A2-9CF0-86249F0FDC26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28CFED63-5FE0-44A2-9CF0-86249F0FDC26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28CFED63-5FE0-44A2-9CF0-86249F0FDC26}.Release|Any CPU.Build.0 = Release|Any CPU + {6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -64,7 +64,7 @@ Global {27BEE52F-5DE6-4887-8456-E42A2DD42F0F} = {0891AA95-9CC7-4C2D-9922-E4D4E9A04DB1} {03A41346-15BE-4D75-B908-D3F690B79290} = {9EECA02F-1826-4567-8890-797C67BB2AAC} {E949F23D-566B-4549-80E4-6AB17F7F95C0} = {9EECA02F-1826-4567-8890-797C67BB2AAC} - {EE02835B-50B3-475D-BBE0-41A8F6C1942C} = {9F411CBB-A4C4-4A63-BB74-687CAB369285} - {28CFED63-5FE0-44A2-9CF0-86249F0FDC26} = {EE02835B-50B3-475D-BBE0-41A8F6C1942C} + {1B3BC778-B42F-4C5C-B244-04801A2C3696} = {9F411CBB-A4C4-4A63-BB74-687CAB369285} + {6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A} = {1B3BC778-B42F-4C5C-B244-04801A2C3696} EndGlobalSection EndGlobal diff --git a/serialization/Conjunction Developer Content/Content/Conjunction/Example Search Query Root.yml b/serialization/Conjunction Developer Content/Content/Conjunction/Example Search Query Root.yml deleted file mode 100644 index df1a957..0000000 --- a/serialization/Conjunction Developer Content/Content/Conjunction/Example Search Query Root.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -ID: "f64f305b-dfed-4f66-bbcb-d30dc8097e49" -Parent: "0ceae273-d787-44f9-8211-b10f12b4f499" -Template: "818a0ca7-1388-48bc-9e07-851314c288cb" -Path: /sitecore/content/Home/Conjunction/Example Search Query Root -DB: master -Languages: -- Language: en - Versions: - - Version: 1 - Fields: - - ID: "25bed78c-4957-4165-998a-ca1b52f67497" - Hint: __Created - Value: 20170201T211407Z - - ID: "f024eaf0-f10d-4ac9-a7da-a280b0ae1af9" - Hint: SearchQueryGroupingLogicalOperator - Value: And diff --git a/serialization/Conjunction Developer Content/Content/Conjunction/Example Search Query Root/Search Query Rule.yml b/serialization/Conjunction Developer Content/Content/Conjunction/Example Search Query Root/Search Query Rule.yml deleted file mode 100644 index 7444891..0000000 --- a/serialization/Conjunction Developer Content/Content/Conjunction/Example Search Query Root/Search Query Rule.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -ID: "938dd76f-2063-4c46-aa93-8edff1b49e1f" -Parent: "f64f305b-dfed-4f66-bbcb-d30dc8097e49" -Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" -Path: /sitecore/content/Home/Conjunction/Example Search Query Root/Search Query Rule -DB: master -Languages: -- Language: en - Versions: - - Version: 1 - Fields: - - ID: "25bed78c-4957-4165-998a-ca1b52f67497" - Hint: __Created - Value: 20170201T211509Z diff --git a/src/Demo/App_Config/Include/Demo/Demo.Serialization.config b/src/Demo/App_Config/Include/Demo/Demo.Serialization.config new file mode 100644 index 0000000..f5aa5fa --- /dev/null +++ b/src/Demo/App_Config/Include/Demo/Demo.Serialization.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/serialization/Conjunction Developer Content/Content/Conjunction.yml b/src/Demo/Serialization/Demo.Content/Conjunction.yml similarity index 84% rename from serialization/Conjunction Developer Content/Content/Conjunction.yml rename to src/Demo/Serialization/Demo.Content/Conjunction.yml index b06504b..46c3fe0 100644 --- a/serialization/Conjunction Developer Content/Content/Conjunction.yml +++ b/src/Demo/Serialization/Demo.Content/Conjunction.yml @@ -1,5 +1,5 @@ --- -ID: "0ceae273-d787-44f9-8211-b10f12b4f499" +ID: "6ceba9b3-868e-4689-bb4f-31dd39021081" Parent: "110d559f-dea5-42ea-9c1c-8a5df7e70ef9" Template: "a87a00b1-e6db-45ab-8b54-636fec3b5523" Path: /sitecore/content/Home/Conjunction @@ -11,7 +11,7 @@ Languages: Fields: - ID: "25bed78c-4957-4165-998a-ca1b52f67497" Hint: __Created - Value: 20170208T194114Z + Value: 20170211T210000Z - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f" Hint: __Created by Value: | diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/DemoPage.yml b/src/Demo/Serialization/Demo.Content/Conjunction/DemoPage.yml new file mode 100644 index 0000000..4c246ea --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/DemoPage.yml @@ -0,0 +1,35 @@ +--- +ID: "d08feb05-afdf-4f48-ba94-a6337da982b6" +Parent: "6ceba9b3-868e-4689-bb4f-31dd39021081" +Template: "0642ef2f-a8c0-42d6-ac35-6ce9f11cc99a" +Path: /sitecore/content/Home/Conjunction/DemoPage +DB: master +SharedFields: +- ID: "f1a1fe9e-a60c-4ddb-a3a0-bb5b29fe732e" + Hint: __Renderings + Type: layout + Value: | + + + + + +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161108T124931Z + - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f" + Hint: __Created by + Value: | + sitecore\admin diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries.yml new file mode 100644 index 0000000..356ab3c --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries.yml @@ -0,0 +1,18 @@ +--- +ID: "ae864216-b2a5-4414-9dd7-74ba19058c2d" +Parent: "6ceba9b3-868e-4689-bb4f-31dd39021081" +Template: "a87a00b1-e6db-45ab-8b54-636fec3b5523" +Path: /sitecore/content/Home/Conjunction/SearchQueries +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161116T203925Z + - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f" + Hint: __Created by + Value: | + sitecore\admin diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root.yml new file mode 100644 index 0000000..d09bd33 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root.yml @@ -0,0 +1,14 @@ +--- +ID: "79135a99-3deb-4c86-a262-bdc0a8ea63b6" +Parent: "ae864216-b2a5-4414-9dd7-74ba19058c2d" +Template: "818a0ca7-1388-48bc-9e07-851314c288cb" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T193901Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A.yml new file mode 100644 index 0000000..2550a51 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A.yml @@ -0,0 +1,14 @@ +--- +ID: "bd17817e-9c59-4f8c-a08d-a6883c73f53b" +Parent: "79135a99-3deb-4c86-a262-bdc0a8ea63b6" +Template: "159d9956-aadc-4b31-9f70-39bf74e14bf1" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/A +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T193919Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/C.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/C.yml new file mode 100644 index 0000000..0e401c3 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/C.yml @@ -0,0 +1,14 @@ +--- +ID: "261aaee6-4e13-4210-be39-fefa3a204aa6" +Parent: "bd17817e-9c59-4f8c-a08d-a6883c73f53b" +Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/A/C +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T194000Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/D.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/D.yml new file mode 100644 index 0000000..e230871 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/D.yml @@ -0,0 +1,14 @@ +--- +ID: "f9f97ce3-12c4-4a47-b974-707c1f3b4b4a" +Parent: "bd17817e-9c59-4f8c-a08d-a6883c73f53b" +Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/A/D +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T194005Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B.yml new file mode 100644 index 0000000..95de451 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B.yml @@ -0,0 +1,14 @@ +--- +ID: "738aca6b-5a6e-4100-aaf5-b188ef0a5c49" +Parent: "79135a99-3deb-4c86-a262-bdc0a8ea63b6" +Template: "159d9956-aadc-4b31-9f70-39bf74e14bf1" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/B +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T193924Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/E.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/E.yml new file mode 100644 index 0000000..dfa08f2 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/E.yml @@ -0,0 +1,14 @@ +--- +ID: "545ad188-3b8d-4bec-8b90-63803f73cd72" +Parent: "738aca6b-5a6e-4100-aaf5-b188ef0a5c49" +Template: "159d9956-aadc-4b31-9f70-39bf74e14bf1" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/B/E +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T193940Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/E/H.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/E/H.yml new file mode 100644 index 0000000..c5df731 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/E/H.yml @@ -0,0 +1,14 @@ +--- +ID: "7dc073d9-b3f0-4763-aef0-d1e6e9474228" +Parent: "545ad188-3b8d-4bec-8b90-63803f73cd72" +Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/B/E/H +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T194010Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F.yml new file mode 100644 index 0000000..ad573c7 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F.yml @@ -0,0 +1,14 @@ +--- +ID: "b4052615-ef37-4c81-8801-c79b077f0bf8" +Parent: "738aca6b-5a6e-4100-aaf5-b188ef0a5c49" +Template: "159d9956-aadc-4b31-9f70-39bf74e14bf1" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/B/F +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T193945Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F/I.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F/I.yml new file mode 100644 index 0000000..a043ebb --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F/I.yml @@ -0,0 +1,14 @@ +--- +ID: "26f03c5f-1ec4-4783-993e-7dfc9fb328db" +Parent: "b4052615-ef37-4c81-8801-c79b077f0bf8" +Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/B/F/I +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T194018Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F/J.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F/J.yml new file mode 100644 index 0000000..b0e520a --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/F/J.yml @@ -0,0 +1,14 @@ +--- +ID: "b4f47164-745f-409d-92a1-533f2cfb17dd" +Parent: "b4052615-ef37-4c81-8801-c79b077f0bf8" +Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/B/F/J +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T201528Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/G.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/G.yml new file mode 100644 index 0000000..5107390 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/G.yml @@ -0,0 +1,14 @@ +--- +ID: "36622c67-d2f2-4fa8-8fc5-903be3ded178" +Parent: "738aca6b-5a6e-4100-aaf5-b188ef0a5c49" +Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" +Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/B/G +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20170103T194023Z diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot.yml new file mode 100644 index 0000000..7f7fa28 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot.yml @@ -0,0 +1,20 @@ +--- +ID: "d6a82e1f-6687-495e-8243-d865b1bf28ba" +Parent: "ae864216-b2a5-4414-9dd7-74ba19058c2d" +Template: "818a0ca7-1388-48bc-9e07-851314c288cb" +Path: /sitecore/content/Home/Conjunction/SearchQueries/SearchQueryRoot +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161116T203936Z + - ID: "bee28558-0a5d-4ee1-b54f-a9d25596a249" + Hint: IndexableEntityConfiguratorConfiguredIndexableEntityType + Value: Demo.Model.MyClass,Demo + - ID: "f024eaf0-f10d-4ac9-a7da-a280b0ae1af9" + Hint: SearchQueryGroupingLogicalOperator + Value: And diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereCreatedDateIsGreaterThanO.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereCreatedDateIsGreaterThanO.yml new file mode 100644 index 0000000..435d805 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereCreatedDateIsGreaterThanO.yml @@ -0,0 +1,23 @@ +--- +ID: "84f74033-3085-4044-98dd-3e3ef07ef2fb" +Parent: "d6a82e1f-6687-495e-8243-d865b1bf28ba" +Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" +Path: /sitecore/content/Home/Conjunction/SearchQueries/SearchQueryRoot/WhereCreatedDateIsGreaterThanOrEqual +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "20e7efe4-7460-4cbe-9352-7940fc5013d8" + Hint: SearchQueryRuleComparisonOperator + Value: GreaterThanOrEqual + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T184214Z + - ID: "b31481a1-8140-4e1a-b489-3dd21634c22d" + Hint: SearchQueryRuleAssociatedPropertyName + Value: CreatedDate + - ID: "bd5aabfb-a3dd-425b-8084-aeaa981fd3ee" + Hint: SearchQueryRuleDefaultValue + Value: "01-01-0001" diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereItemIdEquals.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereItemIdEquals.yml new file mode 100644 index 0000000..7ab445e --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereItemIdEquals.yml @@ -0,0 +1,23 @@ +--- +ID: "55d4083f-8b8c-408c-8fe3-9bf81093d0f5" +Parent: "d6a82e1f-6687-495e-8243-d865b1bf28ba" +Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" +Path: /sitecore/content/Home/Conjunction/SearchQueries/SearchQueryRoot/WhereItemIdEquals +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "20e7efe4-7460-4cbe-9352-7940fc5013d8" + Hint: SearchQueryRuleComparisonOperator + Value: Equal + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T184141Z + - ID: "46660b55-18c3-4d3b-8f6e-7f3cb3949318" + Hint: SearchQueryRuleDynamicValueProvidingParameter + Value: $y + - ID: "b31481a1-8140-4e1a-b489-3dd21634c22d" + Hint: SearchQueryRuleAssociatedPropertyName + Value: ItemId diff --git a/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereNameEquals.yml b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereNameEquals.yml new file mode 100644 index 0000000..7e03618 --- /dev/null +++ b/src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/SearchQueryRoot/WhereNameEquals.yml @@ -0,0 +1,23 @@ +--- +ID: "feee1d5e-8c65-4dfc-8c84-3e16bcda3930" +Parent: "d6a82e1f-6687-495e-8243-d865b1bf28ba" +Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189" +Path: /sitecore/content/Home/Conjunction/SearchQueries/SearchQueryRoot/WhereNameEquals +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "20e7efe4-7460-4cbe-9352-7940fc5013d8" + Hint: SearchQueryRuleComparisonOperator + Value: Equal + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T184127Z + - ID: "46660b55-18c3-4d3b-8f6e-7f3cb3949318" + Hint: SearchQueryRuleDynamicValueProvidingParameter + Value: $x + - ID: "b31481a1-8140-4e1a-b489-3dd21634c22d" + Hint: SearchQueryRuleAssociatedPropertyName + Value: Name diff --git a/src/Demo/Serialization/Demo.Layouts/ConjunctionDemo.yml b/src/Demo/Serialization/Demo.Layouts/ConjunctionDemo.yml new file mode 100644 index 0000000..1f61c01 --- /dev/null +++ b/src/Demo/Serialization/Demo.Layouts/ConjunctionDemo.yml @@ -0,0 +1,14 @@ +--- +ID: "596a3392-3a60-4f58-805b-6b2c7abc1120" +Parent: "75cc5ce4-8979-4008-9d3c-806477d57619" +Template: "93227c5d-4fef-474d-94c0-f252ec8e8219" +Path: /sitecore/layout/Layouts/ConjunctionDemo +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161108T124427Z diff --git a/src/Demo/Serialization/Demo.Layouts/ConjunctionDemo/ViewLayout1.yml b/src/Demo/Serialization/Demo.Layouts/ConjunctionDemo/ViewLayout1.yml new file mode 100644 index 0000000..949b168 --- /dev/null +++ b/src/Demo/Serialization/Demo.Layouts/ConjunctionDemo/ViewLayout1.yml @@ -0,0 +1,22 @@ +--- +ID: "c352ecd3-a970-4f2d-9a1a-aa343525b8c4" +Parent: "596a3392-3a60-4f58-805b-6b2c7abc1120" +Template: "3a45a723-64ee-4919-9d41-02fd40fd1466" +Path: /sitecore/layout/Layouts/ConjunctionDemo/ViewLayout1 +DB: master +SharedFields: +- ID: "a036b2bc-ba04-44f6-a75f-bae6cd242abf" + Hint: Path + Value: /Views/Layouts/ViewLayout1.cshtml +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161108T124611Z + - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f" + Hint: __Created by + Value: | + sitecore\admin diff --git a/src/Demo/Serialization/Demo.Renderings/ConjunctionDemo.yml b/src/Demo/Serialization/Demo.Renderings/ConjunctionDemo.yml new file mode 100644 index 0000000..d377324 --- /dev/null +++ b/src/Demo/Serialization/Demo.Renderings/ConjunctionDemo.yml @@ -0,0 +1,14 @@ +--- +ID: "f02ef9a4-2522-4973-8e0a-4c45c872c998" +Parent: "32566f0e-7686-45f1-a12f-d7260bd78bc3" +Template: "7ee0975b-0698-493e-b3a2-0b2ef33d0522" +Path: /sitecore/layout/Renderings/ConjunctionDemo +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161108T120053Z diff --git a/src/Demo/Serialization/Demo.Renderings/ConjunctionDemo/DemoControllerRendering.yml b/src/Demo/Serialization/Demo.Renderings/ConjunctionDemo/DemoControllerRendering.yml new file mode 100644 index 0000000..b11c602 --- /dev/null +++ b/src/Demo/Serialization/Demo.Renderings/ConjunctionDemo/DemoControllerRendering.yml @@ -0,0 +1,21 @@ +--- +ID: "247f9db2-ea73-4b6c-9258-62727e47dd89" +Parent: "f02ef9a4-2522-4973-8e0a-4c45c872c998" +Template: "2a3e91a0-7987-44b5-ab34-35c2d9de83b9" +Path: /sitecore/layout/Renderings/ConjunctionDemo/DemoControllerRendering +DB: master +SharedFields: +- ID: "ded9e431-3604-4921-a4b3-a6ec7636a5b6" + Hint: Controller Action + Value: Index +- ID: "e64ad073-dfcc-4d20-8c0b-fe5aa6226cd7" + Hint: Controller + Value: Demo.Controllers.DemoController, Demo +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161108T120111Z diff --git a/src/Demo/Serialization/Demo.Templates/ConjunctionDemo.yml b/src/Demo/Serialization/Demo.Templates/ConjunctionDemo.yml new file mode 100644 index 0000000..b59a744 --- /dev/null +++ b/src/Demo/Serialization/Demo.Templates/ConjunctionDemo.yml @@ -0,0 +1,22 @@ +--- +ID: "c0e89b82-eab8-4991-aa96-392f5dbd55d5" +Parent: "3c1715fe-6a13-4fcf-845f-de308ba9741d" +Template: "0437fee2-44c9-46a6-abe9-28858d9fee8c" +Path: /sitecore/templates/ConjunctionDemo +DB: master +SharedFields: +- ID: "ba3f86a2-4a1c-4d78-b63d-91c2779c1b5e" + Hint: __Sortorder + Value: 300 +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161108T124750Z + - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f" + Hint: __Created by + Value: | + sitecore\admin diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction.yml b/src/Demo/Serialization/Demo.Templates/ConjunctionDemo/Page.yml similarity index 65% rename from serialization/Conjunction Foundation Content/Templates/Conjunction.yml rename to src/Demo/Serialization/Demo.Templates/ConjunctionDemo/Page.yml index 8ab95fd..25d1fd8 100644 --- a/serialization/Conjunction Foundation Content/Templates/Conjunction.yml +++ b/src/Demo/Serialization/Demo.Templates/ConjunctionDemo/Page.yml @@ -1,8 +1,8 @@ --- -ID: "4e33163d-4460-4e20-9bf1-86409d1a9d37" -Parent: "3c1715fe-6a13-4fcf-845f-de308ba9741d" +ID: "a4e62ffa-ec1a-442d-a96d-029ce343bf83" +Parent: "c0e89b82-eab8-4991-aa96-392f5dbd55d5" Template: "0437fee2-44c9-46a6-abe9-28858d9fee8c" -Path: /sitecore/templates/Conjunction +Path: /sitecore/templates/ConjunctionDemo/Page DB: master Languages: - Language: en @@ -11,7 +11,7 @@ Languages: Fields: - ID: "25bed78c-4957-4165-998a-ca1b52f67497" Hint: __Created - Value: 20161116T120710Z + Value: 20161108T124825Z - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f" Hint: __Created by Value: | diff --git a/src/Demo/Serialization/Demo.Templates/ConjunctionDemo/Page/Page.yml b/src/Demo/Serialization/Demo.Templates/ConjunctionDemo/Page/Page.yml new file mode 100644 index 0000000..20f473e --- /dev/null +++ b/src/Demo/Serialization/Demo.Templates/ConjunctionDemo/Page/Page.yml @@ -0,0 +1,32 @@ +--- +ID: "0642ef2f-a8c0-42d6-ac35-6ce9f11cc99a" +Parent: "a4e62ffa-ec1a-442d-a96d-029ce343bf83" +Template: "ab86861a-6030-46c5-b394-e8f99e8b87db" +Path: /sitecore/templates/ConjunctionDemo/Page/Page +DB: master +SharedFields: +- ID: "12c33f3f-86c5-43a5-aeb4-5598cec45116" + Hint: __Base template + Type: tree list + Value: "{1930BBEB-7805-471A-A3BE-4858AC7CF696}" +- ID: "f1a1fe9e-a60c-4ddb-a3a0-bb5b29fe732e" + Hint: __Renderings + Type: layout + Value: | + + + +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161108T124833Z + - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f" + Hint: __Created by + Value: | + sitecore\admin diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/z_Conjunction/Unicorn.Configs.Conjunction.DeveloperOnly.config b/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/z_Conjunction/Unicorn.Configs.Conjunction.DeveloperOnly.config deleted file mode 100644 index ad43924..0000000 --- a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/z_Conjunction/Unicorn.Configs.Conjunction.DeveloperOnly.config +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/z_Conjunction/Unicorn.Configs.Conjunction.Foundation - Copy.config b/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/z_Conjunction/Unicorn.Configs.Conjunction.Foundation - Copy.config deleted file mode 100644 index 00010c0..0000000 --- a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/z_Conjunction/Unicorn.Configs.Conjunction.Foundation - Copy.config +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/Web.config b/src/Foundation/Content/Conjunction.Foundation.Content/Web.config deleted file mode 100644 index 5374722..0000000 --- a/src/Foundation/Content/Conjunction.Foundation.Content/Web.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Foundation/Core/Code/App_Config/Include/Conjunction/Conjunction.Foundation.Core.Serialization.config b/src/Foundation/Core/Code/App_Config/Include/Conjunction/Conjunction.Foundation.Core.Serialization.config new file mode 100644 index 0000000..00a86d8 --- /dev/null +++ b/src/Foundation/Core/Code/App_Config/Include/Conjunction/Conjunction.Foundation.Core.Serialization.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Foundation/Core/Code/Conjunction.Foundation.Core.csproj b/src/Foundation/Core/Code/Conjunction.Foundation.Core.csproj index f363730..cf574bc 100644 --- a/src/Foundation/Core/Code/Conjunction.Foundation.Core.csproj +++ b/src/Foundation/Core/Code/Conjunction.Foundation.Core.csproj @@ -72,15 +72,8 @@ - - Web.config - - - Web.config - - - - + + @@ -127,6 +120,7 @@ + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Foundation/Core/Code/Web.Debug.config b/src/Foundation/Core/Code/Web.Debug.config deleted file mode 100644 index 2e302f9..0000000 --- a/src/Foundation/Core/Code/Web.Debug.config +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Foundation/Core/Code/Web.Release.config b/src/Foundation/Core/Code/Web.Release.config deleted file mode 100644 index c358444..0000000 --- a/src/Foundation/Core/Code/Web.Release.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Foundation/Core/Code/Web.config b/src/Foundation/Core/Code/Web.config deleted file mode 100644 index cb7fad4..0000000 --- a/src/Foundation/Core/Code/Web.config +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction.yml new file mode 100644 index 0000000..1144fc8 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction.yml @@ -0,0 +1,18 @@ +--- +ID: "73a63b56-a08b-4c1a-b97c-81ffe586fd0f" +Parent: "08477468-d438-43d4-9d6a-6d84a611971c" +Template: "a87a00b1-e6db-45ab-8b54-636fec3b5523" +Path: /sitecore/system/Modules/Conjunction +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T155715Z + - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f" + Hint: __Created by + Value: | + sitecore\admin diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings.yml new file mode 100644 index 0000000..49106d5 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings.yml @@ -0,0 +1,18 @@ +--- +ID: "ef59903b-6ba8-4cbb-b780-81b424650c12" +Parent: "73a63b56-a08b-4c1a-b97c-81ffe586fd0f" +Template: "a87a00b1-e6db-45ab-8b54-636fec3b5523" +Path: /sitecore/system/Modules/Conjunction/Settings +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T155730Z + - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f" + Hint: __Created by + Value: | + sitecore\admin diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators.yml new file mode 100644 index 0000000..39237b8 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators.yml @@ -0,0 +1,18 @@ +--- +ID: "ad18bf73-825d-482a-bb38-b1b6a339fb62" +Parent: "ef59903b-6ba8-4cbb-b780-81b424650c12" +Template: "9d6ab533-b3b5-4799-a257-f1eae8b3c844" +Path: /sitecore/system/Modules/Conjunction/Settings/ComparisonOperators +DB: master +Languages: +- Language: en + Fields: + - ID: "b5e02ad9-d56f-4c41-a065-a133db87bdeb" + Hint: __Display name + Value: Comparison Operators + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T182653Z diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Between.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Between.yml new file mode 100644 index 0000000..60183f6 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Between.yml @@ -0,0 +1,21 @@ +--- +ID: "4c7ea48f-6ca1-477d-9c81-f3a425f89fad" +Parent: "ad18bf73-825d-482a-bb38-b1b6a339fb62" +Template: "bbc556b4-5cc2-4db2-aa25-36acca5e7333" +Path: /sitecore/system/Modules/Conjunction/Settings/ComparisonOperators/Between +DB: master +Languages: +- Language: en + Fields: + - ID: "b5e02ad9-d56f-4c41-a065-a133db87bdeb" + Hint: __Display name + Value: Between + Versions: + - Version: 1 + Fields: + - ID: "0e2333a1-688d-4efa-beae-6ce1d835b36d" + Hint: ComparisonOperatorType + Value: Conjunction.Foundation.Core.Model.ComparisonOperator.Between,Conjunction.Foundation.Core + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T182849Z diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Contains.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Contains.yml new file mode 100644 index 0000000..e4dcf38 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Contains.yml @@ -0,0 +1,17 @@ +--- +ID: "51fda925-efe0-4653-a8b1-85a346f40856" +Parent: "ad18bf73-825d-482a-bb38-b1b6a339fb62" +Template: "bbc556b4-5cc2-4db2-aa25-36acca5e7333" +Path: /sitecore/system/Modules/Conjunction/Settings/ComparisonOperators/Contains +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "0e2333a1-688d-4efa-beae-6ce1d835b36d" + Hint: ComparisonOperatorType + Value: Conjunction.Foundation.Core.Model.ComparisonOperator.Contains,Conjunction.Foundation.Core + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T182841Z diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Equal.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Equal.yml new file mode 100644 index 0000000..05ca1b7 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/Equal.yml @@ -0,0 +1,17 @@ +--- +ID: "2ec21d01-dc09-4d24-8f60-19d507f8bd7e" +Parent: "ad18bf73-825d-482a-bb38-b1b6a339fb62" +Template: "bbc556b4-5cc2-4db2-aa25-36acca5e7333" +Path: /sitecore/system/Modules/Conjunction/Settings/ComparisonOperators/Equal +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "0e2333a1-688d-4efa-beae-6ce1d835b36d" + Hint: ComparisonOperatorType + Value: Conjunction.Foundation.Core.Model.ComparisonOperator.Equal,Conjunction.Foundation.Core + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T182834Z diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/GreaterThanOrEqual.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/GreaterThanOrEqual.yml new file mode 100644 index 0000000..1e67e80 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/GreaterThanOrEqual.yml @@ -0,0 +1,21 @@ +--- +ID: "7e887b99-51fd-40ee-bafa-28ff53bccb25" +Parent: "ad18bf73-825d-482a-bb38-b1b6a339fb62" +Template: "bbc556b4-5cc2-4db2-aa25-36acca5e7333" +Path: /sitecore/system/Modules/Conjunction/Settings/ComparisonOperators/GreaterThanOrEqual +DB: master +Languages: +- Language: en + Fields: + - ID: "b5e02ad9-d56f-4c41-a065-a133db87bdeb" + Hint: __Display name + Value: Greater than or equal + Versions: + - Version: 1 + Fields: + - ID: "0e2333a1-688d-4efa-beae-6ce1d835b36d" + Hint: ComparisonOperatorType + Value: Conjunction.Foundation.Core.Model.ComparisonOperator.GreaterThanOrEqual,Conjunction.Foundation.Core + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T182812Z diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/LessThanOrEqual.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/LessThanOrEqual.yml new file mode 100644 index 0000000..02c8fc5 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/ComparisonOperators/LessThanOrEqual.yml @@ -0,0 +1,21 @@ +--- +ID: "d4391bc3-6086-46f0-99f9-e71053dfec1e" +Parent: "ad18bf73-825d-482a-bb38-b1b6a339fb62" +Template: "bbc556b4-5cc2-4db2-aa25-36acca5e7333" +Path: /sitecore/system/Modules/Conjunction/Settings/ComparisonOperators/LessThanOrEqual +DB: master +Languages: +- Language: en + Fields: + - ID: "b5e02ad9-d56f-4c41-a065-a133db87bdeb" + Hint: __Display name + Value: Less than or equal + Versions: + - Version: 1 + Fields: + - ID: "0e2333a1-688d-4efa-beae-6ce1d835b36d" + Hint: ComparisonOperatorType + Value: Conjunction.Foundation.Core.Model.ComparisonOperator.LessThanOrEqual,Conjunction.Foundation.Core + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T182823Z diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators.yml new file mode 100644 index 0000000..7d132fe --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators.yml @@ -0,0 +1,18 @@ +--- +ID: "dc1cbc06-90c3-4cc1-8050-9cfe14ca608a" +Parent: "ef59903b-6ba8-4cbb-b780-81b424650c12" +Template: "dee098a0-22e5-456d-ae48-4595e96a308f" +Path: /sitecore/system/Modules/Conjunction/Settings/LogicalOperators +DB: master +Languages: +- Language: en + Fields: + - ID: "b5e02ad9-d56f-4c41-a065-a133db87bdeb" + Hint: __Display name + Value: Logical Operators + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T182704Z diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators/And.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators/And.yml new file mode 100644 index 0000000..eeff888 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators/And.yml @@ -0,0 +1,17 @@ +--- +ID: "71154b95-016a-43d2-b024-89a324764fbf" +Parent: "dc1cbc06-90c3-4cc1-8050-9cfe14ca608a" +Template: "5c28b108-98f6-4840-ae14-f3633b2550ba" +Path: /sitecore/system/Modules/Conjunction/Settings/LogicalOperators/And +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T182740Z + - ID: "c736c637-704e-4b89-acd3-863e97c56300" + Hint: LogicalOperatorType + Value: Conjunction.Foundation.Core.Model.LogicalOperator.And,Conjunction.Foundation.Core diff --git a/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators/Or.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators/Or.yml new file mode 100644 index 0000000..8ea9162 --- /dev/null +++ b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Module/Conjunction/Settings/LogicalOperators/Or.yml @@ -0,0 +1,17 @@ +--- +ID: "740112fe-89dd-4588-a8a1-a0de137b88a7" +Parent: "dc1cbc06-90c3-4cc1-8050-9cfe14ca608a" +Template: "5c28b108-98f6-4840-ae14-f3633b2550ba" +Path: /sitecore/system/Modules/Conjunction/Settings/LogicalOperators/Or +DB: master +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: "25bed78c-4957-4165-998a-ca1b52f67497" + Hint: __Created + Value: 20161118T182744Z + - ID: "c736c637-704e-4b89-acd3-863e97c56300" + Hint: LogicalOperatorType + Value: Conjunction.Foundation.Core.Model.LogicalOperator.Or,Conjunction.Foundation.Core diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/ComparisonOperator.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/ComparisonOperator.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/ComparisonOperator.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/ComparisonOperator.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/ComparisonOperator/__Standard Values.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/ComparisonOperator/__Standard Values.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/ComparisonOperator/__Standard Values.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/ComparisonOperator/__Standard Values.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/ComparisonOperatorFolder.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/ComparisonOperatorFolder.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/ComparisonOperatorFolder.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/ComparisonOperatorFolder.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/ComparisonOperatorFolder/__Standard Values.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/ComparisonOperatorFolder/__Standard Values.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/ComparisonOperatorFolder/__Standard Values.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/ComparisonOperatorFolder/__Standard Values.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/LogicalOperator.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/LogicalOperator.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/LogicalOperator.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/LogicalOperator.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/LogicalOperator/__Standard Values.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/LogicalOperator/__Standard Values.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/LogicalOperator/__Standard Values.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/LogicalOperator/__Standard Values.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/LogicalOperatorFolder.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/LogicalOperatorFolder.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/LogicalOperatorFolder.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/LogicalOperatorFolder.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/LogicalOperatorFolder/__Standard Values.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/LogicalOperatorFolder/__Standard Values.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/LogicalOperatorFolder/__Standard Values.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/LogicalOperatorFolder/__Standard Values.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryGrouping.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryGrouping.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryGrouping.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryGrouping.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryGrouping/__Standard Values.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryGrouping/__Standard Values.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryGrouping/__Standard Values.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryGrouping/__Standard Values.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryRoot.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryRoot.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryRoot.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryRoot.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryRoot/__Standard Values.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryRoot/__Standard Values.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryRoot/__Standard Values.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryRoot/__Standard Values.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryRule.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryRule.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryRule.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryRule.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryRule/__Standard Values.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryRule/__Standard Values.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/SearchQueryRule/__Standard Values.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/SearchQueryRule/__Standard Values.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_ComparisonOperator.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_ComparisonOperator.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_ComparisonOperator.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_ComparisonOperator.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_ComparisonOperator/ComparisonOperator.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_ComparisonOperator/ComparisonOperator.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_ComparisonOperator/ComparisonOperator.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_ComparisonOperator/ComparisonOperator.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_ComparisonOperator/ComparisonOperator/ComparisonOperatorType.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_ComparisonOperator/ComparisonOperator/ComparisonOperatorType.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_ComparisonOperator/ComparisonOperator/ComparisonOperatorType.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_ComparisonOperator/ComparisonOperator/ComparisonOperatorType.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_IndexableEntityConfigurator.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_IndexableEntityConfigurator.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_IndexableEntityConfigurator.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_IndexableEntityConfigurator.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator/IndexableEntityConfiguratorCon.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator/IndexableEntityConfiguratorCon.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator/IndexableEntityConfiguratorCon.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_IndexableEntityConfigurator/IndexableEntityConfigurator/IndexableEntityConfiguratorCon.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_LogicalOperator.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_LogicalOperator.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_LogicalOperator.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_LogicalOperator.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_LogicalOperator/LogicalOperator.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_LogicalOperator/LogicalOperator.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_LogicalOperator/LogicalOperator.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_LogicalOperator/LogicalOperator.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_LogicalOperator/LogicalOperator/LogicalOperatorType.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_LogicalOperator/LogicalOperator/LogicalOperatorType.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_LogicalOperator/LogicalOperator/LogicalOperatorType.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_LogicalOperator/LogicalOperator/LogicalOperatorType.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryGrouping.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryGrouping.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryGrouping.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryGrouping.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryGrouping/SearchQueryGrouping.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryGrouping/SearchQueryGrouping.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryGrouping/SearchQueryGrouping.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryGrouping/SearchQueryGrouping.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryGrouping/SearchQueryGrouping/SearchQueryGroupingLogicalOper.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryGrouping/SearchQueryGrouping/SearchQueryGroupingLogicalOper.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryGrouping/SearchQueryGrouping/SearchQueryGroupingLogicalOper.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryGrouping/SearchQueryGrouping/SearchQueryGroupingLogicalOper.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleAssociatedPrope.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleAssociatedPrope.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleAssociatedPrope.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleAssociatedPrope.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleComparisonOpera.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleComparisonOpera.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleComparisonOpera.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleComparisonOpera.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDefaultValue.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDefaultValue.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDefaultValue.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDefaultValue.yml diff --git a/serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDynamicValuePro.yml b/src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDynamicValuePro.yml similarity index 100% rename from serialization/Conjunction Foundation Content/Templates/Conjunction/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDynamicValuePro.yml rename to src/Foundation/Core/Serialization/Conjunction.Foundation.Core.Templates/Foundation/_SearchQueryRule/SearchQueryRule/SearchQueryRuleDynamicValuePro.yml diff --git a/src/Foundation/Serialization/Code/App_Config/Include/Conjunction/Conjunction.Foundation.Serialization.DevSettings.config.example b/src/Foundation/Serialization/Code/App_Config/Include/Conjunction/Conjunction.Foundation.Serialization.DevSettings.config.example new file mode 100644 index 0000000..6b8b096 --- /dev/null +++ b/src/Foundation/Serialization/Code/App_Config/Include/Conjunction/Conjunction.Foundation.Serialization.DevSettings.config.example @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Rainbow.config b/src/Foundation/Serialization/Code/App_Config/Include/Rainbow.config similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Rainbow.config rename to src/Foundation/Serialization/Code/App_Config/Include/Rainbow.config diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.AutoPublish.config b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.AutoPublish.config similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.AutoPublish.config rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.AutoPublish.config diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Configs.Default.example b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Configs.Default.example similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Configs.Default.example rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Configs.Default.example diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Configs.Dependency.config.example b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Configs.Dependency.config.example similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Configs.Dependency.config.example rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Configs.Dependency.config.example diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Configs.NewItemsOnly.example b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Configs.NewItemsOnly.example similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Configs.NewItemsOnly.example rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Configs.NewItemsOnly.example diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.CustomSerializationFolder.config.example b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.CustomSerializationFolder.config.example similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.CustomSerializationFolder.config.example rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.CustomSerializationFolder.config.example diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.DataProvider.config b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.DataProvider.config similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.DataProvider.config rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.DataProvider.config diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Deployed.config.disabled b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Deployed.config.disabled similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Deployed.config.disabled rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Deployed.config.disabled diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.UI.config b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.UI.config similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.UI.config rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.UI.config diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.config b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.config similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.config rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.config diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.zSharedSecret.config.example b/src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.zSharedSecret.config.example similarity index 100% rename from src/Foundation/Content/Conjunction.Foundation.Content/App_Config/Include/Unicorn/Unicorn.zSharedSecret.config.example rename to src/Foundation/Serialization/Code/App_Config/Include/Unicorn/Unicorn.zSharedSecret.config.example diff --git a/src/Foundation/Content/Conjunction.Foundation.Content/Conjunction.Foundation.Content.csproj b/src/Foundation/Serialization/Code/Conjunction.Foundation.Serialization.csproj similarity index 69% rename from src/Foundation/Content/Conjunction.Foundation.Content/Conjunction.Foundation.Content.csproj rename to src/Foundation/Serialization/Code/Conjunction.Foundation.Serialization.csproj index e68efb2..6b8624b 100644 --- a/src/Foundation/Content/Conjunction.Foundation.Content/Conjunction.Foundation.Content.csproj +++ b/src/Foundation/Serialization/Code/Conjunction.Foundation.Serialization.csproj @@ -1,5 +1,7 @@  + + Debug @@ -7,12 +9,12 @@ 2.0 - {28CFED63-5FE0-44A2-9CF0-86249F0FDC26} + {6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A} {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties - Conjunction.Foundation.Content - Conjunction.Foundation.Content + Conjunction.Foundation.Mvc + Conjunction.Foundation.Mvc v4.5.2 true @@ -22,7 +24,7 @@ - /subscriptions/5cd5903f-3a7b-4922-8e7a-2b7151491f91/resourcegroups/Default-ApplicationInsights-EastUS/providers/microsoft.insights/components/Conjunction.Foundation.Content + true @@ -50,6 +52,10 @@ ..\..\..\..\packages\MicroCHAP.1.2.2.2\lib\net45\MicroCHAP.dll True + + ..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + True + ..\..\..\..\packages\Rainbow.Core.1.4.1\lib\net452\Rainbow.dll True @@ -63,7 +69,12 @@ True - + + + + + + ..\..\..\..\packages\Unicorn.Core.3.3.2\lib\net452\Unicorn.dll True @@ -83,11 +94,8 @@ - - - + - @@ -105,9 +113,9 @@ True True - 49934 + 34400 / - http://localhost:49934/ + http://localhost:34135/ False False @@ -117,6 +125,13 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + Z5!L&mCB^@b8B#8M@!D9$!i<(~+osLM|Zf8O-eCb|&gUD<*tUf~)wYqXd1h6R{%EP$vyBZljx=UQJ}Gk;99u`g605-T z19dM^RJ6>+C1`$^{%hJbv(q#5U!S;@#M%b&@5*V){{+tdyI%X>p*9alCHi-$9sdtd z3s!WRL>Ue;*`D-a{Qmszt;hLtI;k*9I?D?G<@)M=Z?8?f&WY@8RK6 zv4Qde#rpJfSi77B9a)i8lL|;XD`-Q}Qk-9Z4-bFPp!5kIieZ$E)jSVA&)g#hDnv$v?xxcOCyq zwH(>Y?^N4cx$`48JvI*OYn)x~$*C1V@*3(klmHIKLXf!wFKo=Yc5^6+g*g9$LsR& zo-ONaHo+M>HvR&&A<|dGpRQ{5zJ1X_eXibjxUb`kfcf4-BvS-{(G^Xg%o>dR^p_%;oxdw7jD~lu(^EQ z^jmm1pD%}-G~^}I8@^sG;tG|KFK=D6N1)%I9Jy3>e4~o^>OJiweO3yFABNsxPv3TA z2uJYH-PLT1@niXNBh<_fZ+^PC$l)8U8SnZC*Y`i0ob#zn1bpmrDgvj!@@Y_g;zEE4 zC{H=Im31ep9+#4zgyA8IBjq@1Mqzvp50?OMnr_U!!$tUEna~D=O=-uvOZOZKizz7K zpQCgv99^XmlqP_KgW{b0j<2{29=f6+Uu0q zD!~?}>2k2I7vsTFMFF;gUI$4%X}9gV%oh^fjc@2GwGQy0wY-FZ$gyL z4*VO1W;mKN`eaV*0xyqUm4om7r2c@RGU;$KuvEBOtYtMrq|f?}K&9m&fYD z)!H&E0dmZuTzt&}sN*vil;;BzgJsuAI9K%x^^`L<+H5`~?|1F=k&W2lw7VH>i8DbF z)7T5T_hHf(*Af?zC~XK7U;9lvJ)2q^-1_;k2iz9($#CjCYk!RtiJiopUZ8wac{Jd`ax*5IYQ&m^=e8EXL4nikJr?YHv`CzRb0z?`v@z8U2Xq% zA{KpV|8naY3vJ9)u0)k~A^tLXZ~UUZvgl!WtJs_<1eyyY$Pp!X9v|p1a+`iB8Doq` z+;n|`O@W!cA{=+(zS$ulK?$ijgp;kQZbnsfr|cyR;GP$vCn>)G1WKPP zT@%fjFpDqn)f1;gyh2abtm!x+A;5IW+ppD^|Dh0?p$FKQ^B27$fdT-8|JUjDU)8q# zi)l_v&&wdd$I3_bnO8`Vijjp?=xqtgN<}Bc&%iH8&%{VCAo!mipl*QNWPA7oYR2KunI)qENJY94QqAg?nyt+q1_-uP-{@Uck__WxA7I(qP!z4QiUJGXBBm#J9!&_wAWe zuoeEmwpFVGOs4|%sN?z5AP&6w?USn0AP1GBLpu1^UYBO|YnN$B_)}fYRj>C$RNxO# z@O&Upn!gB^Bt;-NGR*$Au=F??vG`Le5fI)j1oK`R=D4L(Z#YL1GF;(m#J%0B#iLF$ z%V1KN+id6CAu8BW=U)#|Np|r1;U7;p`~NT_`DhRM-D-MgznhWn;)Vy^SF;Q+;Z0V5 zBy36oABWBp5Le4EOG3voJ=OJ!Om~3wzZx^X^<|dhX(2H?(US72I+2T z=@jWkkZvjIkWMM-?%F=eKmsoJk|z z-*m+D=zFIcFb^;{iW=E&;pzT<>-hjebdBRFkWKiH5bXcT7ys{}tU551^>cdjQr86G zan^`Qc0!n-plmoBL2i*w9SgMBjZQfIc;(RR{x$?*zc+@@i+UcuXT*Z|C#?{Y13MTVpdGEJ3H)b0i`E_!LuEoPOfq+2gjjnF< zeGAVb&*!5XseRt~mnhOQvO`1r;>Y&vEz2i2cZbU>eY=xLEiHFv*Sn{EeY?jEZ>(11 zo7im~|Kiu>x%DO9`?E1R*|HiWFZZY8H>|09B5b3ttDpEavgPX&zoJY^#7NsV{KN4Z zZm7$@j^DgF{m0`sPEW^g1dD>$-ioM~ke0AoJl}QhREj3|G1z)tTl$`#2utqW|0|ZQ z29{cTdeD;LbDACd5}SG+ORdKrLqsyM5Hi)7w@M<-u(WFIC`HKViekGs=1o=13#6!w zCkL8i=^F3$Gn$({2)9OiLOCiaWtesIJI$Or5ZD7 zB!7HlKdojJQlC8n0<6;`!0w>>>T>2|I{7w-=2jVPoI1H4hhuP$#kig{jQqNOgYtO& zCb2+9P3%fYwo-u3EkX-jWrQF_M>XSfUUZwf3k2L=hcDQ?21~2IlUaW}2g;35ybnyl zGiN<|7z0VMPOCBOdDId}> zm?H)-QC2t8QP!7C3Yxdi-ByOIAc3Y*i(k$`~joYN%Q9P$td0K)E+fi zv6rRE7Dw@=I7NQ~tf}eXtU^PCV>tPN>=EqADeWb;eE7>Nd8mPH1A$v;ms;UkTU;L9{j?TzL z;D>TG7hR6ALyvJk8lImuk=+M;ji>n3<8+Gc6G&f!u_7U`j8T$Ck7QBRM%rsC>?Bg zR&pD*bb{Kj@7RmMWWhmM;t|hwMt$1Df1Tr+qHHFx?!X17Z3kKW0VyJMU0aWR=FHB{ za%aB}-I=EVM$1H*_pHh-{!%0^#)s){2z2d_(7xo1E9H>#zuUCohxy5aag=mY%j1iyLX@K3+*{6g$PujobC z04#zGLI7rAc6NY(2)zJ+Uxc55O^{!Rfr*vr&ouUzpU+v;B!Ds%b_R`eB?re}ty+)| zsEbMM`gnI9AwB0$P6jX{AWcl0w>KF~YWlI>NO@%vOV^i@f@D8dmTar+ZaLAw^}e&F zk+&<){$`J1p@g;%8q;c=20IFrBzQ*SAmpu0Zx$@AK~ABddVijgUsuHvvz{>m%nJBa zvKc)JHJZ;0R4%eNGQB&tZPXdZA6CtYi2Clts{lq?l+3>o1f(TVitAxp-%|qS(-OciFdH8}KT4?zGFfi$Z zp!VYA&p#9iaop_vu*X`pUNtp?F+)}+=0{eY5k{A(Os!-QU_8?-94x7;xC}gh^P1v8pU+Ad zhXWLQ5_KjGRj}CC^bWDv2Esl6#$t*aaC?H$yc%d`MmB6iik!|wAC1~PiB$&+r+(_s zd-LP?f>r<*;N4C#3_{iJ2uG8IVZI_43&>u*34p(=uqIn9eIbARg-pO9dbO+Hhi2ryL*H$o(W-rvF&w;6MKL|6y#I zu;JQ08C#k2)Q5Rb##ZbvV+%Te&y)`0MY+B(|s+-G;gYDz)jQi7@$Bb91OMG9`qg0?sgF9=0&EFF=nxKZkGC!yi?hpHu_o|K6Zam)OZXs zsWvu4cxX4k{W|$Xc%Cc5QByb#;=n+o-Ql@wVT4wY%*-dJ z7-kM(G?Mof6T^E9+t-^gcqI}aQfG;=zpr8&SH~1?RuNY(q8kDm2U9=MHlCj-!YlCo zL37ad+Gzw_Y^ltIEQ1w88tABuW|NQ(*P6mrD!KBDEGvFu62);Xic{^H@M&N)>;Byj z4=3p{nia`jxJnFdbA(xIN~C&QAPsCB)G0_BD^Sj|J~j@#ZjSDJ%9Tk}$D?yTa9b!8 zWsgQ+D?9Gd9^Zm@K#9b?GvPyOZyV31o$1m_9%s0!PSv8y8!w>x#kM8C!r7_J-`LhM z4#RBxUzG#qtk^AJ^HV0vS^Ig{`RZ}dEJ|?D@q{+sK(=-K$+ow@v+c(}*|r3otnYGpj5GW- z<@WcZlE2v2;uqVpT&Oi3nbSNfa26?bFoGztt9wq{B7 z@hC8zZ301Rh0{|aZD>0bv9D}*HN|G>9sYpwRnxDBOfsQb-gYrFF5v$R>$heK@PUKy!p zn0%0Yg<|akv^QxbgRSUhZeU8D9tLkt_qyq%(Zb6(f;*g`elWUw(jvzKfL;%EI1JrpK6u zKt&E;t3+VNwhpTHM+|+Ho`v(0YM~-Ndr3Iqvlu?yEr1H~PRQLyua)H|@>*qG9H-UA z60f@8Re^Z@D2HPohWSR{t^kF8By7m7l7`-?`jLx+I%$R`MPv^$5f7x3o1EHkO@GQ? ztX3A^ukK|(Tl>+f6R}90n_gyhn|v=Lv431+6oHi?z;J^GM8BplAUjK!4{*unfZUka;g0Y22{T^-{9YG>YQJ+^g+C zZ~5>kH{OZa>G>LA9fcR2g;rP+*8i5+j)?m(k#6ncS(p7=flyoF8!F;gv5XnbTQ z0a#uxv1lItF3;5@UpIdThtrxe3PF_oD9`}|u|!J3nUGyUT>~nj?$I&Eo`%S1Gfb|4 z5gw>qW4Cxd2j%`eCz@j^wIc;$SQbO>>aW7J4QjRv`v@em0TcQ`~uA2R1;r^TIRuj!Y1xoOByf z!&M$G47E>lY)Z!Xr4@z8d4ym)?R#mIyrkKfj+-uAH>)Kud{Dpzj;qiiA zp79{X)T15AMw-J-eBQ-Lvw?f)wn1w&hd_w0?#ih-=j=7 z5_7F_ZIG}Hytu}h_M|Fgu7`AG8MH??k&k!O^4M`oLOro4K|xF6tIzX z)M%X0ia+9tVGomTNYY}wvX0nO6iOwZ)kfa46Dnu-%s8CAwoQySBdo#VZ}CYH+3^$j$Y;bv3{e3Wz)CYqG|P7uLUOBscbv!p

^ zXaSUM@5d#o1i}PbusYLBD@^vTF2X||7NfXHq{QwHSv-0XMk=HDd|_P}us~O^w=|`> znPlYKGfukS2ui(S3|@ng)2H;0p&AFEqxECuONq1KOVVMx*}~nG?SH$aEsiJXJ^S0F z8i{jvgZED)egD6Lr2mnRQ(ILsLc0zz?dN|v5upMa8OxFng~SV(n78bwbCj7Y)^YRc zwM~@>l^-pMM6F33GhT{-HmfFZaJ8Igc->xKZXSq$l)RZCTPt5;p1C`_IOrSe&hYZOx;)!^ znS~egTgPsrNCfEx9{C{(o>Vn0Uaw!ho#+liqN~wO_j0>Et(o24NSMuY)}3ALYI2O3 zLC;7Ku>z3U(~UJ$B_8eOwcM<1o}S%wt41s+QiT=w^Sj<{jzI6`KS<`yw9v6K#0WHE%+l99#!z%uM50!3X3i0L&*C_jK|LrSZllr@bTB#7n0xf`_C zv5QlqS{27OrU30J2!2tusEK?lh8~fXN7bGk8~y z_3~TqY5-GCMcXho$#yd@5B>5|CdhaqKDG7wJCPSm2wFJtixK<6Z`Bc#w|7)O%7J%N zZfMt>q+PWidfi^E`I>5X*6BT)0OL}Xqy98}c3^(nE4hRW()6b4zNTU&^9NjQb+?DUf)ua_(rtvtjl82wq~gz zsz)bt)uzp+9@-?9LDBp>7f?bhx$Nvq+TXf$c70bTI8aGtx*B39p0ydoMoDcdn;RuL zW!=yelM`~3LVY#Fk|K;_aS5{$PgzW#2w64)3C|hM*!iS5ySl44@ufy<&T@QE4=S{zo;16PXQOt#Qwj^Bd4O0^#?#OmW1V#wQzV8 ze8ihk#5*t!_#Uu-(Z0~n5#AbcZ(arA2eD~EY1|_~eAM)AcMC648VjBW+>6Vivm~HI zRDx=K6K=hH3ry}t%rR&G!>+$lNr1%`VA@gMR-jO^7v33hXJW%Y56mHLlrYb&Z+(x@ z+{lKewFgud4+i$;TSe%A*%~}aG!(|?aFiJMkm)3jR2+OZ)PtID-`gup#8NzrJQS2M zPbM){US`UC#dpVqru50LTfz2w*>01GC{L>4o6_%{c84r0`mrh1W-gd74Ov2P4n$?M z=p?4A-e|2f%c>RHAAZi`CHtnS8Y(WzTR(m}C!7+0LxY(Y*4fuRuFA#5bmfSQW!D1B ztcL4aMC2yy0s)$}e*MMRk{aPuwy#_ZUm}9qbDn(|h+q?eEJhS0QZv%^Ls{(R5?fr) zQ}X$0h)~X3)c%!O-wmuNP99>ZW zT?!`m_Y_#oCv3JLh1ESNeh z$|5Ag{b9Hv@8X30X(*h2;%gHqoeR-v2ze%YDWb}o6uHpsrOx zz7!!qE!(;{hfG06(ovFaP@bf-1CH-U^&D1X=2{H*^#}LN1pYUGP%ak4ICGd|=XFQG@>m=U+w<{>0Bx}6CtRVgPFK9fces zS=DwtOPT|iFVpieFH?gJpk(C&35V*xQmFL>uCV^DYauuViZoq&&q&r!)Zp&;RyxB3 z?S)jXWj@DlM93U6R-r5IFGd877!7nP4Fk<;&*NkFhnWDNoPR76Q$hoAp^gtDfa}hT z0d*}(7^_U<<*S60Ek0z|zy zGnu-CvY#9S1n5KbvV-~B_Zdlp!#F&{)I;ItM>Mu7*l2#(s0{N3;v1&rzejCSzq#i= zJzQ@26Bs62U2R8yB5XT22#DT)iLmx>fBv%-o%9={p9t_LD!9F3;%8+NU||LD)3XTx zm<55i4cT7_0@xTtM1)z`SVe^Be@D~U-wFo!CP-kj<(C!U1R+ zT}nLl_TfATfYp1e{Qm0}Rpl1T&^p8Ol`zR=n*NrGEj# zy?h=6GNa23KaW*9C6y`OG|1J3YckS5BlwVA`lW9Ur-9h*q1=$eCjz9nDAR6Ni4Fp0 zlM$?O3}Oj*3KD_m)!=vlj)AxOE-nK#+a3web~krZ2Cm7}J73GmGm3ny?}0oBmDDR$ zKo9&usw1sNf0R|w7Oa|80&ni!Y8Ytp8boilm*Ziwq}xZ;(3jmN8E)tci|bNO4* zxdyB-IrL1U-e7OY10s6l5jBMNP>F_??;D2Kyq#9T{1S@3D_S6-U;WPULD?m;U3vo= zi`*rK=FO7QkaCg$#Y$BC+5S*f#BHT*I8F`z7yx#@ zp~duSiO#^GtCFM!o_Pk?u7c}1&lL&m(q^w*FDpn9UO0p%DH+qGGT!4kpF z^B2i?Tdc7~+bs>Zh<|=h!n9)TgipOyi~k=0{m*?`zYF|gXyPHDjmW3=K7`W^dAj6K z~2D2OVj<;?Cx#f?Cx=2 z4Xa(>LTYV&6vQiY3s`mk2penrgMF{7<3-)YHw5>mR##K%#AAEd2|};hV?>HhwT!8m-JS+#oDYcGmixJ-C7MbQrX5(GHg8|-TT zKbNWg{Sn_A(L;2Fk{MINV>_O~E&5h2Tvlu9_#-T#90JbMG8OYPu6nfW7~nD$-bvDX z4XRj)X~$3dtMJ|TYh#nwkWVF4&?mKODQ{rjc!3VfF;lp16ye~X)T*E~V9t4rF$MzN zmhQyP2`JSgtd4I@9_L(@<9jTjy3MI#ioQgpqwhnBV$N%xfTFa}l^#F@4Ug}FH zQ4LT!5gp#%LdAK-NCB_ey2L|6;XMHytHRX#JRY6-va&JlBgeQ;m-q12`)wMooo1jx zg+RxjBd7P9L3M48t;6WtXazgoc3suOD$I!tOgUfnjB%5l%%YL?T^?-W2|T>u<8{G% zIPbls(;Wx=^7o+#LNJ>Nv72^G(tIBLefr_aof$9`gpBCP2;;s1$ph4wVwiOf=l_n@njK@PUOuqq5YR}9RRJD7N)*lb__m#g5 z_H}(-d47cx@h^X$#q{{0g6cb60tFt&_FZ$c0pXWHwWfB8zyxX$*R~iXUePK&Xz#S% z2&lHu+`uN1(ZGmG(gPY)BgEKqgn6RSgZO%9G=ysq0i0abWr(g$qAN}^MOqXH_BCdG z6#Av!ap}Edv1z?5_NHPnbgND{#uH(6so+XNQZ^FVNh3cUr= z+TO(SG5fQelWg-zrg~PWI0T9!eb-Fb9Z79P-30N^+i?@`(IWGS(4#`(8MWD z44$6wJFJWd2-IK@=P_$xb@Q(UE?Czoas*u2kL6i+$iT*j6oyCNXH5i+Dsp!q($}nr zj_!yRsJ70?p+Uj#!!zQYXX7J`VL+mR9J=ifOFZ}CCVs0WExsK*0+|bZ!v}|?C)ZC3 z#-Y;Gi@|(Tqjbn2g^eJT>f)-zE`Jz7`2rGJTQ8am!9ha_XEl)7_pT%Nb(x|gV#g4Y zhIC;6caGO>ef-quc5HZJzz!<$5a!ntH4gO7q9LYdeATRdHd6kQ<}~VqgmT$9m}2MPd2@aQAO_EQb=` z*do;8?%O~3`<8g5z(;(1)+&XjfkI|}dk!2(y1I7YBR<>#tqJ?gnQu}+ato4b8HQz887=`$upiaW?8v zA5xI+`Pmiw=Tj%7LD?T2-Jww=D~3qFt0+p_?1z1o)D=?{t%QSyReS%CXo5F?vpd}N zagiSkfiXFN=tW*NOK=j_WW}xNJ>BVF!vCV0*~&ZDtM~AVKmOM%e$cO1{I))j$5(s? z8U34bi4(Yjn+s{iC72^(ulREJY9x9aeR{IeL|C|IhRq!>vE^%VBebosbRJ5mM7Y;t z!9}r<;fblmL~}p?-(^mg+%GpbWQI9L(k;aTCsG63>>O<@#~drf?*>~4@(sTjS-V)} zlfVsb!@ZA88;A>Rl8r?& zIemoL84eVU%>Wr72feW6?f6AaGTT7-yJFqqnIMPLcAxs{T{2CP1bjjHorE5vi63z2 zR9@scRW~F#@A>{-sWys&L+34a(%{S0-c7fzH#Ns`(WWg1=d*9cbyKWyb9dLzJR9l? z?}+xam8X#bVmhd#grM#)5NbK^VEW7R=iVF!DW3CoO6P-Z)I*6^D6`loN4> zs_*GGZEL3vG0mn6KTnGDdzEP*YuVC=sApzKP@{p3mKyO0i37v|Z4+%b=GGU{lUJ`@c3sIH`Q8H||m9Cb} zH`YvbbvM=58Gn9PSaki%Bu@b7@IM5=|L!ODUvxT!8_wA>OrJWPX@7H)CLW!nRiKm9 zoku6j%MBcJ>i#w66iLurQnFV7p?)I5NK9caIc^6NW`>h=@8W)Ox(P(VtIM+rI89PZI)v}xn^R&jNGj1-|)-E4ky}O@Yy&t!n{$RmE z*vCfa-O;3O`hxYpSa8~={>8Fb_BYp3Mq{d#lf`?QeXf6E!T+Msx&P0NPS2-Cr{?SG z|FY2;;UxlC_CTuX+r~pD*Gx0#?X2n?7ZJ5GOG)Sn%hQs`_!NpG!b2uzWCS-5ps-kP z+^=J_h`xeKu=8&-rFBm*n6}46U9Cj^zH-}Su@_V4zD8Dekr&y~%t#nd9c@=VHu+f& z9@Dtx!>f1pvv3O4WKeDxXhkILDr$SP4~8ce>`_E{GrO;qk)xTYO;y8xt=yQ!1cL!c>x`g z>k$nAA5NEy=hL~b^B~_D9tS|Y_0@QCk}gi3kvuB(U19FOfH2#8>^yx*6_E#n&VAG9 zNvVe#eBVK+JLE@Qis-5(oA+ToN`Jz)Il&`!60TEg+bQc`m?7;Hm88!=Bbpk718 zoe&F7lWBJC!-d>;p0wN#*xn+!=?6ALIhhPB>!AcD9IbeZq2HbPq8gO9(5Lj0iVX2T z=~fVB2Zzv~6na9y&a%&uj<)gp1hFqVGKw_Oh3%Q%A^J-JogL3qQs)r41J3Gk2zM_g?f+7cFqeq25 zlLnLSf{+<%pvxgpZAkxCU6EsK5!JLIlh=R@~Z3Hv}0-Yjr7DhPRZ!kR{Y@j?@W+Nf=@L7NsA@fM7|7dpmUNe{oUeR9hnQ?4!Jy7w&n76ZC< zt$c`x$e#+U+%eb^Q*f}}E%W`Bl}Zk5(%2z|Loa%HC=VM|va`?H>sfdw4D-8YE!&OQ z&{kuWQ$yJX(e?yzv=AeiTIJJFZtEt<88b_2)}k z;JfJ(MF>?b0s6NTF^7zzUwTaJ+Mu!gC>T&1tIjLf>O&5Ew4hp&*gTW=Jcuh4+sOru z!eXCAk@2g11Q&me>-^??Qdn;+7B?bxV)+?Oyg`Qamy+CMzWuO1APsg`!udkTtx*I_ zP^~d9n%CL55$ePpi$E~Z^D`p6?aI++h)4X+TG!0UR0VyE&UPTnfo&7$-PqKzn_PNW z(vKTn?hNrX=JY}>FgMazrECOw8*K@iih=s$QAdi=50WooH|p(2=mc_0?FJHB6{u)9 zU7pYnF!)ZJ0U@6F2Qg|Z3^W0(tz#wM^VnDx|AtxzdSG``&MF*K|Ni-%>^~YwKkV4p zqfnp?=)3O?H�Se!w%ZRA2DuCk*cVgh7x05e)wOKI21Yje$)-;2(a=qF|msXu>SVz{VsOVVwN7c`yPGeoP^^RgA_8&sAbPs)=+Lvjnbq7 z&$5Ol{BB>dG8bD@q6iw>!PJBIoO`}rQ$ZI&I)l|1>spY>@tDn>{bPZ8mlX~=F4@o2Pca@ZSj6*{X*zp&`M$#)i}5+ghDEzkEYTi?17#!YVUmX1JA6qQ-#WB zDe>$39Va+^msoGBch))9buP#Rpti!wv|Qc}b+ahdU>n6jOVLW7+r>;v`DQ88=4ua8 zi`DCSZU?>qmzzT4Ey$WZK6;r$N(kh0n@6p(uvr6?CbFaDMLI9N<}bo|Hp1+Z zZ3*y%a<*^cNPSJGAtD8YDgzCKRc}A19CLD~2OXv5YQ3y>dGYN9a#7!`R$A`O-m5=9 zMzT`|onH}R@PCRR{{!FU-||J^KxpVFq_5FFeoHz7{U&xTXVYeXZ)H!kT|gWc-_76h zMJ`?skE@H5wX5IZ9RdQKbY6FY=#+hp{0b=X75=@PXww>biAC$1?v;)**$l6{ zjj^E`q{r?1GF=_d>l-3op2mgdrpDVr6;BjElIy6@(Pr$ZsAs+WRl&@sDW-(TwZrAH zzTL@cDB}W&T8M+wz;ND|ITRufS4{~>yKW6=f%X_JHjWLn);qz~MtSJvo%B0Z()3|REqvrBq zKWeFSLz!*S6iqwqOQh^JFUBkmdCqp6*qgK4jV$Ew@)AEM&fw+)thPIkzeh=KK35*c z0cCv|oz%;MDPg!BkDcAqOq~l&i_1;{0ujm&p8Pg@qzgfCCGfo@1J%QGb0$!7hXp!9 z9(m2ceNZpAmey^BA)q6)q|Ps$H+p8n62?usK$qzFLAXwV?SgPes>5-lv_B_gki8V> zxQ`ODK*c=IpS^w?R^aESC)<#khM`Iyr6H*&jpL^gNFF~p$|e17dA~^VF}fEUAvf#qTsOsJ?mjhKCVQ5Y+O5p4OdyC2#}` zt+^Oz2n82Fk&=>li>n+MclRq3q2E3~sTY}gM&egl4vBz2mWunjWXrJ33DiU~4c3*o zuOW8)nPVmcVb$4J7C2cqUG7{HhV*ecN;I|9dWT%%=vTArRma!nNlixhF0&~4e&=S< zR!2^RuXj@DWTLXqaYg~OwekI=Nxy`F_Z!?N z-#Fu?)gViKe9{KLe@iV9m1uu_SH=>Q!=Y#yO+nyPUsSf2ZpxwVHXou#Ef>MQafCgB zw6=@D>VK%_2H+<;gzzVLwx^0ka;_7a(D;`_*69nghN8q?V(J(H~Un&r?}8A=ekCf|S$&N_iE zVN)#f!n~eIRJ9$Z)CUia`|>k-T6Pt3Txg{HObDqLZ>?p5+@UEP%i7dXZGuLrP!C?c z3MUYr(3yD7P?@9!d~l|C{%5|3cQ19$@qCd|KZdCCQXIM`#s)}~AQ7T(&W9d}GG^is zPmJc0CpK79nx(CYj*8BZNE)vR_5cE5Ul>Yf7%E2 ztn$ql0s{d_hX4Ty_>Uu{fU$$K@y{P-H)g?C!u-r^A^=uFeg**Zt5-q*c0o1%FH9O1(h0PmEEJ4WfIW|+FsBi`Z>!G&kH6K--W52c_ zPps>#hz=?;^?34z$_C!}b1}E?7sx?^W6rgKxCRZ2?@3CPJR0bN)`y*Md7hE&$)ctP z&!bAOgj5C?W#%8WqO<4$6!k&|5Dn|g**&Bt`>ar%PnVCRyLJ`db-C@rA^HX&SoGtn zZ7^o)Q0?V^5VpprQ&^bCJ7-}mj2(czOgrnb3g;E+*FK#OcAtPg$=V9K$SI!9)udg& zT>Bn=g;{I2z(5X;B_OA#p=K1}YTurOMvDA3)bxOehdGwx4c}M{Wn~tM&CA?OA)f^$ zu+JPZRw709{huuSEBQtgcfz$O;~3E>jOjre$dJnt%W2M;vJy(As!Z%MlJ`6@mp#Th zSI=ZWlunxVO%KA7qoMrin;EH39!&PCkA-fYYHe#*UsjmnZw z70(7hYMu%|tbyGcs|R^SQx`vEt}2*XoW7mpPLRTSN9!VDClFju7D`phtJ{%r6>bw2 zG!TVb%fkM;5DmgOcs1RPe=|(wn!sIx>FcMW3l;xxoU*pCMvy%=(AX@PK>GEPmh{{b~!e5?|OH6=5T#-ac~M$c_w9LFAtY@&rVOT z7cc8hZhT%;CkOc3zq~$B%!zdBBS5`BIVyhK98E}AT=2Zz{k1ttP-nU=GKUZe>AYnD zYbJ!JKew^8cz-nM#nm#eb9ZYsGo=pp?X60x6B+JiRs9CJqKR?p-8I2l8gy+}atRVj z(K}KLvQK;d4I*nL(#7-Ka@8!__NW$Jiuit(baPaQ15N5{2K%Q?n49(`mTDc zE8csj{`^AwhW>M;a8~*cbFZOJ2yvzG9Y?JDb0i0h zzC%GO?86p{?~U90^lwpckLHi9+&VD)5`fHCEv$koPa)~r;I4t0C%0ZTWEp?-i+Ac5 zZQ-VkvcY!Rx#Kf~aBfwwiovpTjH(oRL(!T67u%6m{%Lu81@tE(hPcTmS^PfNWf;w> zEn1F}FJPY$4b19!`7Ml?i&bf?u)-sG@a}@ItKg5zQ*tT$N`?QX`cNm~IctJ79rH*} zN{`6Gb9AqV)f_WR!lI4?HTH6|XBO3Qj<(Zp=V9$khuo%#Cz%JO{2E<+!7UCLtd=ET zGK?y~U6tO(Md&EfbWe7D{gi+syfMGs(YLo1j)9MoiXR}*77zXE1Qw*Okw>AxT+W~r z(vRvou?#abN$JC~89wl06Xbe8D~C)Zl+P*9015^gK!ZzyAs#pbp?f|rlDL-jhjKDw z0qdazLiFDFvp~C@-1*Ha;;LR!A4BV=s$CDo2V#U?70xD~V}w8y+e|qR0o1#`liWwgRKjQXaZahk41fNi1bk?hvpY0_yh=>;PsY8gY zf|xB)K?IalcV_BAy6y#SVNXVaZ`+ld${`V>H%{VR%?L+V?&1H)QO_tDeLUGD)TK3* z>6e}L7E>moxkRreYkj||J581xET&F{b8y@(d|D(b#)oPrlaZw-5a_q(ymy=ovm9QD z+4$-|*>;C$4pJ7q-UY)pnU(8yEshUYMMEVvQqHENKV@4rDQ^ScnL+S)vnfXz3V$RN=V==5q5C)8Uz%aPlG?ok5d`pK50*ztU|HAzLXgrz%4+un*0RX_Vv!js`v0~ z(4&&B^;CCZkUqt3Z{vqJbw7;W)sRQ%cz;5H&PS}*wb~m>N;77 zN5t49{H>hOtPg^_P;9Kz5-}~FRCY=&_|8`>HWo>~tL)kHPX8`^7`#*o^dtwhUaDMVEe>1eXa@=k z(VnYmR+&_Qh*neGpFfKbpJ6U(fL4o7di!SKg&Irtn{2tyo_Mpg;l`+eY**{D+qJHq zmRpWDf>G_8;cz`+T%fd&;3Wv4WXvm-OCcynxS}g$Q&`mg%((v5XthjeRb5)-)zuoS zl!gd?vywJ;+6P_6I#^r|w^OIp`;!dfF>Esl`pz`YVsk-kt|zy{4xo!f(2MwIYd`Yv zX9TBT31Zg!?MwDYl5ia?hvYg5B@r8E=G(NQf73%y)C-PIt|+FDNnaT-pS|$l*4iJb z_1KcHwOke9FP5+qG4|&PnN^m*-@NtZj>|!aXd5QE=^~c9X zO-{xiSYofo{pS}tuE{Tc>^Xm6%hHX^!l`&KJc0)&% z-0pS67woC7P^rD#?{7{H*Y5g)7InOCckiy&*6uFnfiLzE9a?yikbkr{FSmKE%g&MR z?^r!{X!5PkE!pNDHbl8qlNjIIUhR9uIpgcSW3hNaTKb+eCB|)=+4b3)m2x8w*He3Q zr2ya0y-b1yv9F}w?y$ynTx3E&_H0}xMkFs-q1ULGrPxi%gA-3byMXj-9Uz8CCS6{I zTD)jLL+D!Y_YKkDl`?rrm&K0VBUjOYUX{EVpr~FAJioO5gsH_JCSa`KQLvK)?6bye ztg%tY7LhtHzCgP@VJdSNRP_l1qTjX(ZD;}KA zRL@49HhAV}_XkrT{0 zQ2MQ^S@SSAiBhOi_DAzKqZ*ZGGiu1fN zfo?0lE6Gfbj=RkV$6ZSEVpKf5D$ciAlQSoK60K;(!f^qT&vG^k22p@80_RdqC!r7Jge`9E!E?bQP9S@@?E%I~)-(W`|8}$+JdB@Is zLN3Z=UpxEk$mlaf@NQ;dArMntQk8)t_PKQsn!*3%@(5+7+Oc-srwULkc z^blt`r3GbujI)js+o3!rkW0=6k9S3dQGj;6ta7^7sDuUA#193|_9FIU zeoz-Q&`ncHtj(|G=YpFB>9>KbHQ@ASPQ~NYGc$5%PVoDZrX0p16{9{VoJ2fmzc7`kqV}1_5)WFy>S`wO`j8k8_T3<6HL$?xSTqF0RN#oH8>l`s z&Aph|Bc@tk`%_Ojw5yPqr_aggP#_^8IIytAnTy~@#b837u{hC84ER<%H_Wl%Xh43A zL0SbVc%am8otc?n+>wI2Pn5dxNU0nr)nP=&++4#Fr>sR!l)4H$EQ%HPUBnhkpidj8=H`j=|Oee!^@_rCr zps8*->@eVFysr1LBU|2I`QxV_`LldH{bn?uTnA#*n$=K2sJp_jyne(Xc=#_oSCdq0 zZio7yt!5ZP%^EClCI+5KMZ%dt(nnpzuS04`3gfcTN=~#WgAx4Nt`bV?OOBrzbHW0s zlOY1kY|KH%6QxQ%P^#+_rAj0SegoY@ST%{@wck1(`};Kh+`*D1_D@VD{E4Z4|8Yze zwsq9Er29Y3eFr?2ZTr6+Wfg_8D%m&p9*W!(S)oK_6-8N*y>}!UGDFK=WoECC5=BO2 zG!U|hGWuUPdWxr~_xC;z&-<@@J``u)<2cUiJiq609q0FOf)epi2muTM5%6FP2u^^) zL1+>Z41!F?^A0fU{B~@=d0n1x8FN{f3dqq|h3GCD8ZMhg%+KV8 z3r~#dV0JVjO*DA#)8@a4h}O33RDRf?-dUr}Tf#G>6XSA)CF+1ol}=%;+k+m?X>U)v z`!sJOD0D=qvZt=I-^?wc4|YICUr)197ZsD0ssX=-f_)Wwo}$kh3ZwhO-^5<8bto5$ zH8Pkm;7l+uegCLdWVb_ZN>k^<68uw0?`s!smd>kVjF`u+r71!OOnhDSf;$c5D`kQZ zT@A1|mj?Xf$B%R*_uP({;)lcZL9O~pM|~$VGXtdi!iG8|M%pXC#46{hO79$1Ja&`c zfxm6<1^wu~WzKhePDdVndLYK9C?7L&!tm9Zj!hqC9>|$%%*z-IpOI&q$Uks<({ph3 zP{D9vwk~LHsF`7!#d5gleG$FBFwsNX=o)4al-T2Q-vg>E?G-#;64m@=OLhoT!f>t+ zry}!RcA8uzM4A0_^A6BGT9d9l1S-5L6Kx#g5SM5OG@Rlo?I0p7RIHTMap0-a`Q0-~ zigtzcqlN5QDc$}ByInBxXDT!$lHZ0OZp2&^?x^y+b7encSR-FUoTLi%!U*57?sHcZ zcD>N>d-{ZGyXLm1>bop`kNZn-+!c?>F|S7ND!vFSl(BJ{kK017866Z$j_7+gd17`l zM9o0th_5JXi?DD+3v2crpRo$XYF);5w|8Nl#lEG-1zi!Pj9~}Y%v=*sY9pByiW;<$ z6!mXSVx2HmbKY9AkkUnVs-xo9k22mSK3qJ>FaJ4n`Z=NOG3+Xj#jTawMaOvcU&ZFI z8a^tFR4$o$KlE*(zf`h8FXrF@w-V`v$uE;(9Ubp0hn_W|biF2(BKqW2pxTLMiXkrN zk_)R+hh}R0fbU(H&*+b}P|Z^fX3?{-h}Cmjm)+uPL=bRqVT>Ih6l2Bq=cE z+oGI9KV6GfR<4I<_H{!ID~o7S!=0kEfY!oYug>KlP!EmXG@rgYdNe8CAphtwiACMu z_9s%NjWO*CjUU<7L?Z%od~Jf0Mvuw083$Bvk7GoZT*>EWV{0*94& zm@<|qYV0yawJN$-VVI&Zyi@@2F%e`oxy@lbL~+1cQ|&xwK8=5%(w+RngD3vbQu6pA zb5GV%@-4R!3p;gWB2&sFwaMj7Tqrq{+WBe!mx}QvnS07V%iNDZyZOL_WtXhtxL$Z! zf~Q{)3!!0xQl!$*8<(vPMZe;VzQtza7i$M$GG-k#3Cn7Fx0zP`JVUZVvBoo6Xp`FU z`**Tx=9;S@wU4(v^|T<=C1vF7e%c-yT%A8WlY(k6ehC95$t@*Ps{)-IqgZf57oZoE-jb7d3-3?EOn_LQ_uD{RLY+XupTpdf%r+qca%yBP0yk7c@9p|S5tRYX8t(Q9NvbazJR+kMtGg&>bEhuHXzmFm%| z4u^sSZ-&UbhL}=kN57nNPjerADjK25w{CFya@XACRs`L2BO7;Oc}=#DWb|WsMUjt% zIT})q$`7StkeV@R#_UmcHFA=L+Gn%JuJ%j`Gj9HT;L%-GiYL9Z^2FzN9;Ys6QkQi? z&Hu=x?o8+1PIX>;+?||BH4Urp!IG~TEoD+2E1pY-d8)L8i@CCvQ#dYNGg2mBGrHMA@Z9x(<1wvTcfz2*S$60|K!H&ZTz`j$;r052?_6A zH4)rlOfRT{DJz56$69VZKYOTR$3T0XIf7H!|9$DrlKn4hosU)R84pdrn;KKj_C$%x zlO-Zt{Bd9oa=&#ovXEZp>wy!G6@E^oqLxyr)XS+AZ;*Ue8s}EBukcI9ED?<17*ImjUiqd`B(oQ2kSVCWN1#>8A z>|DL`VG3TN>{sp0qyp$Cmt&5}XG`xqAEr=>c7YPsc8p2pVsgz zC%^!CRoF@@h{lQ56@DNPT7cbMRfwj?^17w)F}Qg*jo<+1-+(oMGQqgvT&mM@k` zD!BuJ z578x$c|AR{dzVb!UA-91+%%5Yw`-O!8Lc9zGruIM2M=00rF$?a#~r0JH!)~4KhCz8wn10Q{C54gflU@EdO zZ|=Y6sBG6h$g#&fTP1*+ee=Q5_RN#*nxL^EK52X)OO8sXcl?4(W{8l``7+{3sc@3@0FOSZ+Wi5Dfe)+2SH6v2 zF0_w0)@C+6#Q+zcXFm?Oo2w z$N(7Vh_QjWs@2L~k0PScC>#a@A}6Ila4?Yw!eL2R5EM-!Az(N>9tTDIOjs2ynq*lQ z#X=jDvMe&!91&TaQIwg!Xt9w`(`dgujkx#hYHw zHGQ|orK85`(n4og=E4iVQ9r9F!R~h#u9??+P*UsgHFy*pzke|6w#}JIZUN8%`fXHN z8l3tC!UB2q+JbydhG?GL7KNl#iUDrww;<}%;WX)i)+FCR>ma|VCIc&n9-r2!p0_To zEIN8suGiFYjfN+3qwx7y$V25Der=;e=~bLom!6wn7TqzBeBRbbZ?rJCqpIZbw+usp#_KBEl+*$gnMDfkujx4SuV+#vbovA!6QXf$_ff!taNas5W3x= z+dpzQB^!N6L0neEy++^!z^O@hZfBFksBL|j1l_GX9G}PaK2`OOIc9Vpacxd3FUri@ z&Suw*!h`+==?jj=$EXkGixl85hXyJ7<#ra0CO@j`4f$HRZ~FP9rrTujf!2#q6Y3pp z9#4#XZN(TI(wWfsw8z)a?rDe#)Qf(QqR`$(h3|aaEwH4k->vo>ZWNpTHW(!56L*+1 zSyt;F|5B)ObgY`%FlaK6RqRpmih&p0#dCR2H{u`^=X7<=EGxWy{dCN!Vi z^Y`t$q@?X%{D@S2%CfMsnVN{!r+I zVS{+{nS5rLrhYDerK>H8UX(tq|Bfr0$Krr>rnuGple<-sV4c!p<2K8i0eiaVX1^{M z67=`mHN={$esf%07H)dmJ8)hn?dWJUe3W0|{Iy`|OC4RuomI{*kahC=gAab2`_kXh zGz?JMu#TYwmQokzr@<^4d6Il3-=wAcCq@=v&4yP9UB!ooB5J!jpC0U<9M*X{KRdQq zIoukyQULpzjE;2c}18bB>!;3FZdo`Kk^&9es1|xOt9P*rH}|dz}=>*pC@* z!E7b@y#h8bq0MjhPUC2}jF*U$JMt2i%vw`)MzHmy@RhU^X9D-krHAv*_B_FQEXm|Y zpmv(off>!UmM>M^&R3Zs->}EVeJaQweZ>*C{i+0(B((Q%-i$Seh96laAM?kZDmWdv%~N!oL*&lN?idN4?<)B= zJIRFvxy@(azxmwJ6jd1&tfV-o_JMSIhb#Df^h>I{C&NUV3$n_25&E0CJWibPp|Y(z zx&2)$Ux!vJeTRYJ*k)Z1!5X+w&B8ICJcC(9jQUwm{F8|hfgJp(F+w1@*y>6}Q&$YH zMi!^)xkUCDQ5792jcZSq~C`FUF7?_XrpKh-RQ#o}%j(w`LU4*AtP>)(KN=!~{uPuX!z=Q6H6 zC$24JXvZ(9-1*4+=$eT@(E%%wkA~A)i(d4CFUWnKhF^Rzze%FSXq{qW1XthWhF%V* z$7i;yTJ#h#&7tG*z z?(vg9QnXoz^*G^p<0ShJ`^hQVn?Yw8wP>t+WOjT+o3(K950Z;u%Vk@aDhZUd9vXP) z(=QjnhAtJsehuI5-tC`+|4~Ws63)H7sjKY9C+eW1ke-s;%I^0^F86c>OZt1|2mSRJCDY$N+HLM*HJoFIwoa+C%_;%=%xr)c5&DN8l50Q=p- zrekBf#C{FEv7gR=(n^h@JwIxjpMuKX91s z>-sseCiN5}Z)fN*iVThTXr8lByGbP-cUo2cx){3mbmlSmXhrR7Tgf(y#4jgCFZAE= zcQ@1=u8FV>eps^gzTw>f*TWH_hL!zCr&5-L@{u1e)INm1MYomWn0gS6+)(JP{kO@5 z1Tl2k;-X9+iD=p_58fMR-0KB6sCR?I6$$JrQ`VB=Laq+EwX2 zH8v0xEgZ>(cFVkOc z{h^gYg4ED0y+VzO7@v^-L!3lk3`Pd3yu=2s-sx-Qg1spqdI+VSao#h>pIyB57% zNbqG|)2o2#L*=bLXiBTNfA3`k<%3g2m&W~6YG25GH9Hk;+WvoKT&3d<7#+W$-J)T7Bi;19XmP-M`^lV7>3(CUk0DJaq(_dK zc(pL3EwIL>+T6+GiArq%hgjD`yC9nJ1I$q+1Z#TkIyQ{7bb9DnaRh~3b4>v z3oxfz(}Xu$50))!DD%dP5-=KE1-R-#J$HW^DsjcT3 zN&fDccd5`fq%IFB??8R!-o1^p<<;TC$M1#QkrnY`xP9`ruC+=2gb*$x1==KaZSIKO zjIwu1!R6ZL-2|O(mkygK2912-uR4C$>*f41b(}w?wDpX$fBnk&^&Rns+pOGGYXyM$ zYPOP@FHXcCc6*8WI+B_1(Qd{I5?@3z@)tEas}D{Xc#9rND!H?B&c{v0@8Ha??V&gW z;riQ%%~tUU8Z%?TqOt1_kAY?m&IWFknAUa{qc*7S?}-zYMPtiZ*~<^t7dJ;tm&?3A zHht;zql2F!?W8Qym7$}N_xY|@<~n#)yo0-5cCgV|q+9(ENFVnt{$7y~zLC`TA3hIj z6!ZnoYL%@h=qtW#{gZ^CRV0XW`1a(sed`~>zAPs(9h{3 zj@bJ!`iaZ_w8$Hw`K?ceg2{EmgjjPvb3Q)4k~dv4#fx9Z@vhGHg)R;YpY3w` zIczPa=I84KFbvYghIcC32Zz7ZILo za&o-IaZ3{V!KDjhlT97Ny)zk2HTByfY#W4;1zUMdvX3_$jaM={un>Ik*?!5D_D})I zN8 zPAHjOd=;AO;9q3_G;Ru$l8C@{coInQFHQYVR1!4U;NIEKC*(ok=ZjjfcMU=Naeq}_vA{o_`H7g{$gcv0qv2Y zdOD|93>xyWkBl_Q1+*!+`L8a!h6bBH!=d)H8L~HAv<~+yE{O)D7sLh8_+2#$*G*m~ zzPkDK6_s7FBls*%mL=kgm8d^r*!MgaGd#ceT`S+Q-zC!gyH>tM|3J((LF1J^P%X(K z9q%$J@22p77Y%?l-PU#Vq(;n!=Z?kQ;4~4Tb;+|mB$pwgxl}>B{mQAyky&zSg1+`a z0krgHFHdQfW#TKNuC}%`A?inILW0~9@#W{-a{|^82U`&naOxq830RRUXc2t@qvQ(O zB{6{;WHEscWHABvEWO$#F@ZIu3Ek7bDouD4dz7i>G<9~_*|G!i_v}^wT3p?&{!eudr?YhGMr_zMgy!S_Gf}P}lQ<^aI z>(YeI;@@X|hkhzem|0z#aBOvH!h8L1n-T7<^46zmZgniz&#tAtJADs!U-+K&)%|nU zS4rS=&I~0LoqM(?|0cUg^dhXY@X)CQZ=!!7hmbSBvu7ne-}M*gN4iG#dwVAcg>!eO z;YB#1RWeSOPbecira1&dN?1#S%C{FWxIb6hoaXcVvV%5=<0;GiFe{Zm>Sx=x-+0qw zePihL_sWFKf4?$8k+ntc0ZqlVIESqVY)?o#<4c3jaT&z@Q9rBqi~3pN({zYQN(zb| zY6=R+e?)rMG%~jac62-hkHdqJAPgAT*5P%ftZaS7`5nK=x1GYt**y$YG13F0Y~Q1;B)q>y@M#-%Sh!U)xG z27z}JiIxTicg7Etj!e9&d!H?NIrhr~(Ye;)@q*5rlnFaVPG|j{;#;T;>FIq%=#Z}% zj4UI$X4H2~p0_+yx3k85^1iGnPx(HRkI#|~bJ*%$u@_0xW=(q9@rDu0=PvBIg;Y)1 z#wB*Sgo`&eQtprdi_!S41Q!(ZR50g+Z7a&!^~STxwx%zcZ3qosT?LJ_RHF*7&q1@E zGd*IJWw*n~0s|9a6XsuD^p2BIUuC4K|F_IMxdu!O#Z@DlX&+eDB>&bDm(7R3SU zTv20I{mVzhzVhPs8Fgn4h3gKw3ReqCT#PiKqG$J_yLct0Xf8aUIzLnqqHbamWs>S8 zljW{y6u)#!tAi|NKQ+DJX{_i;V{>?WS=O0BsK9Xe?qqAH=uwV9Dw%MZs{YO!0GtE(Frz{Vpky!c5YJ;-!PS})ax!gM+ zNqOI}&StJl+`G`K%(O07=uiiCja<-)zMSacD?s}w%q65%F(4v`RB6u3p*3-dtS-Ql zB1c^)#UMdXSJ@&^e1M(9=(CB*<}!Da!xMqeRpKbZcUV`kNb`*Gba=kAbH7@c_kk(5 z+(ts~V7#8$y&&}*O**|Q=H0vZdqtkJnbr64jo`g{|6?+p$McRAlEE-_M#c1u#y!ka}%|){)to9U33Irn`hZ_^vF}$bw}LrAd3rR zwgloNZKVq9WUEXp9w~R$Y|_MgnR!Hw`Q%D^FI~~PFZWpP^@A|_!?EYEiX7N9mbiXf z-(C76HNodv_wKWB&$%bexTA~1kb6nIlvf@cK2+Oz=cc;Yr-$WPQ-jwo?bkIp^qwXt z`MbKnU^=+=a^87!d!Bekx;-ifq|e>bfYgLs@$`~-aAfCZsk9?fE9#|4DsFraAfx%!IU|MrgKBH)J*BM5HCRPkJI`AZLuTWls<6>cNj z4ruvww4c(tQ|89If5`jGjvDu8<1*AftjYXkBmA!=0&Yz|xD$591*yOWS0&2}pu&&N z_83!)o(jEZAr`Kk_+`$rDoRzpaDXh{;XLStsG@VD>so1c6aKjbqNehX0U~ z;b_jxHS`O@tgM7rSN6`u2tFJ2)BS-8zE5@t@$f5FXkTMKM`!t|g)jDUnV=Acdtci7 z{a3YuTm-kygr4wq(mSH-OqLhe%q^gQ)K|UncpUdw&dtjfERQb(WD@Kpbi|WiweT^m z*=x%;x*2ELyqs9|JgB~16!MAQ&2M3ys55~mxvB7neCgZ76K{*c=5l2c1TrZv=l2xNpBRxeMvrwr1bAar6aGXjm&A1_wTp z%JuN78^Fy*~ zvT3bkmC>gC=XOw0P;8~4pm1GZK8ZCqlypKtAP6`Pg8+dcNGu2rBS1koFu6t$gM~ri zC?uSOBmMdwR@W#?ZBTY$naIjLtTwG|`-kA5oktf&dE`^GO^(~KJUDgsbFqVkuQIC2 zC3Mi`O`k-L!)Jty`J`i)%`oy?y2#Cn6Aa#>n>;xf4;WAd+T3DDBlM>5IUqshQ1E*Z zh`w^1EGM??<`LPd?fo$d3PqJY3)_@pIEu#6l8iFU@8N-F+nE6SFVuj1Imfy)q&0M=cXPmSrpmYs3oo%8ij#(`%d2)34o$-Wvm>3%cW z=bEE_$j>Q52~GzObQf0ey3PcrD(-^}C{97$AE@8UJmi^EjkSEGc=6bl6g@b(zSUX6 z(AH`2^LQ8)XAo1|t2c)$v-x8s-Zpd+eG(310@yzAd=`Px9eSU*!$(-)v>Uwb+gs~f zAM(ap`&INBN(b=-1x zk_uZGc2CmZ{S|{@>nzA~eM&uy`0vLP>_qo&4BGA~axWBI+lMV@3v z_oDg166Zv|7&n2GNQL9(Q_gcqSBqz1-CFxfLu&kDbuCIu<`+MAjOOJvWaO!;>UBH; zIa$9O#BF<%n6}Swt5ik)^K!SvUO&BMbfa-jOo~#(Q}jaK zx1e8Nz3P(w<<+YhhvlnRN8H1HzIt`==c`wc?^mxn!AI{a=>Ku`D)#%;s~T_e)vE?D z`RWzq`_-$LOINQR(5|j)HE@3CC9N7sK~djI^T{3bVzQ+scx$pu>Kq#T--`&~)B zRFMP1pvD(V9YRf^<5XGVlnT~^=gqEW=C1A#N?&Tr>fJ}d^<;&$3vkc|NSRdEZUBxa1kjl=Gay;56PoDO#Soq_PavP8(|(&VEx zu0;_1z!Ve=KTHG1JKQ(th9O{4nT1rv?>P36gn>Po@~3zr8;1k#psO)yrt7 zu4f!Jiti8ii6;xupY#eAVlR>9TUOK`zhd1B9_yU!2{>PAo}QqgW<7>HUw-$gjJnzP z>sYj*@Vl~uw@+6Ns9|eDxAW1{?Q5;G%@>vld8C?=yb^QvHA)Y1sdJs?;vy<}V=bpE^*_GaeefFdd-h8)lRVckkr9XeGGAgC#KHQqek412RF zRgKOKFIYu|`Yxb)K3d57R<<}ltlXP(@7B{q=p(G#OlY)pnJN9HRvMrEN{`5j`Ze#C z6t4o|4@{m3@4h5^sNsVNM|hun8(BcL65jE^?>)8OqfF9nJuSGGanj>Dy9-yhnIGXk z%P6?n&of+$^)SO{nBe?O(H!)vTFy{y!4<*{N+ZN$rqHsISBPmF{}Qr*Y8gcAoxYIZ zrlf~Qw36j3ZgYH#Rz9nLs(lyp-nrSbWUU91mTV=5XMD!Y>eLSTOj-5aGi_6(NsNut zj}ybE+1*QUY-A-1>Qha6hBz*DSn{{myE-r{(}(?c?Mm@;J}@aj|PUWUGVY zV2}CS6vWsDcVa2&StV@8!YE5tP`!sEE2wS_)*|(Ze{>=@2&I%n3w@Ebxw<)OQ_5IQ z0jFl-SnS;M&w;Xmr^|ZnW4&<32CVu+03-E1WjiA)*4&YLh;6CE(si*q(XTy;ON`V^ z@`-reJm|`WevNxQ&r%2FVr)l^N?sNl>Th1wyXsf#>HV&E<&dsq&vW3m=Qgkzdl`gk zV)*u}V!HmF?oOgO+Fevy2aU`hRcCOG?6B3|Ak93V>T=q>!IJZJb16;2Ep?BqS$Cam6luSs2)Qr>A znP)YhRpo8^Dvz-s-0%{TCpTEi7Hi3T`$#!`w4QMU>ntq(&05GS`i`2#=;6Zn^W9>w zP4{?sEAFJ;jV9K-p_8Qkcsio_d>G+Y#jL^2w(aNU$D<6(wtgTQfDFEzTamlE%XM#A?&|CCiCc|#{Dp;aMXw$h~S&P0|H&qwsS(eqi`}S0JN)CXJGSmE13DrMs>8e)1 zjt&PyAW#w!*un_}5FCLh!7YGhel&jKhe>UZi}cT3Dw7w660Ss<;LB= zZq}2e!Pkm@h>{YJDXwjMq&PMZy2^bVOix$idfxvKdoRPzn#tWQ{#u-%n9+M##cDsy=~Ln zo0h#$@>{FFXkA+g-3j`e->xz@+IGSa0t zE}$$vOEieQ@Z3gA9g#&LLqm6bpL7 z${#o;lMKW$@YBD2&(f}yn0@UiKd5YmTDF8ygSmZ$gAU7Ve9i{UGkk&$+FaG32Kf7Tk7H&@u&?>8zaa<=Po zWP^hGiF;j+@iBc*tM2BQmv(nA%+G#FaFbb_ni!k-vN+Q5tRt*d@8H1?bA@?f78#>% z-yW;(Q4JlaeItMUtd&@-u-L(aM*aP78W%bfTEk*v-N?7B!tydQB=vYp@~)lu-1oR| znT+1wYU6Dk<>mJ6nclbY+0PU68KWz2+XI?(802<>luV&Un$-iP-|YTqSRas-skwB^ zO3fj~zvDUe(dQSRE2na)PIG>6;?mw38RgLXj&E{Bu4?$v)JJx;z$4Yi@r5<1dcx$f=*ZTj$NGcX>pakOJuZJ?f8AQv%$el zRS#<)Z>ejf5ok`z$iW^uzx1-b#>6=Q^*%IlcC|TgpPq*v>&u*z9BVVZv+V) zi!DgFjtiKj6Yln-qwUez;gVsCwYq$ThVpvfut48cHY5Y>5mc_W{l}UCnR7dOu}sIj z3>B|lhHZ~<$TC;i?{l|K)6-CrK*=_ z<{5GMy*%OyJ|ZhIhJS3Q^MN~Kv}A37VMaob#Vs*E&(WAoyV98o^T|Ezz4G#Rh$nyA z+x$ll`v>>8(yDLb*`>ll&2u7sRu(LrFL>bd#7M!mnE|+1nfo(t$(l-XdnfU}06qnZ zdlNd4d1kOZ>Yn)+S7^S}XUJUhSwnWUt#sune02B(<}dyiITK{3ZdqKddwGOM_jV1x zQ7+9h>d~~8c838ihc`Hjw`gP!XqJ(C)bx)5-Vh=09`?t;g~!3N{`XpLcG(QwFG)M2 zNamt_TqD#iM}Fp_Eh}8~oVM&4PX-8SPj!HyrPrc4Xup&DYgX0_wgeu*Hyn*e3r=6y zpKw%yowW1gtGEzW0)H>V^Xx53)&i!A$D+avBF)<>$35^T$1v>hB3c@Q}fx`8{9+(wnUdt?{HX~lH7&J}Y>zgDQ!I2FXl zP`5>WkWOotFK*j-34hbLOP$x0nVKvmYv~Mg8vEASr1Gq(A6%4ug^MPedZg%9$liGS zor@aYO0<^~mn*+4@j#w;vlK{_$qMgMzG$G4-5Sx38}HwgCP=IumohG&$EK{|qJycN zC0`GGp-j%vMqYWd<)pRjOkVmiu4{fq8trDWGIZqhsCRGe@R2~P$uf#;a<_U>?~o#4 z*6~Y5hV`B$c7-R=JI6e&ud^K41R-ZfGhUz4GVuBK#ys~d%_(kbiJCcXcH9;(iW8e^ zZPnPbqBb3eSTu<$zql1dDpy2?ADt>U_=$_gR6m+bQX4Z$Zw@{%-SW)&o>OfZyX!oZ z>pK_ioUY)}KM8e&zqJ{opx&q7F6@4q=0gWI=>$_ff?_5$`zggdh<#jRYmFjLv_Q(! zDw!V0M_w3K(TUHWS~+_=JLaQu)p%^)+h_sXL-NpzMQ9tUUbgxGsoe}^7iMgobl^pf z$<=C&QYF;>acx5WkF+ysW=ax^rhLBI2%LD!PnlvBh&zANs_d8;M>p@sy}dDs zxjYXHB^RFp?F#Dn@O6aT+{v$E;-H;+8`sY1&&)Zk7l+BO+OsS1=#Zn?Ss%lfv!h1~ zZ51Ai1oCP6>)fg4D^=Lcjn!pu*%q1cnUYR|M&p!XKT7caeA!s^%jlKlsB!hjrR1o$ z>wfLBOSKBS+VxMeD&5PUVouSl_Ppxmt>?)~U%t&)GP2L7SYB*@5N#0)E!XtDXXCXV z$1yLWFpJ$9qoa#7hZQNQ*eQPO?JwiQy;*>-*np3%6wALTDflUJJ;u$_2U3#IA?VF;@Tf)b?-b1kO~S$;A6+CA7`Ye zpfEGKXkch?(LmDrw4Q;@MPmyqiHr7s8iV4eUmUB(P+2p^X$vzmBlC;@-5_3T1~D}` zZDek3^s7M{Iq=3zz*k#<5B61qJX$k|xq;a)NB9{A=c*BA){J0jVSN!GS(g846s}dH zfEd<{VspyW#M;>CKRR}Ga17TBV`XGu_-lhg5R)FXz*p3N@@x2-F;*tnuLdcw3BbOh zq@Z{PjB;YtAdL)vb$-#Le5VPg(NV+j+4h(I98 zd0{9Ljs(GRL^ueG!XrQs2%JC!Lt%I#2L0EVPQ+0?_}-Y|!YWK$JN~wx)(_tMb5^Fp zfVX~>*2-qM{IMF@zzejvGo9Iw^fKKMb^==BnwkRU|bL% z^kroC_o?f#3gc(gdiZvo;c}ZlPUQkzS_MFMUIo|e;Ci|Ad+-TFA{c|lfiK2k7WS zf7`tpMg~@=jn!<7tQ_R5ENm=I%+CV*0s=$8V90&Iu>?G@FTfxm3<(7W!GH}F1qUVs zu&@3#&hVFezrJ2^uFoo*<|^yq+zo*2#Va$Y2)Op!pB96`qwC>XbqkA&l1^v{5PLip z1%klPK+w@RJP1Psqd;f`1O|Zvj~*J2`)iDwxZrPoy%^MLud`d%1FliyQw=2G(zZXj zRMuc!Txw%#Bi{>ZV>tQ*6>un`UAq8yn*ME<>ivqp5aD0~91S6X@Mt6o1jhsW00xT30_zrn z2*p83NHmi8*Eo%7cIvkMasjZhSP!>u0A!}&Jzg4sYoWBuS44k69A5d2?5*YM1VO{W29IQ{a)z8}y>95%|^>u*J7 zsgKfiAOK-N0Pe4{Lfvhn1Mug+I^tjnJgs0N6yWJt2ndNrlPw})K{$X~f{=J3gn))2 za4;m{uPw@n*%inLJO$xfC@3;kSrqU2FUDnKjN{}nGC2o?OOSS1_VR~uZvKBiTngrf zM)n4$OpS=<7fmiY0N-}T2kXxOf;0mJ zscn^ADYyRpApPdwzJG3HxaOOd*99Dr2t^|hXb>1n?$JpkLO?hKoCLUn0G$7TLkciw zf3q3go_tNevgo~E<%Pqy|EJOYUpXYg%}= zgTUg*+EOSG4n=@~AQ%z?jwKR^7}9StdD}kj6#7osJXe8~PhOX(tux*?Fc9NWa&HjY zwa53ehwJCmKY>QVh*&TJI9`GgPyjRr4F{nKz)S$6ut+S4NP-}K$KEOIhM6;07QXAN zKo?|hh?CbDKa<2v<5j@v*Jziu(|+LRF4#DyulaiUk;J25NIVjT0-?ZgB5>G811mM2 z00W@`3o$4>0to|y|JsmwStE?H0d~|K8oM?F1i==VJejNP*wec4LHNbr{b_k6fuV3B zmIR!5Az*+gVDZ2cj3Qt`SST8d17nF0Ea^AP>+Yi?iOegjQt>ML2HOACIBmSCg0f#} zb$-c-8sDxgZEYwQ){g^EKAm+TyecFrwk% zWrsPa7?_a{E-(lj4Z%V{Xb7BK5COr0aBzTDzz75=1PO!Vq0rxCcQ1QdkA zz`-Ou0t|r>ese&|6Np*(PI0qWnUzgN`9BEW`dird)`jXW5V&OE$-B48!s`r_|5o4# zMrRCcOfPC0nA(tMA_0NL;z&3U7DleRha!MQ1q__A0H%q>pn=sLM*Phih*?G2^WQTk z>8lKyX8d1-Y&~uBAA5JZ00`DQAXqu8Y^!Da_k!hMZeV6|ddVPQ39&UX1encX11n$^ zA^*ota3m55#vu?O2%0P(LjX<-XcCeLLXlv291H`;z#zYwk6SHxzI=b;%2t`E$?-o4 z-^N<&U^y~GNkO3w?A@1FSu4x?w*&f%MM6(c4W7fhuVH|vX^dvM zx9ATWDuvh4`71>$zkm;eBB6K)5(6T@&_oa%PA&{sN|fVB5Ill}0|?b`DlM-J;Lm)o z{=Bsceu~(}gkYmAfod(34gybsD$VkRt{;~8!v1z3)}FO~ff@(KW5F0G4um2CbQO+4 zp+Go*=>X8NUhtb*ED8VJEQU_%dFWk#9&-wwgAk`cc^4u%381c$+a5LgoM%%U-*WjSF82@k^) zp-4EC@Vm)FBiH*~203gM@&v{82*AH$gz$wAamp(Rl+_DQsK$D@f2scK7pSoW3<21& z&>#eUsl)?=0pUnsfE1Fj0FA%`=Vjz?USmg1j#(ZCTo3!x!sD;G&aU4W17yveDL(yj zy${e`7q^pn+%Hfg@kAVg1c!kz06PQ0aU=w=TmmzOgaE?`NCE_m{axAUUb~t?cfjp8 z|KxUVgY|a%h8WOV=6InIaC-$c1%>`91C&kv%I&|oI_-plVUaK#xl|O4#sLRUa>f9I z!h?Wg42g(9BS{4CZ_p4W*-UI4qicP{)CAC^Q&=g@Z%kNCX%Uf&QjaNV4wj-W7jcTm>t}=AZd% zy%74Q8{j7Z$9C_`nJTLE}g$7zhm|R}-M2K#XxPGzbU5A+azR zhJ-`@2I{_Pi0=2vw|WKYaa$*6ZUAc6Y|lgjuwBK_tgQ!)_gilVf--i5^F8gwbETbpvpIIl!yNgYFaunGDG0^O#%hQ zo=#wGp!k1KO928D02BZK00;o#jde*f^t5Lkk^unCAp!sk000000000103ZOifdBvi l0B~VrYhh<)E_!KjP)h{{000000RRC2IRF3vMv?&l005F?c>VwY From 957420f48820e0a18b6e4731fe6d0b7b394818e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Engel?= Date: Sat, 11 Feb 2017 22:20:58 +0100 Subject: [PATCH 3/4] Updated docs with changes to how serialization must be configured in order to work --- CONTRIBUTING.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 008b942..a369c85 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,17 +18,16 @@ Fork, then clone the repo: git clone https://github.com/your-username/conjunction.git ``` -### Unicorn +### Item Serialization The project uses [Unicorn](https://github.com/kamsar/Unicorn) to serialize Sitecore items related to Conjunction, i.e template items, settings etc. -In order to use Unicorn you need to do the following: +To get the item serialization working, you must perform the following steps: -1. Publish the Conjunction.Foundation.Content project, using a custom file system publish profile, to your local Sitecore instance -2. Copy the ``Unicorn.CustomSerializationFolder.config.example`` file from the ``App_Config/Include/Unicorn`` folder to the ``App_Config/Include/z_Developer`` folder -3. Rename the copied file to remove the ``.example`` extension -4. Edit the file to point at the serialization folder beneath your working folder -5. Run ``http:///unicorn.aspx`` and sync everything +1. Publish the ``Conjunction.Foundation.Serialization`` and ``Conjunction.Foundation.Core`` projects, using a custom filesystem publish profile, to your local Sitecore instance (IIS webroot folder) +2. In the local Sitecore instance, locate the file ``.\Website\App_Config\Include\Conjunction\Conjunction.Foundation.Serialization.DevSettings.config.example`` and remove the ``.example`` extension +3. Edit the ``Conjunction.Foundation.Serialization.DevSettings.config`` file and set the ``sourceFolder`` variable to point to where the Conjunction source code is located on your machine (the working directory) +4. Run ``http:///unicorn.aspx`` and sync everything ### Tests From 227b2f27f2ba401d2129431ae871571185da0eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Engel?= Date: Sun, 16 Apr 2017 15:43:43 +0200 Subject: [PATCH 4/4] Added missing serialization example config --- .../Code/Conjunction.Foundation.Serialization.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Foundation/Serialization/Code/Conjunction.Foundation.Serialization.csproj b/src/Foundation/Serialization/Code/Conjunction.Foundation.Serialization.csproj index 6b8624b..b561ae8 100644 --- a/src/Foundation/Serialization/Code/Conjunction.Foundation.Serialization.csproj +++ b/src/Foundation/Serialization/Code/Conjunction.Foundation.Serialization.csproj @@ -94,7 +94,9 @@ - + + Designer +