Skip to content
This repository was archived by the owner on Feb 10, 2024. It is now read-only.

Commit 0a54dbc

Browse files
leekelleherleekelleher
authored
Merge pull request #68 from umco/chore/upgrade-umb730
Upgraded minimum supported version to Umbraco v7.3.0
2 parents e5aae03 + 8fa2b69 commit 0a54dbc

File tree

7 files changed

+210
-109
lines changed

7 files changed

+210
-109
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ A grid editor for Umbraco 7 that allows you to use Doc Types as a blue print for
1313

1414
### Installation
1515

16-
> *Note:* Doc Type Grid Editor has been developed against **Umbraco v7.2.0** and will support that version and above.
16+
> *Note:* Doc Type Grid Editor has been developed against **Umbraco v7.3.0** and will support that version and above.
1717
1818
Doc Type Grid Editor can be installed from either Our Umbraco package repository, or build manually from the source-code.
1919

‎build/package.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<PropertyGroup>
1919
<ProjectName>Our.Umbraco.DocTypeGridEditor</ProjectName>
2020
<PackageName>Doc Type Grid Editor</PackageName>
21-
<MinUmbracoVersion>7.2.0</MinUmbracoVersion>
22-
<Readme>Doc Type Grid Editor is an advanced grid editor for the new Umbraco v7.2 Grid</Readme>
21+
<MinUmbracoVersion>7.3.0</MinUmbracoVersion>
22+
<Readme>Doc Type Grid Editor is an advanced grid editor for Umbraco 7</Readme>
2323
<AuthorName>Matt Brailsford, Lee Kelleher</AuthorName>
2424
<AuthorUrl>https://github.com/umco/umbraco-doc-type-grid-editor/graphs/contributors</AuthorUrl>
2525
<PackageLicenseName>MIT license</PackageLicenseName>

‎src/Our.Umbraco.DocTypeGridEditor/Helpers/DocTypeGridEditorHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static IPublishedContent ConvertValueToContent(string id, string contentT
4444

4545
private static IPublishedContent ConvertValue(string id, string contentTypeAlias, string dataJson)
4646
{
47-
using (var timer = DisposableTimer.DebugDuration<DocTypeGridEditorHelper>(string.Format("ConvertValue ({0}, {1})", id, contentTypeAlias)))
47+
using (var timer = ApplicationContext.Current.ProfilingLogger.DebugDuration<DocTypeGridEditorHelper>(string.Format("ConvertValue ({0}, {1})", id, contentTypeAlias)))
4848
{
4949
var contentTypes = GetContentTypesByAlias(contentTypeAlias);
5050
var properties = new List<IPublishedProperty>();

‎src/Our.Umbraco.DocTypeGridEditor/Our.Umbraco.DocTypeGridEditor.csproj

Lines changed: 132 additions & 76 deletions
Large diffs are not rendered by default.

‎src/Our.Umbraco.DocTypeGridEditor/Web/Helpers/SurfaceControllerHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal static class SurfaceControllerHelper
1414
{
1515
public static bool SurfaceControllerExists(string controllerName, string actionName = "Index")
1616
{
17-
using (var timer = DisposableTimer.DebugDuration<Bootstrap>(string.Format("SurfaceControllerExists ({0}, {1})", controllerName, actionName)))
17+
using (var timer = ApplicationContext.Current.ProfilingLogger.DebugDuration<Bootstrap>(string.Format("SurfaceControllerExists ({0}, {1})", controllerName, actionName)))
1818
{
1919
// Setup dummy route data
2020
var rd = new RouteData();

‎src/Our.Umbraco.DocTypeGridEditor/app.config

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,56 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
10+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
14+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
15+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
1616
</dependentAssembly>
1717
<dependentAssembly>
18-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
18+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
19+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
2020
</dependentAssembly>
2121
<dependentAssembly>
22-
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
23-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
22+
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
23+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
27+
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
31+
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
35+
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
36+
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
39+
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
40+
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral"/>
43+
<bindingRedirect oldVersion="0.0.0.0-6.9.9.0" newVersion="6.9.9.0"/>
44+
</dependentAssembly>
45+
<dependentAssembly>
46+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
47+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
2448
</dependentAssembly>
2549
</assemblyBinding>
2650
</runtime>
27-
</configuration>
51+
<system.data>
52+
<DbProviderFactories>
53+
<remove invariant="MySql.Data.MySqlClient"/>
54+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
55+
</DbProviderFactories>
56+
</system.data></configuration>

‎src/Our.Umbraco.DocTypeGridEditor/packages.config

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,42 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
4-
<package id="ClientDependency" version="1.8.2.1" targetFramework="net45" />
4+
<package id="ClientDependency" version="1.8.4" targetFramework="net45" />
55
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net45" />
6-
<package id="Examine" version="0.1.57.2941" targetFramework="net45" />
7-
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
8-
<package id="ImageProcessor" version="1.9.5.0" targetFramework="net45" />
9-
<package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net45" />
6+
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
7+
<package id="Examine" version="0.1.68.0" targetFramework="net45" />
8+
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
9+
<package id="ImageProcessor" version="2.3.0.0" targetFramework="net45" />
10+
<package id="ImageProcessor.Web" version="4.4.0.0" targetFramework="net45" />
1011
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
11-
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
12-
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
13-
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
14-
<package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
15-
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
16-
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
17-
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
18-
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
12+
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
13+
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
14+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
15+
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="5.0.0" targetFramework="net45" />
16+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
17+
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
18+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
19+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
20+
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
21+
<package id="Microsoft.AspNet.WebHelpers" version="3.2.3" targetFramework="net45" />
22+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
23+
<package id="Microsoft.AspNet.WebPages.Data" version="3.2.3" targetFramework="net45" />
24+
<package id="Microsoft.AspNet.WebPages.WebData" version="3.2.3" targetFramework="net45" />
25+
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
26+
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
27+
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
28+
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
29+
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net45" />
30+
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />
31+
<package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net45" />
32+
<package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net45" />
1933
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2034
<package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
21-
<package id="MySql.Data" version="6.6.5" targetFramework="net45" />
22-
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
35+
<package id="MySql.Data" version="6.9.9" targetFramework="net45" />
36+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
37+
<package id="Owin" version="1.0" targetFramework="net45" />
38+
<package id="semver" version="1.1.2" targetFramework="net45" />
2339
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
24-
<package id="UmbracoCms.Core" version="7.2.0" targetFramework="net45" />
40+
<package id="UmbracoCms.Core" version="7.3.0" targetFramework="net45" />
2541
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
2642
</packages>

0 commit comments

Comments
 (0)