Skip to content

Commit

Permalink
3.2 / 5.5 release 🎆
Browse files Browse the repository at this point in the history
Update for 3.2 (5.5 core) release
  • Loading branch information
KevinJump committed Aug 12, 2016
1 parent f35be20 commit 69087c6
Show file tree
Hide file tree
Showing 14 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion BuildPackage/Jumoo.uSync.BackOffice/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<licenseUrl>https://opensource.org/licenses/MPL-2.0</licenseUrl>
<tags>umbraco umbraco7 developer backoffice</tags>
<dependencies>
<dependency id="uSync.Core" version="5.4.0.740" />
<dependency id="uSync.Core" version="5.5.0.740" />
</dependencies>
</metadata>
</package>
2 changes: 1 addition & 1 deletion BuildPackage/Jumoo.uSync.Content/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ v3.0.2 - Trash content update.
#v3 - works as part of uSync.BackOffice</releaseNotes>
<dependencies>
<dependency id="uSync.ContentMappers" version="3.2.1" />
<dependency id="uSync" version="3.1.5.740" />
<dependency id="uSync" version="3.2.0.740" />
</dependencies>
</metadata>
</package>
2 changes: 1 addition & 1 deletion BuildPackage/Jumoo.uSync.Core/Core.Package.build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PropertyGroup>
<ProjectName>uSync Core</ProjectName>
<ProjectNamespace>Jumoo.uSync.Core</ProjectNamespace>
<PackageVersion>5.4.0.740</PackageVersion>
<PackageVersion>5.5.0.740</PackageVersion>
<VersionSuffix></VersionSuffix>
<MinUmbracoVersion>7.4.0</MinUmbracoVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion BuildPackage/Jumoo.uSync.Core/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>uSync.Core</id>
<version>5.4.0.740</version>
<version>5.4.1.740</version>
<title>uSync Core for Umbraco</title>
<authors>Kevin Jump</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand Down
2 changes: 1 addition & 1 deletion BuildPackage/Jumoo.uSync.Core/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<info>
<package>
<name>uSync.Core</name>
<version>5.4.0.740</version>
<version>5.4.1.740</version>
<license url="http://opensource.org/licenses/MIT">MIT License</license>
<url>http://jumoo.uk/uSync</url>
<requirements>
Expand Down
Binary file modified BuildPackage/Package/uSync.BackOffice_3.2.0.740.zip
Binary file not shown.
Binary file not shown.
Binary file modified BuildPackage/Package/uSync.ContentEdition_3.2.1.740.zip
Binary file not shown.
Binary file not shown.
Binary file removed BuildPackage/Package/uSync.Core_5.4.0.740.zip
Binary file not shown.
Binary file added BuildPackage/Package/uSync.Core_5.5.0.740.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions Jumoo.uSync.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("5.4.0.740")]
[assembly: AssemblyVersion("5.4.0.740")]
// [assembly: AssemblyVersion("5.5.0.740")]
[assembly: AssemblyVersion("5.5.0.740")]
4 changes: 2 additions & 2 deletions Jumoo.uSync.Core/Serializers/ContentBaseSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using Umbraco.Core.Logging;

using Jumoo.uSync.Core.Mappers;
using System.Globalization;

namespace Jumoo.uSync.Core.Serializers
{
Expand Down Expand Up @@ -121,9 +122,8 @@ internal SyncAttempt<XElement> SerializeBase(IContentBase item, string contentTy
node.Add(new XAttribute("id", item.Id));
node.Add(new XAttribute("nodeName", item.Name));
node.Add(new XAttribute("isDoc", ""));
node.Add(new XAttribute("updated", item.UpdateDate.ToUniversalTime()));
node.Add(new XAttribute("updated", item.UpdateDate.ToString("yyyy-MM-ddTHH:mm:ss.fffffff'Z'")));

LogHelper.Debug<Events>("Content Updatedate: {0}", () => item.UpdateDate);

foreach (var prop in item.Properties.Where(p => p != null))
{
Expand Down
3 changes: 2 additions & 1 deletion Jumoo.uSync.Core/Serializers/ContentSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Umbraco.Core;
using Jumoo.uSync.Core.Helpers;
using Umbraco.Core.Logging;
using System.Globalization;

namespace Jumoo.uSync.Core.Serializers
{
Expand Down Expand Up @@ -178,7 +179,7 @@ public override bool IsUpdate(XElement node)

DateTime updateTime = node.Attribute("updated").ValueOrDefault(DateTime.Now).ToUniversalTime();

// LogHelper.Debug<ContentSerializer>("IsUpdate: File {0}, DB {1}", () => updateTime, () => item.UpdateDate.ToUniversalTime());
// LogHelper.Debug<ContentSerializer>("IsUpdate: File {0}, DB {1} {2}", () => updateTime, () => item.UpdateDate.ToUniversalTime(), ()=>item.UpdateDate.Kind.ToString());
if ((updateTime - item.UpdateDate.ToUniversalTime()).TotalSeconds > 1)
{
return true;
Expand Down

0 comments on commit 69087c6

Please sign in to comment.