Skip to content

Commit 2d6c094

Browse files
author
Dave de Moel
committed
Updated Umbraco 8 to umbraco 8.14.1 and fixed mediapicker3 converter
+semver: breaking
1 parent 2d35336 commit 2d6c094

File tree

940 files changed

+22371
-7150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

940 files changed

+22371
-7150
lines changed

‎src/UmbracoContentApi/UmbracoContentApi.Core.Old/Converters/MediaPicker3Converter.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using Umbraco.Core.Models.PublishedContent;
4+
using Umbraco.Core.Models;
55
using UmbracoContentApi.Core.Resolvers;
66

77
namespace UmbracoContentApi.Core.Converters
@@ -24,12 +24,12 @@ public object Convert(object value, Dictionary<string, object> options = null)
2424
throw new ArgumentNullException(nameof(value), $"A value for {EditorAlias} is required.");
2525
}
2626

27-
if (value is IEnumerable<IPublishedContent> ar)
27+
if (value is IEnumerable<MediaWithCrops> ar)
2828
{
29-
return ar.Select(t => _contentResolver.Value.ResolveContent(t, options)).ToList();
29+
return ar.Select(t => _contentResolver.Value.ResolveContent(t.MediaItem, options)).ToList();
3030
}
3131

32-
return _contentResolver.Value.ResolveContent((IPublishedElement)value, options);
32+
return _contentResolver.Value.ResolveContent(((MediaWithCrops)value).MediaItem, options);
3333
}
3434
}
3535
}

‎src/UmbracoContentApi/UmbracoContentApi.Core.Old/UmbracoContentApi.Core.Old.csproj

+35-7
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
4343
<HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Examine, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Examine.1.0.2\lib\net452\Examine.dll</HintPath>
45+
<Reference Include="Examine, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Examine.1.2.0\lib\net452\Examine.dll</HintPath>
4747
</Reference>
4848
<Reference Include="HtmlAgilityPack, Version=1.11.8.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
4949
<HintPath>..\packages\HtmlAgilityPack.1.11.8\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -75,6 +75,12 @@
7575
<Reference Include="Markdown, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1b320cc08ad5aa89, processorArchitecture=MSIL">
7676
<HintPath>..\packages\Markdown.2.2.1\lib\net451\Markdown.dll</HintPath>
7777
</Reference>
78+
<Reference Include="MessagePack, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b4a0369545f0a1be, processorArchitecture=MSIL">
79+
<HintPath>..\packages\MessagePack.2.1.165\lib\netstandard2.0\MessagePack.dll</HintPath>
80+
</Reference>
81+
<Reference Include="MessagePack.Annotations, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b4a0369545f0a1be, processorArchitecture=MSIL">
82+
<HintPath>..\packages\MessagePack.Annotations.2.1.165\lib\netstandard2.0\MessagePack.Annotations.dll</HintPath>
83+
</Reference>
7884
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7985
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
8086
</Reference>
@@ -84,6 +90,9 @@
8490
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8591
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
8692
</Reference>
93+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
94+
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
95+
</Reference>
8796
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
8897
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
8998
</Reference>
@@ -160,6 +169,9 @@
160169
<HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
161170
</Reference>
162171
<Reference Include="System" />
172+
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
173+
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
174+
</Reference>
163175
<Reference Include="System.ComponentModel.DataAnnotations" />
164176
<Reference Include="System.Configuration" />
165177
<Reference Include="System.Core" />
@@ -175,17 +187,33 @@
175187
</Reference>
176188
<Reference Include="System.IO" />
177189
<Reference Include="System.Linq.Expressions" />
190+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
191+
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
192+
</Reference>
178193
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
179194
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
180195
</Reference>
196+
<Reference Include="System.Numerics" />
197+
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
198+
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
199+
</Reference>
181200
<Reference Include="System.Runtime" />
182201
<Reference Include="System.Runtime.Caching" />
202+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
203+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
204+
</Reference>
183205
<Reference Include="System.Runtime.Serialization" />
184206
<Reference Include="System.Security" />
207+
<Reference Include="System.Text.Encoding.CodePages, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
208+
<HintPath>..\packages\System.Text.Encoding.CodePages.4.7.1\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
209+
</Reference>
185210
<Reference Include="System.Threading.Tasks" />
186211
<Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
187212
<HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
188213
</Reference>
214+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
215+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
216+
</Reference>
189217
<Reference Include="System.Transactions" />
190218
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
191219
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
@@ -223,19 +251,19 @@
223251
<Reference Include="System.Net.Http" />
224252
<Reference Include="System.Xml" />
225253
<Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
226-
<HintPath>..\packages\UmbracoCms.Core.8.7.0\lib\net472\Umbraco.Core.dll</HintPath>
254+
<HintPath>..\packages\UmbracoCms.Core.8.14.1\lib\net472\Umbraco.Core.dll</HintPath>
227255
</Reference>
228256
<Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
229-
<HintPath>..\packages\UmbracoCms.Web.8.7.0\lib\net472\Umbraco.Examine.dll</HintPath>
257+
<HintPath>..\packages\UmbracoCms.Web.8.14.1\lib\net472\Umbraco.Examine.dll</HintPath>
230258
</Reference>
231259
<Reference Include="Umbraco.ModelsBuilder.Embedded, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
232-
<HintPath>..\packages\UmbracoCms.Web.8.7.0\lib\net472\Umbraco.ModelsBuilder.Embedded.dll</HintPath>
260+
<HintPath>..\packages\UmbracoCms.Web.8.14.1\lib\net472\Umbraco.ModelsBuilder.Embedded.dll</HintPath>
233261
</Reference>
234262
<Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
235-
<HintPath>..\packages\UmbracoCms.Web.8.7.0\lib\net472\Umbraco.Web.dll</HintPath>
263+
<HintPath>..\packages\UmbracoCms.Web.8.14.1\lib\net472\Umbraco.Web.dll</HintPath>
236264
</Reference>
237265
<Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
238-
<HintPath>..\packages\UmbracoCms.Web.8.7.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
266+
<HintPath>..\packages\UmbracoCms.Web.8.14.1\lib\net472\Umbraco.Web.UI.dll</HintPath>
239267
</Reference>
240268
</ItemGroup>
241269
<ItemGroup>

‎src/UmbracoContentApi/UmbracoContentApi.Core.Old/app.config

+12
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@
3434
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
3535
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
3636
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
40+
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
43+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
44+
</dependentAssembly>
45+
<dependentAssembly>
46+
<assemblyIdentity name="MessagePack" publicKeyToken="b4a0369545f0a1be" culture="neutral" />
47+
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
48+
</dependentAssembly>
3749
</assemblyBinding>
3850
</runtime>
3951
</configuration>

‎src/UmbracoContentApi/UmbracoContentApi.Core.Old/packages.config

+14-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="ClientDependency" version="1.9.9" targetFramework="net472" />
44
<package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net472" />
55
<package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
6-
<package id="Examine" version="1.0.2" targetFramework="net472" />
6+
<package id="Examine" version="1.2.0" targetFramework="net472" />
77
<package id="HtmlAgilityPack" version="1.11.8" targetFramework="net472" />
88
<package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
99
<package id="LightInject" version="5.4.0" targetFramework="net472" />
@@ -13,6 +13,8 @@
1313
<package id="LightInject.WebApi" version="2.0.0" targetFramework="net472" />
1414
<package id="Lucene.Net" version="3.0.3" targetFramework="net472" />
1515
<package id="Markdown" version="2.2.1" targetFramework="net472" />
16+
<package id="MessagePack" version="2.1.165" targetFramework="net472" />
17+
<package id="MessagePack.Annotations" version="2.1.165" targetFramework="net472" />
1618
<package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net472" />
1719
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net472" />
1820
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
@@ -23,6 +25,7 @@
2325
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
2426
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
2527
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
28+
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
2629
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
2730
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net472" />
2831
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
@@ -50,10 +53,18 @@
5053
<package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
5154
<package id="SharpZipLib" version="0.86.0" targetFramework="net472" />
5255
<package id="Superpower" version="2.0.0" targetFramework="net472" />
56+
<package id="System.Buffers" version="4.4.0" targetFramework="net472" />
5357
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
58+
<package id="System.Memory" version="4.5.3" targetFramework="net472" />
59+
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net472" />
60+
<package id="System.Reflection.Emit" version="4.6.0" targetFramework="net472" />
61+
<package id="System.Reflection.Emit.Lightweight" version="4.6.0" targetFramework="net472" />
62+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net472" />
63+
<package id="System.Text.Encoding.CodePages" version="4.7.1" targetFramework="net472" />
5464
<package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
65+
<package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
5566
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
5667
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
57-
<package id="UmbracoCms.Core" version="8.7.0" targetFramework="net472" />
58-
<package id="UmbracoCms.Web" version="8.7.0" targetFramework="net472" />
68+
<package id="UmbracoCms.Core" version="8.14.1" targetFramework="net472" />
69+
<package id="UmbracoCms.Web" version="8.14.1" targetFramework="net472" />
5970
</packages>

‎src/UmbracoContentApi/UmbracoContentApi.Umbraco/App_Data/Umbraco.sdf

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)