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

Commit 591cc4d

Browse files
leekelleherleekelleher
committed
Upgraded Umbraco dependency to v7.6.0
Resolves #115
1 parent ed7b3a5 commit 591cc4d

File tree

3 files changed

+56
-67
lines changed

3 files changed

+56
-67
lines changed

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

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -32,40 +32,20 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="businesslogic, Version=1.0.5885.31228, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\businesslogic.dll</HintPath>
35+
<Reference Include="businesslogic, Version=1.0.6331.7969, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\UmbracoCms.Core.7.6.0\lib\net45\businesslogic.dll</HintPath>
3737
<Private>False</Private>
3838
</Reference>
39-
<Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\ClientDependency.1.8.4\lib\net45\ClientDependency.Core.dll</HintPath>
39+
<Reference Include="cms, Version=1.0.6331.7970, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\UmbracoCms.Core.7.6.0\lib\net45\cms.dll</HintPath>
4141
<Private>False</Private>
4242
</Reference>
43-
<Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
43+
<Reference Include="interfaces">
44+
<HintPath>..\packages\UmbracoCms.Core.7.6.0\lib\net45\interfaces.dll</HintPath>
4545
<Private>False</Private>
4646
</Reference>
47-
<Reference Include="cms, Version=1.0.5885.31228, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\cms.dll</HintPath>
49-
<Private>False</Private>
50-
</Reference>
51-
<Reference Include="interfaces, Version=1.0.5885.31225, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\interfaces.dll</HintPath>
53-
<Private>False</Private>
54-
</Reference>
55-
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\log4net.dll</HintPath>
57-
<Private>False</Private>
58-
</Reference>
59-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<Private>False</Private>
61-
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
62-
</Reference>
63-
<Reference Include="MiniProfiler">
64-
<HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
65-
<Private>False</Private>
66-
</Reference>
67-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
47+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
6949
<Private>False</Private>
7050
</Reference>
7151
<Reference Include="System" />
@@ -81,15 +61,14 @@
8161
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
8262
<Private>False</Private>
8363
</Reference>
84-
<Reference Include="System.Xml.Linq" />
8564
<Reference Include="Microsoft.CSharp" />
8665
<Reference Include="System.Xml" />
87-
<Reference Include="umbraco, Version=1.0.5885.31230, Culture=neutral, processorArchitecture=MSIL">
88-
<HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\umbraco.dll</HintPath>
66+
<Reference Include="umbraco, Version=1.0.6331.7975, Culture=neutral, processorArchitecture=MSIL">
67+
<HintPath>..\packages\UmbracoCms.Core.7.6.0\lib\net45\umbraco.dll</HintPath>
8968
<Private>False</Private>
9069
</Reference>
91-
<Reference Include="Umbraco.Core, Version=1.0.5885.31226, Culture=neutral, processorArchitecture=MSIL">
92-
<HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\Umbraco.Core.dll</HintPath>
70+
<Reference Include="Umbraco.Core, Version=1.0.6331.7966, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\packages\UmbracoCms.Core.7.6.0\lib\net45\Umbraco.Core.dll</HintPath>
9372
<Private>False</Private>
9473
</Reference>
9574
</ItemGroup>
@@ -143,6 +122,7 @@
143122
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
144123
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
145124
</Target>
125+
<Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
146126
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
147127
Other similar extension points exist, see Microsoft.Common.targets.
148128
<Target Name="BeforeBuild">

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

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,60 @@
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-10.0.0.0" newVersion="10.0.0.0" />
88
</dependentAssembly>
99
<dependentAssembly>
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"/>
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-3.0.0.0" newVersion="3.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" />
2424
</dependentAssembly>
2525
<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"/>
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" />
2828
</dependentAssembly>
2929
<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"/>
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" />
3232
</dependentAssembly>
3333
<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"/>
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" />
3636
</dependentAssembly>
3737
<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"/>
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" />
4040
</dependentAssembly>
4141
<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"/>
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" />
4444
</dependentAssembly>
4545
<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"/>
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" />
48+
</dependentAssembly>
49+
<dependentAssembly>
50+
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
51+
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
4852
</dependentAssembly>
4953
</assemblyBinding>
5054
</runtime>
5155
<system.data>
5256
<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"/>
57+
<remove invariant="MySql.Data.MySqlClient" />
58+
<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" />
5559
</DbProviderFactories>
5660
</system.data></configuration>

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
4-
<package id="ClientDependency" version="1.8.4" targetFramework="net45" />
3+
<package id="AutoMapper" version="3.3.1" targetFramework="net45" />
4+
<package id="ClientDependency" version="1.9.7" targetFramework="net45" />
55
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net45" />
66
<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.3.0" targetFramework="net45" />
10-
<package id="ImageProcessor.Web" version="4.5.3.0" targetFramework="net45" />
7+
<package id="Examine" version="0.1.82" targetFramework="net45" />
8+
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
9+
<package id="ImageProcessor" version="2.5.3" targetFramework="net45" />
10+
<package id="ImageProcessor.Web" version="4.8.3" targetFramework="net45" />
11+
<package id="log4net" version="2.0.8" targetFramework="net45" />
12+
<package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
1113
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
12-
<package id="Markdown" version="1.14.4" targetFramework="net45" />
14+
<package id="Markdown" version="1.14.7" targetFramework="net45" />
1315
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
1416
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
1517
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
1618
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="5.0.0" targetFramework="net45" />
1719
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
20+
<package id="Microsoft.AspNet.SignalR.Core" version="2.2.1" targetFramework="net45" />
1821
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
1922
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
2023
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
@@ -25,6 +28,7 @@
2528
<package id="Microsoft.AspNet.WebPages.WebData" version="3.2.3" targetFramework="net45" />
2629
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
2730
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
31+
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.1" targetFramework="net45" />
2832
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
2933
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
3034
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net45" />
@@ -34,11 +38,12 @@
3438
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
3539
<package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
3640
<package id="MySql.Data" version="6.9.9" targetFramework="net45" />
37-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
41+
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
3842
<package id="Owin" version="1.0" targetFramework="net45" />
3943
<package id="semver" version="1.1.2" targetFramework="net45" />
4044
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
41-
<package id="UmbracoCms.Core" version="7.4.0" targetFramework="net45" />
45+
<package id="System.Threading.Tasks.Dataflow" version="4.7.0" targetFramework="net45" />
46+
<package id="UmbracoCms.Core" version="7.6.0" targetFramework="net45" />
4247
<package id="UrlRewritingNet" version="2.0.7" targetFramework="net45" />
4348
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
4449
</packages>

0 commit comments

Comments
 (0)