Skip to content

Commit

Permalink
Merge pull request #165 from KevinJump/Dev-v7_7_UmbracoUpdate
Browse files Browse the repository at this point in the history
Dev v7 7 umbraco update
  • Loading branch information
KevinJump authored Mar 2, 2018
2 parents 97fa6cb + fd12d1e commit d03b458
Show file tree
Hide file tree
Showing 339 changed files with 22,367 additions and 590 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PropertyGroup>
<ProjectName>uSync BackOffice</ProjectName>
<ProjectNamespace>Jumoo.uSync.BackOffice</ProjectNamespace>
<PackageVersion>4.0.2</PackageVersion>
<PackageVersion>4.0.4</PackageVersion>
<VersionSuffix></VersionSuffix>
<MinUmbracoVersion>7.4.0</MinUmbracoVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion BuildPackage/Jumoo.uSync.BackOffice/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ v.3.4.0 - Umbraco v7.6+ features (including content templates)
<licenseUrl>https://opensource.org/licenses/MPL-2.0</licenseUrl>
<tags>umbraco umbraco7 developer backoffice</tags>
<dependencies>
<dependency id="uSync.Core" version="6.0.2" />
<dependency id="uSync.Core" version="6.0.4" />
</dependencies>
</metadata>
</package>
4 changes: 2 additions & 2 deletions BuildPackage/Jumoo.uSync.Content/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ v3.0.2 - Trash content update.
#v3 - works as part of uSync.BackOffice</releaseNotes>
<dependencies>
<dependency id="uSync.ContentMappers" version="4.1.0" />
<dependency id="uSync" version="4.0.2" />
<dependency id="uSync.Core" version="6.0.3" />
<dependency id="uSync" version="4.0.4" />
<dependency id="uSync.Core" version="6.0.4" />
</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>6.0.3</PackageVersion>
<PackageVersion>6.0.4</PackageVersion>
<VersionSuffix></VersionSuffix>
<MinUmbracoVersion>7.4.0</MinUmbracoVersion>
</PropertyGroup>
Expand Down
Binary file modified BuildPackage/Package/uSync.BackOffice_4.0.2.zip
Binary file not shown.
Binary file added BuildPackage/Package/uSync.BackOffice_4.0.4.zip
Binary file not shown.
Binary file not shown.
Binary file modified BuildPackage/Package/uSync.Core_6.0.3.zip
Binary file not shown.
Binary file added BuildPackage/Package/uSync.Core_6.0.4.zip
Binary file not shown.
78 changes: 39 additions & 39 deletions Jumoo.uSync.Audit/Jumoo.uSync.Audit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="businesslogic, Version=1.0.6470.38240, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\businesslogic.dll</HintPath>
<Reference Include="businesslogic, Version=1.0.6528.26351, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\businesslogic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
Expand All @@ -50,20 +50,20 @@
<HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="cms, Version=1.0.6470.38240, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\cms.dll</HintPath>
<Reference Include="cms, Version=1.0.6528.26351, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\cms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="controls, Version=1.0.6470.38241, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\controls.dll</HintPath>
<Reference Include="controls, Version=1.0.6528.26353, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
<HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
<Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
Expand All @@ -74,20 +74,20 @@
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll</HintPath>
<Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor.Web, Version=4.8.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.8.3\lib\net45\ImageProcessor.Web.dll</HintPath>
<Reference Include="ImageProcessor.Web, Version=4.8.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.8.7\lib\net45\ImageProcessor.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="interfaces, Version=1.0.6470.38233, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\interfaces.dll</HintPath>
<Reference Include="interfaces, Version=1.0.6528.26342, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\log4net.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Log4Net.Async, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
Expand All @@ -103,7 +103,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand All @@ -118,8 +118,8 @@
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.2.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.1\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
<Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.2\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down Expand Up @@ -178,19 +178,19 @@
<HintPath>..\packages\Slack.Webhooks.0.1.8\lib\net40\Slack.Webhooks.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SQLCE4Umbraco, Version=1.0.6470.38241, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\SQLCE4Umbraco.dll</HintPath>
<Reference Include="SQLCE4Umbraco, Version=1.0.6528.26353, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\SQLCE4Umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\System.Data.SqlServerCe.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\System.Data.SqlServerCe.Entity.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\System.Data.SqlServerCe.Entity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down Expand Up @@ -240,39 +240,39 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\TidyNet.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\TidyNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco, Version=1.0.6470.38242, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\umbraco.dll</HintPath>
<Reference Include="umbraco, Version=1.0.6528.26354, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Core, Version=1.0.6470.38234, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\Umbraco.Core.dll</HintPath>
<Reference Include="Umbraco.Core, Version=1.0.6528.26344, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\Umbraco.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.DataLayer, Version=1.0.6470.38239, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\umbraco.DataLayer.dll</HintPath>
<Reference Include="umbraco.DataLayer, Version=1.0.6528.26351, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\umbraco.DataLayer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.editorControls, Version=1.0.6470.38247, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\umbraco.editorControls.dll</HintPath>
<Reference Include="umbraco.editorControls, Version=1.0.6528.26358, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\umbraco.editorControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.MacroEngines, Version=1.0.6470.38247, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\umbraco.MacroEngines.dll</HintPath>
<Reference Include="umbraco.MacroEngines, Version=1.0.6528.26359, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\umbraco.MacroEngines.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.providers, Version=1.0.6470.38241, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\umbraco.providers.dll</HintPath>
<Reference Include="umbraco.providers, Version=1.0.6528.26353, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\umbraco.providers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Web.UI, Version=1.0.6470.38248, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\Umbraco.Web.UI.dll</HintPath>
<Reference Include="Umbraco.Web.UI, Version=1.0.6528.26360, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\Umbraco.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UmbracoExamine, Version=0.7.0.38241, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\UmbracoExamine.dll</HintPath>
<Reference Include="UmbracoExamine, Version=0.7.0.26352, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.7.6\lib\net45\UmbracoExamine.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions Jumoo.uSync.Audit/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<package id="AutoMapper" version="3.3.1" targetFramework="net452" />
<package id="ClientDependency" version="1.9.2" targetFramework="net452" />
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net452" />
<package id="Examine" version="0.1.85" targetFramework="net452" />
<package id="Examine" version="0.1.88" targetFramework="net452" />
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net452" />
<package id="ImageProcessor" version="2.5.3" targetFramework="net452" />
<package id="ImageProcessor.Web" version="4.8.3" targetFramework="net452" />
<package id="ImageProcessor" version="2.5.6" targetFramework="net452" />
<package id="ImageProcessor.Web" version="4.8.7" targetFramework="net452" />
<package id="log4net" version="2.0.8" targetFramework="net452" />
<package id="Log4Net.Async" version="2.0.4" targetFramework="net452" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net452" />
Expand All @@ -21,7 +21,7 @@
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.1" targetFramework="net452" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" targetFramework="net452" />
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net452" />
<package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net452" />
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net452" />
Expand All @@ -38,6 +38,6 @@
<package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
<package id="Slack.Webhooks" version="0.1.8" targetFramework="net452" />
<package id="System.Threading.Tasks.Dataflow" version="4.7.0" targetFramework="net452" />
<package id="UmbracoCms.Core" version="7.7.0" targetFramework="net452" />
<package id="UmbracoCms.Core" version="7.7.6" targetFramework="net452" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net452" />
</packages>
Loading

0 comments on commit d03b458

Please sign in to comment.