Skip to content

Commit 0e511ab

Browse files
dawoedawoe
committed
Merge branch 'release/4.1.0'
2 parents 4add266 + d232af5 commit 0e511ab

File tree

12 files changed

+41
-24
lines changed

12 files changed

+41
-24
lines changed

‎Packaging/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<!-- SHARED PROPERTIES -->
1818
<PropertyGroup>
1919
<PackageName>Dawoe.OEmbedPickerPropertyEditor</PackageName>
20-
<MinUmbracoVersion>8.0.0</MinUmbracoVersion>
20+
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
2121
<Readme><![CDATA[This package implements a property editor that allows you to easily insert items that support the oEmbed protocol]]></Readme>
2222
<AuthorName>Dave Woestenborghs</AuthorName>
2323
<AuthorUrl>https://github.com/dawoe/</AuthorUrl>

‎Packaging/package.core.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<language></language>
1717
<tags></tags>
1818
<dependencies>
19-
<dependency id="UmbracoCms.Core" version="8.0.0" />
19+
<dependency id="UmbracoCms.Core" version="8.1.0" />
2020
</dependencies>
2121
</metadata>
2222
</package>

‎Packaging/package.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<language></language>
1717
<tags></tags>
1818
<dependencies>
19-
<dependency id="UmbracoCms.Core" version="8.0.0" />
20-
<dependency id="Dawoe.OEmbedPickerPropertyEditor.Core" version="4.0.0" />
19+
<dependency id="UmbracoCms.Core" version="8.1.0" />
20+
<dependency id="Dawoe.OEmbedPickerPropertyEditor.Core" version="4.1.0" />
2121
</dependencies>
2222
</metadata>
2323
</package>

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ For multiple embeds :
5656

5757
```
5858
@using Dawoe.OEmbedPickerPropertyEditor.Models;
59-
@for(var item in Model.Value<IEnumerable<OEmbedItem>>("propalias"))
59+
@foreach(var item in Model.Value<IEnumerable<OEmbedItem>>("propalias"))
6060
{
6161
<div>@item.EmbedCode</div>
6262
}

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
image: Visual Studio 2017
22

33
# Version format
4-
version: 4.0.0.{build}
4+
version: 4.1.0.{build}
55

66
branches:
77
only:

‎src/Dawoe.OEmbedPickerPropertyEditor.Web/Dawoe.OEmbedPickerPropertyEditor.Web.csproj

+9-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
37-
<HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
36+
<Reference Include="AutoMapper, Version=8.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
37+
<HintPath>..\packages\AutoMapper.8.1.1\lib\net461\AutoMapper.dll</HintPath>
3838
</Reference>
3939
<Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
4040
<HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
@@ -93,9 +93,15 @@
9393
<Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
9494
<HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
9595
</Reference>
96+
<Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
98+
</Reference>
9699
<Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
97100
<HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
98101
</Reference>
102+
<Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
103+
<HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
104+
</Reference>
99105
<Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
100106
<HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
101107
</Reference>
@@ -135,7 +141,7 @@
135141
<Reference Include="System.Net.Http" />
136142
<Reference Include="System.Xml" />
137143
<Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
138-
<HintPath>..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll</HintPath>
144+
<HintPath>..\packages\UmbracoCms.Core.8.1.0\lib\net472\Umbraco.Core.dll</HintPath>
139145
</Reference>
140146
</ItemGroup>
141147
<ItemGroup>

‎src/Dawoe.OEmbedPickerPropertyEditor.Web/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("4.0.0.0")]
36-
[assembly: AssemblyFileVersion("4.0.0.0")]
35+
[assembly: AssemblyVersion("4.1.0.0")]
36+
[assembly: AssemblyFileVersion("4.1.0.0")]

‎src/Dawoe.OEmbedPickerPropertyEditor.Web/packages.config

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="8.0.0" targetFramework="net472" />
3+
<package id="AutoMapper" version="8.1.1" targetFramework="net472" />
44
<package id="LightInject" version="5.4.0" targetFramework="net472" />
55
<package id="LightInject.Annotation" version="1.1.0" targetFramework="net472" />
66
<package id="LightInject.Web" version="2.0.0" targetFramework="net472" />
@@ -21,10 +21,12 @@
2121
<package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
2222
<package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
2323
<package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
24+
<package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
2425
<package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
26+
<package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
2527
<package id="Superpower" version="2.0.0" targetFramework="net472" />
2628
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
2729
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
2830
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
29-
<package id="UmbracoCms.Core" version="8.0.0" targetFramework="net472" />
31+
<package id="UmbracoCms.Core" version="8.1.0" targetFramework="net472" />
3032
</packages>

‎src/Dawoe.OEmbedPickerPropertyEditor/Dawoe.OEmbedPickerPropertyEditor.csproj

+9-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
37-
<HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
36+
<Reference Include="AutoMapper, Version=8.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
37+
<HintPath>..\packages\AutoMapper.8.1.1\lib\net461\AutoMapper.dll</HintPath>
3838
</Reference>
3939
<Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
4040
<HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
@@ -93,9 +93,15 @@
9393
<Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
9494
<HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
9595
</Reference>
96+
<Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
98+
</Reference>
9699
<Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
97100
<HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
98101
</Reference>
102+
<Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
103+
<HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
104+
</Reference>
99105
<Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
100106
<HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
101107
</Reference>
@@ -135,7 +141,7 @@
135141
<Reference Include="System.Net.Http" />
136142
<Reference Include="System.Xml" />
137143
<Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
138-
<HintPath>..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll</HintPath>
144+
<HintPath>..\packages\UmbracoCms.Core.8.1.0\lib\net472\Umbraco.Core.dll</HintPath>
139145
</Reference>
140146
</ItemGroup>
141147
<ItemGroup>

‎src/Dawoe.OEmbedPickerPropertyEditor/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("4.0.0.0")]
36-
[assembly: AssemblyFileVersion("4.0.0.0")]
35+
[assembly: AssemblyVersion("4.1.0.0")]
36+
[assembly: AssemblyFileVersion("4.1.0.0")]

‎src/Dawoe.OEmbedPickerPropertyEditor/ValueConverters/OEmbedPickerValueConverter.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
public class OEmbedPickerValueConverter : PropertyValueConverterBase
1919
{
2020
/// <inheritdoc />
21-
public override bool IsConverter(PublishedPropertyType propertyType) =>
21+
public override bool IsConverter(IPublishedPropertyType propertyType) =>
2222
Constants.DataEditorAlias.Equals(propertyType.EditorAlias);
2323

2424
/// <inheritdoc />
25-
public override Type GetPropertyValueType(PublishedPropertyType propertyType) =>
25+
public override Type GetPropertyValueType(IPublishedPropertyType propertyType) =>
2626
propertyType.DataType.ConfigurationAs<OEmbedPickerConfiguration>().AllowMultiple
2727
? typeof(IEnumerable<OEmbedItem>)
2828
: typeof(OEmbedItem);
@@ -33,14 +33,15 @@ public override Type GetPropertyValueType(PublishedPropertyType propertyType) =>
3333
/// <inheritdoc />
3434
public override object ConvertSourceToIntermediate(
3535
IPublishedElement owner,
36-
PublishedPropertyType propertyType,
36+
IPublishedPropertyType propertyType,
3737
object source,
3838
bool preview) =>
3939
source?.ToString();
4040

41+
/// <inheritdoc />
4142
public override object ConvertIntermediateToObject(
4243
IPublishedElement owner,
43-
PublishedPropertyType propertyType,
44+
IPublishedPropertyType propertyType,
4445
PropertyCacheLevel referenceCacheLevel,
4546
object inter,
4647
bool preview)

‎src/Dawoe.OEmbedPickerPropertyEditor/packages.config

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="8.0.0" targetFramework="net472" />
3+
<package id="AutoMapper" version="8.1.1" targetFramework="net472" />
44
<package id="LightInject" version="5.4.0" targetFramework="net472" />
55
<package id="LightInject.Annotation" version="1.1.0" targetFramework="net472" />
66
<package id="LightInject.Web" version="2.0.0" targetFramework="net472" />
@@ -21,10 +21,12 @@
2121
<package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
2222
<package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
2323
<package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
24+
<package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
2425
<package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
26+
<package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
2527
<package id="Superpower" version="2.0.0" targetFramework="net472" />
2628
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
2729
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
2830
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
29-
<package id="UmbracoCms.Core" version="8.0.0" targetFramework="net472" />
31+
<package id="UmbracoCms.Core" version="8.1.0" targetFramework="net472" />
3032
</packages>

0 commit comments

Comments
 (0)