Merge pull request #4 from KayeeNL/feature/Sitecore_10_0_1_support

Feature/sitecore 10 0 1 support

README.md

@@ -46,13 +46,14 @@ _Right click 'Save link as...' since GitHub doesn't respect url encoding, but ma
 - [Gutters for Sitecore Data Exchange Framework 1.0.0 rev. 170202](./source/packages/Gutters%20for%20Sitecore%20Data&20Exchange%20Framework%201.0.0%20rev.%20170202.zip) (pre Sitecore 9.3)
 - [Gutters for Sitecore Data Exchange Framework-Sitecore 9.3.0 for DEF 4.0.0](./source/packages/Gutters%20for%20Sitecore%20Data%20Exchange%20Framework-Sitecore%209.3.0%20for%20DEF%204.0.0.zip)
 - [Gutters for Sitecore Data Exchange Framework-Sitecore 10.0.0 for DEF 5.0.0](./source/packages/Gutters%20for%20Sitecore%20Data%20Exchange%20Framework-Sitecore%2010.0.0%20for%20DEF%205.0.0.zip)
+- [Gutters for Sitecore Data Exchange Framework-Sitecore 10.0.1 for DEF 5.0.0](./source/packages/Gutters%20for%20Sitecore%20Data%20Exchange%20Framework-Sitecore%2010.0.1%20for%20DEF%205.0.0.zip)
 
 # Contributors
 
 _Originally developed by:_
 
 Vlad Shpak - Twitter: [@vladcheg](https://twitter.com/vladcheg), GitHub: https://github.com/vladcheg
 
-_Upgraded to Sitecore 9.3 (DEF 4.0.0), Sitecore 10 (DEF 5.0.0) + introduced Unicorn_
+_Upgraded to Sitecore 9.3 (DEF 4.0.0), Sitecore 10.0.0 & Sitecore 10.0.1 (DEF 5.0.0) + introduced Unicorn_
 
 Robbert Hock - Twitter: [@kayeeNL](https://twitter.com/kayeenl), GitHub: https://github.com/KayeeNL

Sitecore.DataExchange.Gutters/App_Config/Include/Rainbow.config

@@ -5,7 +5,7 @@
 
 	This file should be present on all environments Rainbow is present on. 
 
-	http://github.com/kamsar/Rainbow
+	https://github.com/SitecoreUnicorn/Rainbow
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
 	<sitecore>

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.AutoPublish.config

@@ -5,7 +5,7 @@
 
 	This file should be removed on content delivery environments.
 
-	http://github.com/kamsar/Unicorn
+	https://github.com/SitecoreUnicorn/Unicorn
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:role="http://www.sitecore.net/xmlconfig/role/">
 	<sitecore role:require="Standalone or ContentManagement">
@@ -18,7 +18,8 @@
 			<unicornSyncEnd>
 				<!-- when all configurations have synced, fire off a publish that processes the queue we've accumulated -->
 				<processor type="Unicorn.Pipelines.UnicornSyncEnd.TriggerAutoPublishSyncedItems, Unicorn">
-					<PublishTriggerItemId>/sitecore/templates/Common/Folder</PublishTriggerItemId> <!-- the trigger item can be any leaf node Sitecore item - just has to have a 'starting point' for the publish -->
+					<PublishTriggerItemId>/sitecore/templates/Common/Folder</PublishTriggerItemId>
+					<!-- the trigger item can be any leaf node Sitecore item - just has to have a 'starting point' for the publish -->
 					<!-- these are the database(s) to publish synced items to -->
 					<TargetDatabases hint="list:AddTargetDatabase">
 						<web>web</web>
@@ -29,10 +30,28 @@
 			<publish>
 				<!--
 					This handler manually injects arbitrary items into the publish queue so that the next publish to occur will cause the injected items to get published. 
-					See http://www.velir.com/blog/index.php/2013/11/22/how-to-create-a-custom-publish-queue-in-sitecore/ et. al.
+					See https://www.velir.com/blog/2013/11/22/how-create-custom-publish-queue-sitecore et. al.
 				-->
-				<processor patch:after="*[@type='Sitecore.Publishing.Pipelines.Publish.AddItemsToQueue, Sitecore.Kernel']" type="Unicorn.Publishing.ManualPublishQueueHandler, Unicorn"/>
+				<!-- if for some reasons you do not have buckets enabled and/or if you have ~\App_Config\Sitecore\Buckets\Buckets.config disabled, use the below patch instead
+					<processor patch:after="*[@type='Sitecore.Publishing.Pipelines.Publish.AddItemsToQueue, Sitecore.Kernel']" type="Unicorn.Publishing.ManualPublishQueueHandler, Unicorn"/>
+				 -->
+				<processor patch:after="*[@type='Sitecore.Publishing.Pipelines.Publish.AddBucketFoldersToQueue, Sitecore.Kernel']" type="Unicorn.Publishing.ManualPublishQueueHandler, Unicorn"/>
 			</publish>
 		</pipelines>
+		<settings>
+			<!--
+				Unicorn will use Publish Manager for items publishing, which routes items publishing through Sitecore publishing service, in case it is used. 
+				Default value is true (if not specified). This setting is required for Sitecore versions lower then 8
+			-->
+			<setting name="Unicorn.UsePublishManager" value="true" />
+			<!--
+				There is no uniform way to learn, if we are using publishing service or not (even setting PublishingServiceUrlRoot have changed between versions :( ). Publishing service ignores publish queue and we need to build own queue for it when building handle for PublishManager -> hence, we need a separate setting for this.
+			-->
+			<setting name="Unicorn.UsePublishingService" value="false" />
+			<!--
+				If we have synced more that items number in this setting - it is faster to queue just smart publish in Publishing service than queueing individual items.
+			-->
+			<setting name="Unicorn.PublishingServiceMaxItemsToQueue" value="50" />
+		</settings>
 	</sitecore>
 </configuration>

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.Configs.Default.example

@@ -6,7 +6,7 @@
 
 	Enabled configuration definition patches should be present on all environments Unicorn is present on.
 
-	See Unicorn.config for commentary on how configurations operate, or https://github.com/kamsar/Unicorn/blob/master/README.md
+	See Unicorn.config for commentary on how configurations operate, or https://github.com/SitecoreUnicorn/Unicorn/blob/master/README.md
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:role="http://www.sitecore.net/xmlconfig/role/">
 	<sitecore>
@@ -49,11 +49,11 @@
 							The predicate controls what items are included in the configuration.
 
 							Each include can also exclude specific subitems in various ways. For a reference of the most current predicate grammar, consult the tests here:
-							https://github.com/kamsar/Unicorn/blob/master/src/Unicorn.Tests/Predicates/TestConfiguration.xml
+							https://github.com/SitecoreUnicorn/Unicorn/blob/master/src/Unicorn.Tests/Predicates/TestConfiguration.xml
 
 							NOTE: after changing what is included or excluded, you should reserialize all items, or at least the added items for additions.
 							NOTE: the "name" attribute controls the folder name the items will go into. If unspecified, the last path segment is used. Names must be unique across the configuration.
-							NOTE: You cannot use excludes with Transparent Sync. See https://github.com/kamsar/Unicorn/wiki/The-Transparent-Sync-Guide
+							NOTE: You cannot use excludes with Transparent Sync. See https://github.com/SitecoreUnicorn/Unicorn/wiki/The-Transparent-Sync-Guide
 							NOTE: If your configuration is named in Helix format (Layer.Module), you can use $(layer) and $(module) here as variables.
 						-->
 						<include name="Layouts" database="master" path="/sitecore/layout/Layouts/YourSite" />
@@ -102,7 +102,7 @@
 
 						Traditional Sync (the default) updates the state of the database only when a sync operation is run. It supports additional operations but can be more of a chore to remember to sync.
 						Transparent Sync (preferred) updates the state of Sitecore instantly as soon as changes to files occur. It is optimal for development purposes, but has a few limitations.
-						See the guide to help decide: https://github.com/kamsar/Unicorn/wiki/The-Transparent-Sync-Guide
+						See the guide to help decide: https://github.com/SitecoreUnicorn/Unicorn/wiki/The-Transparent-Sync-Guide
 					-->
 					<dataProviderConfiguration enableTransparentSync="false" />
 

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.Configs.Dependency.config.example

@@ -3,7 +3,7 @@
 
 	Enabled configuration definition patches should be present on all environments Unicorn is present on.
 
-	See Unicorn.config for commentary on how configurations operate, or https://github.com/kamsar/Unicorn/blob/master/README.md
+	See Unicorn.config for commentary on how configurations operate, or https://github.com/SitecoreUnicorn/Unicorn/blob/master/README.md
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
 	<sitecore>

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.Configs.NewItemsOnly.example

@@ -7,7 +7,7 @@
 
 	Enabled configuration definition patches should be present on all environments Unicorn is present on.
 
-	See Unicorn.config for commentary on how configurations operate, or https://github.com/kamsar/Unicorn/blob/master/README.md
+	See Unicorn.config for commentary on how configurations operate, or https://github.com/SitecoreUnicorn/Unicorn/blob/master/README.md
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
 	<sitecore>
@@ -27,7 +27,7 @@
 						Note: when using custom evaluators keep Transparent Sync OFF for those configurations (the line below).
 						Transparent Sync operates by reading from the serialization store directly.
 						In other words transparent sync always acts like SerializedAsMasterEvaluator because disk is LITERALLY the master.
-						See https://github.com/kamsar/Unicorn/wiki/The-Transparent-Sync-Guide
+						See https://github.com/SitecoreUnicorn/Unicorn/wiki/The-Transparent-Sync-Guide
 					-->
 					<dataProviderConfiguration enableTransparentSync="false" />
 

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.DataProvider.config

@@ -7,7 +7,7 @@
 	Generally speaking that's anywhere other than a developer workstation, so your CI process (you have one, right?) should remove this file during the build.
 	IMPORTANT EXCEPTION: If you are using Transparent Sync as a deployment mechanism, this file must remain on your CE environment.
 
-	http://github.com/kamsar/Unicorn
+	https://github.com/SitecoreUnicorn/Unicorn
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:role="http://www.sitecore.net/xmlconfig/role/">
 	<sitecore role:require="Standalone">

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.Dilithium.config.example

@@ -23,7 +23,7 @@
 
 	* If you see uneven timings when running several synchronizations in succession, that's probably the time taken to reload the template field cache, as opposed to spiky SQL times :)
 
-	http://github.com/kamsar/Unicorn
+	https://github.com/SitecoreUnicorn/Unicorn
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:role="http://www.sitecore.net/xmlconfig/role/">
 	<sitecore role:require="Standalone or ContentManagement">

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.PowerShell.config

@@ -20,7 +20,7 @@
 	This file should be active on any environment where you wish to execute Unicorn SPE commands. Usually, that'd be dev and CE only. 
 	If you're not using SPE you can disable or remove this file, but it won't hurt anything to leave it either.
 
-	http://github.com/kamsar/Unicorn
+	https://github.com/SitecoreUnicorn/Unicorn
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:role="http://www.sitecore.net/xmlconfig/role/">
 	<sitecore role:require="Standalone or ContentManagement">

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.Remote.config.disabled

@@ -2,13 +2,13 @@
 	Unicorn.Remote.config.disabled
 
 	This file enables the Unicorn control panel remote API. This is used by the Unicorn Control Panel extension for Visual Studio by Andrii Snigyr (@BerserkerDotNet):
-	https://visualstudiogallery.msdn.microsoft.com/64439022-f470-422a-b663-fbb89aaf6e86
+	https://marketplace.visualstudio.com/items?itemName=BerserkerDotNet.UnicornControlPanel
 
 	If you are not using the VS integration, you can safely remove or disable this patch file. To enable this patch file simply remove the .disabled.
 
 	This file should be present only on development environments that are using the VS plugin.
 
-	http://github.com/kamsar/Unicorn
+	https://github.com/SitecoreUnicorn/Unicorn
 	https://github.com/BerserkerDotNet/Unicorn.VisualStudio
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.UI.DeployedContentEditorWarnings.config.disabled

@@ -9,7 +9,7 @@
 	IMPORTANT: THIS CONFIG PATCH *MUST* RUN AFTER Unicorn.UI.config, or you may receive errors in the content editor:
 	"Multiple controls with the same ID 'FContentSOMEGUIDHERESOMEGUIDHERESOMEGUID' were found. FindControl requires that controls have unique IDs."
 
-	http://github.com/kamsar/Unicorn
+	https://github.com/SitecoreUnicorn/Unicorn
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:role="http://www.sitecore.net/xmlconfig/role/">
 	<sitecore role:require="ContentManagement">

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.UI.IdentityServer.config.disabled

@@ -0,0 +1,26 @@
+<!--
+	Unicorn UI Identity Server Configuration
+
+	This file enables the Unicorn control panel to work with authentication in Sitecore 9.1 and above.
+
+	This file should not be enabled on versions of Sitecore prior to 9.1.
+
+	https://github.com/SitecoreUnicorn/Unicorn
+-->
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:role="http://www.sitecore.net/xmlconfig/role/" xmlns:security="http://www.sitecore.net/xmlconfig/security/">
+	<sitecore role:require="Standalone or ContentManagement" security:require="Sitecore">
+		<pipelines>
+			<!--
+				The Unicorn control panel path must be added to the list of site neutral paths for the Unicorn control panel to work with authentication in 9.1.
+				This must match the activationUrl defined in the UnicornControlPanelPipelineProcessor defined in Unicorn.UI.config.
+			-->
+			<owin.cookieAuthentication.validateIdentity>
+				<processor type="Sitecore.Owin.Authentication.Pipelines.CookieAuthentication.ValidateIdentity.ValidateSiteNeutralPaths, Sitecore.Owin.Authentication">
+					<siteNeutralPaths hint="list">
+						<path hint="unicorn">/unicorn.aspx</path>
+					</siteNeutralPaths>
+				</processor>
+			</owin.cookieAuthentication.validateIdentity>
+		</pipelines>
+	</sitecore>
+</configuration>

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.UI.config

@@ -5,7 +5,7 @@
 
 	This file should be removed when deploying to Content Delivery environments to remove all Unicorn UI elements, which are not needed in CD.
 
-	http://github.com/kamsar/Unicorn
+	https://github.com/SitecoreUnicorn/Unicorn
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:role="http://www.sitecore.net/xmlconfig/role/">
 	<sitecore role:require="Standalone or ContentManagement">
@@ -71,6 +71,7 @@
 			<unicornControlPanelRequest>
 				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.ChallengeVerb, Unicorn" />
 				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.SyncVerb, Unicorn" />
+				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.SyncSilentVerb, Unicorn" />
 				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.ReserializeVerb, Unicorn" />
 				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.HandleAccessDenied, Unicorn" />
 				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.RenderControlPanel, Unicorn" />

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.config

@@ -8,7 +8,7 @@
 	safe to leave on Content Delivery servers, as it changes no stock Sitecore
 	configuration.
 
-	http://github.com/kamsar/Unicorn
+	https://github.com/SitecoreUnicorn/Unicorn
 -->
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
 	<sitecore>
@@ -21,7 +21,7 @@
 				that critical ones can run separately from non-essential ones to save time.
 
 				See the README here for more information:
-				https://github.com/kamsar/Unicorn/blob/master/README.md
+				https://github.com/SitecoreUnicorn/Unicorn/blob/master/README.md
 
 				If you're familiar with DI and IoC containers, each configuration is effectively
 				a dependency container which inherits from the global container defined in
@@ -112,7 +112,27 @@
 					<exclude fieldID="{BADD9CF9-53E0-4D0C-BCC0-2D784C282F6A}" note="'__Updated by' field on Standard Template" />
 					<exclude fieldID="{001DD393-96C5-490B-924A-B0F25CD9EFD8}" note="'__Lock' field on Standard Template" />
 				</fieldFilter>
-
+
+				<!--
+					Unicorn 4.1.2 introduces Predicate Presets
+
+					As everything else, you can define your configuration here as part of <defaults> which will apply to all configurations, or on a per-configuration basis.
+
+					For this particular feature it probably doesn't make much sense to define presets per-configuration, as the whole idea is to have a central "template" for configuration
+					presets that are then applied consistently across configurations.
+
+					For a full explanation, see the blog post: TODO
+				-->
+				<!--
+					<predicatePresets type="Unicorn.Configuration.PredicatePresetHandler, Unicorn" singleInstance="true">
+						<preset id="Component" database="master">
+							<include name="$id.Templates.$name" database="$database" path="/sitecore/templates/User Defined/$name" />
+							<include name="$id.Rendering.$name" database="$database" path="/sitecore/layout/Renderings/$name" />
+							<include name="$id.Thumbnail.$name" database="$database" path="/sitecore/media library/thumbnails/$name" />
+						</preset>
+					</predicatePresets> 
+				-->
+
 				<!-- 
 					Controls configuration-level sync settings
 
@@ -215,8 +235,10 @@
 
 		<sites>
 			<!-- A controlled site context to run Unicorn sync processes in, where we know Language Fallback features and other misguidings are inactive -->
+			<!-- rootPath="/unicorn/module" was added in response to https://github.com/SitecoreUnicorn/Unicorn/issues/398 - Horizon crashes because it fails to identify "unicorn" as a system site -->
 			<site name="unicorn"
 				inherits="shell"
+				rootPath="/unicorn/module"
 				enableItemLanguageFallback="false"
 				enableFieldLanguageFallback="false"
 				enforceVersionPresence="false" />

Sitecore.DataExchange.Gutters/App_Config/Include/Unicorn/Unicorn.zSharedSecret.config.example

@@ -7,7 +7,7 @@ invoking Unicorn with the PowerShell API, e.g. for CI.
 IMPORTANT: THIS CONFIG PATCH *MUST* RUN AFTER Unicorn.UI.config, or you will receive an error:
 "Unable to cast object of type 'System.String' to type 'Unicorn.ControlPanel.Security.IUnicornAuthenticationProvider'."
 
-See the README here for more on setting up remote API: https://github.com/kamsar/Unicorn
+See the README here for more on setting up remote API: https://github.com/SitecoreUnicorn/Unicorn
 
 Need some randomness? Try here: https://www.random.org/passwords/?num=5&len=24&format=html&rnd=new
 -->

Sitecore.DataExchange.Gutters/Properties/PublishProfiles/Sitecore10_1_PublishingProfile.pubxml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>C:\inetpub\wwwroot\sc10-1.dev.local</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <SiteUrlToLaunchAfterPublish />
+  </PropertyGroup>
+</Project>