Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Umbraco.MultiUrlPicker #60

Merged
merged 7 commits into from
Oct 23, 2019
Merged

Add support for Umbraco.MultiUrlPicker #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d09563
Set release to 1.7.1
dawoe Apr 16, 2019
61d4ba5
Set release build for 1.7.2
dawoe Aug 7, 2019
19aa03a
Merge branch 'release/1.7.2'
dawoe Aug 7, 2019
e9b8a35
Set release to 1.7.3
dawoe Sep 19, 2019
84a9df5
Merge branch 'release/1.7.3'
dawoe Sep 19, 2019
f936ece
Amend MultiUrlPicker parser to work with Umbraco 7.14+
benjaminc Oct 22, 2019
49b9218
Add unit test to validate new data type support
benjaminc Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyVersion("1.7.3.0")]
[assembly: AssemblyFileVersion("1.7.3.0")]
4 changes: 2 additions & 2 deletions Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyVersion("1.7.3.0")]
[assembly: AssemblyFileVersion("1.7.3.0")]


4 changes: 2 additions & 2 deletions Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyVersion("1.7.3.0")]
[assembly: AssemblyFileVersion("1.7.3.0")]
20 changes: 20 additions & 0 deletions .../Our.Umbraco.Nexu.Parsers.Tests/PropertyParsers/Community/RjpMultiUrlPickerParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,26 @@ public void TestIsParserForValidDataType()
Assert.IsTrue(result);
}

/// <summary>
/// The test is parser for valid data type.
/// </summary>
[Test]
[Category("PropertyParsers")]
[Category("CommunityPropertyParsers")]
public void TestIsParserForNewDataType()
{
// arrange
var dataTypeDefinition = new DataTypeDefinition("Umbraco.MultiUrlPicker");

var parser = new RjpMultiUrlPickerParser();

// act
var result = parser.IsParserFor(dataTypeDefinition);

// verify
Assert.IsTrue(result);
}

/// <summary>
/// The test is parser for in valid data type.
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyVersion("1.7.3.0")]
[assembly: AssemblyFileVersion("1.7.3.0")]
2 changes: 1 addition & 1 deletion Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Community/RjpMultiUrlPickerParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public RjpMultiUrlPickerParser(IContentService contentService, IMediaService med
/// </returns>
public bool IsParserFor(IDataTypeDefinition dataTypeDefinition)
{
return dataTypeDefinition.PropertyEditorAlias.Equals("RJP.MultiUrlPicker");
return dataTypeDefinition.PropertyEditorAlias.Equals("Umbraco.MultiUrlPicker") || dataTypeDefinition.PropertyEditorAlias.Equals("RJP.MultiUrlPicker");
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ environment:
os: Visual Studio 2015

# Version format
version: 2.0.0.{build}
version: 1.7.3.{build}

cache:
- Source\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
Expand All @@ -18,7 +18,7 @@ branches:
# UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
# example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
init:
- set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
- set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=rtm

test:
assemblies:
Expand Down