lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-24 05:42:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.x

Browse Source
This commit is contained in:
Sebastien Ros
2015-05-05 21:40:02 -07:00
parent 324214e812 12a95c0335
commit 2c45b9b13e
175 changed files with 526 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Tests.Modules/DesignerTools/Services/ObjectDumperTests.cs
View File

@@ -48,7 +48,9 @@ namespace Orchard.Tests.Modules.DesignerTools.Services
private static void ComparareJsonObject(JObject expectedResult, string json) {
var objectDumperJson = JToken.Parse("{" + json + "}");
Assert.IsTrue(JToken.DeepEquals(expectedResult, objectDumperJson));
string message = String.Format("expected: {0} \r\nresult:{1}", expectedResult.ToString(Formatting.Indented), objectDumperJson.ToString(Formatting.Indented));
Assert.IsTrue(JToken.DeepEquals(expectedResult, objectDumperJson), message);
}
[Test]

6
src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
View File

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
[assembly: AssemblyCopyright("Copyright © .NET Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")]
[assembly: AssemblyFileVersion("1.8")]
[assembly: AssemblyVersion("1.9.0")]
[assembly: AssemblyFileVersion("1.9.0")]