Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/sitecore 93 23 #26

Open
wants to merge 26 commits into
base: develop
Choose a base branch
from
+372 −616
Open

Feature/sitecore 93 23 #26

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
163e7d3
Updated for release 2.0.2 with support for Sitecore XP 9.0 Update 2
lacarl Mar 28, 2019
ce7bbf2
Removed unused app_start
lacarl Mar 28, 2019
2ddc786
Update to Sitecore XP 9.1
lacarl Mar 28, 2019
4032f68
Upgraded to Sitecore 9.2
lacarl Jan 30, 2020
5bc0a4c
Sitecore 9.3
lacarl Jan 30, 2020
266c6b5
Updated version numbers to 2.2
lacarl Jan 30, 2020
a5ae0f3
Removed reference to C# 4.6
lacarl Feb 4, 2020
7500b3f
Merge pull request #1 from DeloitteDigitalAPAC/develop
hollywoodinvegas Feb 4, 2020
1fe7b4c
reverse merge from develop
lacarl Feb 4, 2020
7b43120
Reverse merge from develop
lacarl Feb 4, 2020
cb78788
Converted from Package Config to Package References to clean up nuget
lacarl Mar 27, 2020
ec78dc0
Added the date in lieu of a build number to the nuget spec for reference
lacarl Mar 27, 2020
c660f2e
Switch to PackageReference for Nuget
Apr 7, 2020
5acfbfb
Tidy up the nuspec to require 9.3 and .NET 4.8
Apr 7, 2020
c57a4b2
Remove deprecated elements from .nuspec
Apr 7, 2020
9f36cda
remove output from migration
lacarl Apr 7, 2020
59a1f2e
Merge branch 'feature/Sitecore_92_22' into feature/Sitecore_93_23
lacarl Apr 7, 2020
ec8acbf
Remove obsolete EnterpriseLibrary References and assembly mappings
Apr 7, 2020
48fce1c
Fixed nuget references
Apr 7, 2020
29d0b77
removed dependency for Sitecore.Mvc
Apr 7, 2020
1f3471e
Issue with package structure
lacarl Apr 7, 2020
23ce441
Changed references to PageEditor with ExperienceEditor
Apr 11, 2020
8393dad
Changed tags
Apr 11, 2020
0e2a1cd
removed migration files
lacarl Apr 11, 2020
afbde79
one last reference to PageEditor
lacarl Apr 11, 2020
4734e76
Added ParentID to the ItemID mapping type
lacarl Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build/DeloitteDigital.Atlas.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>DeloitteDigital.Atlas</id>
<version>1.1.0</version>
<version>2.3.0</version>
<authors>Deloitte Digital</authors>
<owners>Deloitte Digital</owners>
<licenseUrl>https://github.com/DeloitteDigitalAPAC/Atlas/blob/master/LICENSE</licenseUrl>
Expand Down
8 changes: 6 additions & 2 deletions DeloitteDigital.Atlas.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio 15
VisualStudioVersion = 15.0.28307.539
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeloitteDigital.Atlas", "src\DeloitteDigital.Atlas\DeloitteDigital.Atlas.csproj", "{601B96BD-D95F-4281-9A1B-7D99374DD869}"
EndProject
Expand Down Expand Up @@ -31,4 +31,8 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8;packages\EnterpriseLibrary.TransientFaultHandling.Caching.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.ServiceBus.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.Configuration.6.0.1304.0\lib\NET45
SolutionGuid = {C4120DCF-283D-4C71-A165-A67041EBB723}
EndGlobalSection
EndGlobal
284 changes: 202 additions & 82 deletions src/DeloitteDigital.Atlas.Tests/DeloitteDigital.Atlas.Tests.csproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/DeloitteDigital.Atlas.Tests/Mapping/ItemPropertyMappingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public void ItemPropertyMappingShouldMapItemProperties()
Assert.AreEqual(new ID("{110D559F-DEA5-42EA-9C1C-8A5DF7E70EF9}"), sampleItem.ItemId);
Assert.AreEqual("Home", sampleItem.ItemName);
Assert.AreEqual("/sitecore/content/Home", sampleItem.ItemPath);
Assert.AreEqual("/en/sitecore/content/Home.aspx", sampleItem.ItemUrl);
Assert.AreEqual("/en/sitecore/content/Home", sampleItem.ItemUrl);
Assert.AreEqual(new ID("{76036F5E-CBCE-46D1-AF0A-4143F9B557AA}"), sampleItem.TemplateId);
Assert.AreEqual("Sample Item", sampleItem.TemplateName);
}
Expand Down
6 changes: 3 additions & 3 deletions src/DeloitteDigital.Atlas.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("DeloitteDigital.Atlas.Tests")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.3.0.0")]
[assembly: AssemblyFileVersion("2.3.0.0")]
76 changes: 46 additions & 30 deletions src/DeloitteDigital.Atlas.Tests/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,26 @@
For Sitecore versions prior to 8.2 should be 'Sitecore.Data.Database, Sitecore.Kernel'.
For Sitecore 8.2 and later should be 'Sitecore.Data.DefaultDatabase, Sitecore.Kernel'. -->
<sc.variable name="databaseType" value="Sitecore.Data.DefaultDatabase, Sitecore.Kernel" />



<!-- SERIALIZATION FOLDERS --><szfolders>
<folder name="core" value="..\..\Data\CoreSerialization\core\" />
<folder name="master" value="..\..\Data\Serialization\master\" />
<folder name="custom" value="..\..\Data\CustomSerialization\master\" />
</szfolders><pipelines>
<loadDsDbItem>
<processor type="Sitecore.FakeDb.Serialization.Pipelines.DeserializeLinkedTemplate, Sitecore.FakeDb.Serialization" />
<processor type="Sitecore.FakeDb.Serialization.Pipelines.CopySharedFields, Sitecore.FakeDb.Serialization" />
<processor type="Sitecore.FakeDb.Serialization.Pipelines.CopyVersionedFields, Sitecore.FakeDb.Serialization" />
<processor type="Sitecore.FakeDb.Serialization.Pipelines.CopyParentId, Sitecore.FakeDb.Serialization" />
<processor type="Sitecore.FakeDb.Serialization.Pipelines.DeserializeDescendants, Sitecore.FakeDb.Serialization" />
</loadDsDbItem>
<loadDsDbTemplate>
<processor type="Sitecore.FakeDb.Serialization.Pipelines.LoadTemplateFields, Sitecore.FakeDb.Serialization" />
</loadDsDbTemplate>
</pipelines></sitecore>
<folder name="core" value="..\..\Data\CoreSerialization\core\" />
<folder name="master" value="..\..\Data\Serialization\master\" />
<folder name="custom" value="..\..\Data\CustomSerialization\master\" />
<folder name="incorrect" value="..\..\Data\IncorrectSerialization\master\" />
</szfolders><pipelines>
<loadDsDbItem>
<processor type="Sitecore.FakeDb.Serialization.Pipelines.DeserializeLinkedTemplate, Sitecore.FakeDb.Serialization" />
<processor type="Sitecore.FakeDb.Serialization.Pipelines.CopySharedFields, Sitecore.FakeDb.Serialization" />
<processor type="Sitecore.FakeDb.Serialization.Pipelines.CopyVersionedFields, Sitecore.FakeDb.Serialization" />
<processor type="Sitecore.FakeDb.Serialization.Pipelines.CopyParentId, Sitecore.FakeDb.Serialization" />
<processor type="Sitecore.FakeDb.Serialization.Pipelines.DeserializeDescendants, Sitecore.FakeDb.Serialization" />
</loadDsDbItem>
<loadDsDbTemplate>
<processor type="Sitecore.FakeDb.Serialization.Pipelines.LoadTemplateFields, Sitecore.FakeDb.Serialization" />
</loadDsDbTemplate>
</pipelines></sitecore>
<log4net />
<system.web>
<membership defaultProvider="fake">
Expand All @@ -56,20 +60,32 @@
</properties>
</profile>
</system.web>

<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />

<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup>
<runtime>

<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

<dependentAssembly>

<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />

<bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />

</dependentAssembly>

</assemblyBinding>

<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="PdfSharp" publicKeyToken="f94615aa0424f9eb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.50.5147.0" newVersion="1.50.5147.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>
100 changes: 60 additions & 40 deletions src/DeloitteDigital.Atlas.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net452" />
<package id="Lucene.Net" version="3.0.3" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
<package id="Sitecore.Abstractions" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Analytics" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Analytics.Core" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Analytics.DataAccess" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Analytics.Model" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Analytics.Processing" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.FakeDb" version="1.3.1" targetFramework="net452" />
<package id="Sitecore.FakeDb.Serialization" version="1.3.1" targetFramework="net452" />
<package id="Sitecore.Kernel" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Logging" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Logging.Client" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Marketing" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Marketing.Core" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Marketing.Taxonomy" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Nexus" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.NVelocity" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Xdb.Configuration" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Zip" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="System.Collections" version="4.0.11" targetFramework="net452" />
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
<package id="System.ComponentModel" version="4.0.1" targetFramework="net452" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
<package id="System.Globalization" version="4.0.11" targetFramework="net452" />
<package id="System.Linq" version="4.1.0" targetFramework="net452" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
<package id="System.Reflection" version="4.1.0" targetFramework="net452" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
<package id="System.Threading" version="4.0.11" targetFramework="net452" />
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
<package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net48" />
<package id="EnterpriseLibrary.Common" version="6.0.1304.0" targetFramework="net48" />
<package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net48" />
<package id="EnterpriseLibrary.TransientFaultHandling.Caching" version="6.0.1304.0" targetFramework="net48" />
<package id="EnterpriseLibrary.TransientFaultHandling.Configuration" version="6.0.1304.0" targetFramework="net48" />
<package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net48" />
<package id="EnterpriseLibrary.TransientFaultHandling.ServiceBus" version="6.0.1304.0" targetFramework="net48" />
<package id="EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage" version="6.0.1304.0" targetFramework="net48" />
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net48" />
<package id="Lucene.Net" version="3.0.3" targetFramework="net48" />
<package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net48" />
<package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi" version="5.2.6" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.6" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.6" targetFramework="net48" />
<package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net48" />
<package id="Microsoft.Extensions.Configuration" version="2.1.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Configuration.Binder" version="2.1.1" targetFramework="net48" />
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net48" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" version="2.2.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Logging" version="2.1.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net48" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
<package id="Mvp.Xml" version="2.3.0" targetFramework="net48" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net48" />
<package id="PDFsharp" version="1.50.5147" targetFramework="net48" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net48" />
<package id="Sitecore.Annotations" version="9.3.0" targetFramework="net48" />
<package id="Sitecore.ContentSearch" version="9.3.0" targetFramework="net48" />
<package id="Sitecore.ContentSearch.ContentExtraction" version="9.3.0" targetFramework="net48" />
<package id="Sitecore.ContentSearch.Data" version="9.3.0" targetFramework="net48" />
<package id="Sitecore.ContentSearch.Linq" version="9.3.0" targetFramework="net48" />
<package id="Sitecore.FakeDb" version="3.0.0-alpha1" targetFramework="net48" />
<package id="Sitecore.FakeDb.Serialization" version="3.0.0-alpha1" targetFramework="net48" />
<package id="Sitecore.Framework.Conditions" version="4.0.0" targetFramework="net48" />
<package id="Sitecore.Framework.Data.Blobs" version="1.0.0" targetFramework="net48" />
<package id="Sitecore.Framework.Data.Blobs.Abstractions" version="1.0.0" targetFramework="net48" />
<package id="Sitecore.Kernel" version="9.3.0" targetFramework="net48" developmentDependency="true" />
<package id="Sitecore.Logging" version="9.3.0" targetFramework="net48" developmentDependency="true" />
<package id="Sitecore.Logging.Client" version="9.3.0" targetFramework="net48" developmentDependency="true" />
<package id="Sitecore.Nexus" version="9.3.0" targetFramework="net48" />
<package id="Sitecore.Nexus.Consumption" version="1.1.1" targetFramework="net48" />
<package id="Sitecore.Nexus.Licensing" version="2.0.6" targetFramework="net48" />
<package id="Sitecore.NVelocity" version="9.2.0" targetFramework="net48" developmentDependency="true" />
<package id="Sitecore.Zip" version="9.3.0" targetFramework="net48" developmentDependency="true" />
<package id="System.Buffers" version="4.5.0" targetFramework="net48" />
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net48" />
<package id="System.IO.Packaging" version="4.0.0" targetFramework="net48" />
<package id="System.Memory" version="4.5.1" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net48" />
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Xml" version="4.5.0" targetFramework="net48" />
<package id="System.Security.Permissions" version="4.5.0" targetFramework="net48" />
<package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net48" />
</packages>
Loading