diff --git a/src/Umbraco.Core/Dynamics/DynamicXml.cs b/src/Umbraco.Core/Dynamics/DynamicXml.cs index 5fd97fc778..6e1f178c97 100644 --- a/src/Umbraco.Core/Dynamics/DynamicXml.cs +++ b/src/Umbraco.Core/Dynamics/DynamicXml.cs @@ -322,7 +322,7 @@ namespace Umbraco.Core.Dynamics { var firstElement = elements.FirstOrDefault(); //we have a single element, does it have any children? - if (firstElement != null && firstElement.Elements().Count() == 0 && !firstElement.HasAttributes) + if (firstElement != null && firstElement.Elements().Any() == false && firstElement.HasAttributes == false) { //no, return the text result = firstElement.Value; diff --git a/src/Umbraco.Core/ExpressionHelper.cs b/src/Umbraco.Core/ExpressionHelper.cs index c34c4591b8..4c5c60dcd5 100644 --- a/src/Umbraco.Core/ExpressionHelper.cs +++ b/src/Umbraco.Core/ExpressionHelper.cs @@ -310,13 +310,10 @@ namespace Umbraco.Core /// public static bool IsMethod(Expression expression) { - return expression != null && typeof(MethodCallExpression).IsAssignableFrom(expression.GetType()); + return expression is MethodCallExpression; } - - - /// /// Determines whether the specified expression is a member. /// @@ -325,7 +322,7 @@ namespace Umbraco.Core /// public static bool IsMember(Expression expression) { - return expression != null && typeof(MemberExpression).IsAssignableFrom(expression.GetType()); + return expression is MemberExpression; } /// @@ -336,7 +333,7 @@ namespace Umbraco.Core /// public static bool IsConstant(Expression expression) { - return expression != null && typeof(ConstantExpression).IsAssignableFrom(expression.GetType()); + return expression is ConstantExpression; } /// @@ -349,7 +346,7 @@ namespace Umbraco.Core { if (arguments == null) return false; return - arguments.Where(x => typeof(ConstantExpression).IsAssignableFrom(x.GetType())).Cast + arguments.Where(x => x is ConstantExpression).Cast ().Select(x => x.Value).DefaultIfEmpty(null).FirstOrDefault(); } } diff --git a/src/Umbraco.Core/ObjectExtensions.cs b/src/Umbraco.Core/ObjectExtensions.cs index dc497eadb1..b75f983cb3 100644 --- a/src/Umbraco.Core/ObjectExtensions.cs +++ b/src/Umbraco.Core/ObjectExtensions.cs @@ -478,7 +478,7 @@ namespace Umbraco.Core var items = (from object enumItem in enumerable let value = GetEnumPropertyDebugString(enumItem, levels) where value != null select value).Take(10).ToList(); - return items.Count() > 0 + return items.Any() ? "{{ {0} }}".InvariantFormat(String.Join(", ", items)) : null; } @@ -505,7 +505,7 @@ namespace Umbraco.Core where value != null select "{0}={1}".InvariantFormat(propertyInfo.Name, value); - return items.Count() > 0 + return items.Any() ? "[{0}]:{{ {1} }}".InvariantFormat(obj.GetType().Name, String.Join(", ", items)) : null; } diff --git a/src/Umbraco.Core/Persistence/FaultHandling/ThrottlingCondition.cs b/src/Umbraco.Core/Persistence/FaultHandling/ThrottlingCondition.cs index 7aa27355ac..678ec12f10 100644 --- a/src/Umbraco.Core/Persistence/FaultHandling/ThrottlingCondition.cs +++ b/src/Umbraco.Core/Persistence/FaultHandling/ThrottlingCondition.cs @@ -171,7 +171,7 @@ namespace Umbraco.Core.Persistence.FaultHandling /// public bool IsThrottledOnDataSpace { - get { return this.throttledResources.Where(x => x.Item1 == ThrottledResourceType.PhysicalDatabaseSpace).Count() > 0; } + get { return throttledResources.Any(x => x.Item1 == ThrottledResourceType.PhysicalDatabaseSpace); } } /// @@ -179,7 +179,7 @@ namespace Umbraco.Core.Persistence.FaultHandling /// public bool IsThrottledOnLogSpace { - get { return this.throttledResources.Where(x => x.Item1 == ThrottledResourceType.PhysicalLogSpace).Count() > 0; } + get { return this.throttledResources.Any(x => x.Item1 == ThrottledResourceType.PhysicalLogSpace); } } /// @@ -187,7 +187,7 @@ namespace Umbraco.Core.Persistence.FaultHandling /// public bool IsThrottledOnLogWrite { - get { return this.throttledResources.Where(x => x.Item1 == ThrottledResourceType.LogWriteIoDelay).Count() > 0; } + get { return this.throttledResources.Any(x => x.Item1 == ThrottledResourceType.LogWriteIoDelay); } } /// @@ -195,7 +195,7 @@ namespace Umbraco.Core.Persistence.FaultHandling /// public bool IsThrottledOnDataRead { - get { return this.throttledResources.Where(x => x.Item1 == ThrottledResourceType.DataReadIoDelay).Count() > 0; } + get { return this.throttledResources.Any(x => x.Item1 == ThrottledResourceType.DataReadIoDelay); } } /// @@ -203,7 +203,7 @@ namespace Umbraco.Core.Persistence.FaultHandling /// public bool IsThrottledOnCpu { - get { return this.throttledResources.Where(x => x.Item1 == ThrottledResourceType.Cpu).Count() > 0; } + get { return this.throttledResources.Any(x => x.Item1 == ThrottledResourceType.Cpu); } } /// @@ -211,7 +211,7 @@ namespace Umbraco.Core.Persistence.FaultHandling /// public bool IsThrottledOnDatabaseSize { - get { return this.throttledResources.Where(x => x.Item1 == ThrottledResourceType.DatabaseSize).Count() > 0; } + get { return this.throttledResources.Any(x => x.Item1 == ThrottledResourceType.DatabaseSize); } } /// @@ -219,7 +219,7 @@ namespace Umbraco.Core.Persistence.FaultHandling /// public bool IsThrottledOnWorkerThreads { - get { return this.throttledResources.Where(x => x.Item1 == ThrottledResourceType.WorkerThreads).Count() > 0; } + get { return this.throttledResources.Any(x => x.Item1 == ThrottledResourceType.WorkerThreads); } } /// diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs index a57571262b..ce1c07ec64 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs @@ -1,12 +1,10 @@ -using System; -using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Column; using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Constraint; using Umbraco.Core.Persistence.Migrations.Syntax.Delete.DefaultConstraint; using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions; using Umbraco.Core.Persistence.Migrations.Syntax.Delete.ForeignKey; using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Index; -using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete { diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/IDeleteBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/IDeleteBuilder.cs index 4a31c3bf37..df70d81b0a 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/IDeleteBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/IDeleteBuilder.cs @@ -1,5 +1,4 @@ -using System; -using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Column; +using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Column; using Umbraco.Core.Persistence.Migrations.Syntax.Delete.Constraint; using Umbraco.Core.Persistence.Migrations.Syntax.Delete.DefaultConstraint; using Umbraco.Core.Persistence.Migrations.Syntax.Delete.ForeignKey; diff --git a/src/Umbraco.Core/Persistence/PetaPoco.cs b/src/Umbraco.Core/Persistence/PetaPoco.cs index 7ea9db4ccf..3d4160e4ef 100644 --- a/src/Umbraco.Core/Persistence/PetaPoco.cs +++ b/src/Umbraco.Core/Persistence/PetaPoco.cs @@ -964,7 +964,7 @@ namespace Umbraco.Core.Persistence { // Find the property var candidates = from p in types[j].GetProperties() where p.PropertyType == types[i] select p; - if (candidates.Count() == 0) + if (candidates.Any() == false) continue; if (candidates.Count() > 1) throw new InvalidOperationException(string.Format("Can't auto join {0} as {1} has more than one property of type {0}", types[i], types[j])); diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/DistributedCallElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/DistributedCallElementDefaultTests.cs index e0b1814442..1d8a8726cf 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/DistributedCallElementDefaultTests.cs +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/DistributedCallElementDefaultTests.cs @@ -21,7 +21,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings [Test] public override void Servers() { - Assert.IsTrue(SettingsSection.DistributedCall.Servers.Count() == 0); + Assert.IsTrue(SettingsSection.DistributedCall.Servers.Any() == false); } } } \ No newline at end of file diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementDefaultTests.cs index 7f4e6481de..5c8047895d 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementDefaultTests.cs +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementDefaultTests.cs @@ -14,7 +14,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings [Test] public override void Links() { - Assert.IsTrue(SettingsSection.Help.Links.Count() == 0); + Assert.IsTrue(SettingsSection.Help.Links.Any() == false); } } } \ No newline at end of file diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs index d6003d61d8..8f050c578d 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs @@ -34,7 +34,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings [Test] public override void DisabledLogTypes() { - Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.Count() == 0); + Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.Any() == false); } [Test] public override void CleaningMiliseconds() diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementDefaultTests.cs index b123fe4f7e..5b9343e6f8 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementDefaultTests.cs +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementDefaultTests.cs @@ -14,7 +14,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings [Test] public override void Tasks() { - Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.Count() == 0); + Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.Any() == false); } } } \ No newline at end of file diff --git a/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs b/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs index da91cd13b5..cdd65b4059 100644 --- a/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs +++ b/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs @@ -44,7 +44,7 @@ namespace Umbraco.Tests.Macros public void Get_All() { var engines = MacroEngineFactory.GetAll(); - Assert.AreEqual(2, engines.Count()); + Assert.AreEqual(2, engines.Count); } [Test] diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs index d15addaeb3..01905b6b32 100644 --- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs +++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs @@ -65,11 +65,11 @@ namespace Umbraco.Tests.Manifest var parser = _parser.GetPropertyEditors(a); Assert.AreEqual(1, parser.Count()); - Assert.AreEqual(2, parser.ElementAt(0).PreValueEditor.Fields.Count()); + Assert.AreEqual(2, parser.ElementAt(0).PreValueEditor.Fields.Count); Assert.AreEqual("key1", parser.ElementAt(0).PreValueEditor.Fields.ElementAt(0).Key); Assert.AreEqual("Some config 1", parser.ElementAt(0).PreValueEditor.Fields.ElementAt(0).Name); Assert.AreEqual("/App_Plugins/MyPackage/PropertyEditors/Views/pre-val1.html", parser.ElementAt(0).PreValueEditor.Fields.ElementAt(0).View); - Assert.AreEqual(1, parser.ElementAt(0).PreValueEditor.Fields.ElementAt(0).Validators.Count()); + Assert.AreEqual(1, parser.ElementAt(0).PreValueEditor.Fields.ElementAt(0).Validators.Count); Assert.AreEqual("key2", parser.ElementAt(0).PreValueEditor.Fields.ElementAt(1).Key); Assert.AreEqual("Some config 2", parser.ElementAt(0).PreValueEditor.Fields.ElementAt(1).Name); diff --git a/src/Umbraco.Tests/Migrations/AlterMigrationTests.cs b/src/Umbraco.Tests/Migrations/AlterMigrationTests.cs index 3581567076..49c0e1e8ac 100644 --- a/src/Umbraco.Tests/Migrations/AlterMigrationTests.cs +++ b/src/Umbraco.Tests/Migrations/AlterMigrationTests.cs @@ -26,7 +26,7 @@ namespace Umbraco.Tests.Migrations stub.GetUpExpressions(context); // Assert - Assert.That(context.Expressions.Count(), Is.EqualTo(1)); + Assert.That(context.Expressions.Count, Is.EqualTo(1)); Assert.That(context.Expressions.Single().ToString(), Is.EqualTo("ALTER TABLE [umbracoUser2app] DROP CONSTRAINT [FK_umbracoUser2app_umbracoUser_id]")); } diff --git a/src/Umbraco.Tests/Migrations/MigrationRunnerTests.cs b/src/Umbraco.Tests/Migrations/MigrationRunnerTests.cs index edb294ca65..ee1639d41a 100644 --- a/src/Umbraco.Tests/Migrations/MigrationRunnerTests.cs +++ b/src/Umbraco.Tests/Migrations/MigrationRunnerTests.cs @@ -32,7 +32,7 @@ namespace Umbraco.Tests.Migrations new Database("umbracoDbDSN") , DatabaseProviders.SqlServerCE, Mock.Of(), true); - Assert.AreEqual(1, ctx.Expressions.Count()); + Assert.AreEqual(1, ctx.Expressions.Count); } [Test] @@ -51,7 +51,7 @@ namespace Umbraco.Tests.Migrations new Database("umbracoDbDSN") , DatabaseProviders.SqlServerCE, Mock.Of(), true); - Assert.AreEqual(1, ctx.Expressions.Count()); + Assert.AreEqual(1, ctx.Expressions.Count); } [Test] diff --git a/src/Umbraco.Tests/Models/DeepCloneHelperTests.cs b/src/Umbraco.Tests/Models/DeepCloneHelperTests.cs index d82d0d2ebd..cb0a4edde1 100644 --- a/src/Umbraco.Tests/Models/DeepCloneHelperTests.cs +++ b/src/Umbraco.Tests/Models/DeepCloneHelperTests.cs @@ -37,8 +37,8 @@ namespace Umbraco.Tests.Models var clone = (Test3)test1.DeepClone(); Assert.AreNotSame(test1, clone); - Assert.AreEqual(test1.MyTest1.Count(), clone.MyTest1.Count()); - for (int i = 0; i < test1.MyTest1.Count(); i++) + Assert.AreEqual(test1.MyTest1.Length, clone.MyTest1.Length); + for (int i = 0; i < test1.MyTest1.Length; i++) { Assert.IsNotNull(clone.MyTest1.ElementAt(i)); Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i)); @@ -56,8 +56,8 @@ namespace Umbraco.Tests.Models var clone = (Test4)test1.DeepClone(); Assert.AreNotSame(test1, clone); - Assert.AreEqual(test1.MyTest1.Count(), clone.MyTest1.Count()); - for (int i = 0; i < test1.MyTest1.Count(); i++) + Assert.AreEqual(test1.MyTest1.Length, clone.MyTest1.Length); + for (int i = 0; i < test1.MyTest1.Length; i++) { Assert.IsNotNull(clone.MyTest1.ElementAt(i)); Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i)); diff --git a/src/Umbraco.Tests/Models/PreValueCollectionTests.cs b/src/Umbraco.Tests/Models/PreValueCollectionTests.cs index 49c9ab16bb..c33594b053 100644 --- a/src/Umbraco.Tests/Models/PreValueCollectionTests.cs +++ b/src/Umbraco.Tests/Models/PreValueCollectionTests.cs @@ -34,7 +34,7 @@ namespace Umbraco.Tests.Models Assert.AreNotSame(orig, clone); var oDic = orig.FormatAsDictionary(); var cDic = clone.FormatAsDictionary(); - Assert.AreEqual(oDic.Keys.Count(), cDic.Keys.Count()); + Assert.AreEqual(oDic.Keys.Count, cDic.Keys.Count); foreach (var k in oDic.Keys) { Assert.AreNotSame(oDic[k], cDic[k]); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs index 9c14b56176..cc7be97f87 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -69,7 +69,7 @@ namespace Umbraco.Tests.Persistence.Repositories var result = repository.Move(contentType, container1).ToArray(); unitOfWork.Commit(); - Assert.AreEqual(2, result.Count()); + Assert.AreEqual(2, result.Length); //re-get contentType = repository.Get(contentType.Id); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs index de192e7421..8652807df5 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs @@ -51,7 +51,7 @@ namespace Umbraco.Tests.Persistence.Repositories var standardProps = Constants.Conventions.Member.GetStandardPropertyTypeStubs(); Assert.That(sut, Is.Not.Null); - Assert.That(sut.PropertyGroups.Count(), Is.EqualTo(2)); + Assert.That(sut.PropertyGroups.Count, Is.EqualTo(2)); Assert.That(sut.PropertyTypes.Count(), Is.EqualTo(3 + standardProps.Count)); Assert.That(sut.PropertyGroups.Any(x => x.HasIdentity == false || x.Id == 0), Is.False); diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs index 304ed8c4df..db3dd297ff 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs @@ -71,7 +71,7 @@ namespace Umbraco.Tests.Persistence.Repositories var found = repo.GetAll().ToArray(); - Assert.AreEqual(1, found.Count()); + Assert.AreEqual(1, found.Length); Assert.AreEqual(content[0].Id, found[0].ProtectedNodeId); Assert.AreEqual(content[1].Id, found[0].LoginNodeId); Assert.AreEqual(content[2].Id, found[0].NoAccessNodeId); diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs index ee151e6eaf..87138d15bf 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs @@ -60,7 +60,7 @@ namespace Umbraco.Tests.Persistence.Repositories var found = repo.GetAll().ToArray(); - Assert.AreEqual(1, found.Count()); + Assert.AreEqual(1, found.Length); Assert.AreEqual(0, found.First().AssigneeUserId); Assert.AreEqual(false, found.First().Closed); Assert.AreEqual("hello world", found.First().Comment); diff --git a/src/Umbraco.Tests/Resolvers/MacroFieldEditorsResolverTests.cs b/src/Umbraco.Tests/Resolvers/MacroFieldEditorsResolverTests.cs index b1dfc4c58e..aed49fd7e9 100644 --- a/src/Umbraco.Tests/Resolvers/MacroFieldEditorsResolverTests.cs +++ b/src/Umbraco.Tests/Resolvers/MacroFieldEditorsResolverTests.cs @@ -33,7 +33,7 @@ namespace Umbraco.Tests.Resolvers Resolution.Freeze(); var types = MacroFieldEditorsResolver.Current.MacroControlTypes; - Assert.AreEqual(2, types.Count()); + Assert.AreEqual(2, types.Count); // order is unspecified, but both must be there bool hasType1 = types.ElementAt(0) == typeof(ControlMacroRendering) || types.ElementAt(1) == typeof(ControlMacroRendering); diff --git a/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs b/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs index 4abbf43e63..481325524f 100644 --- a/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs +++ b/src/Umbraco.Tests/Routing/SiteDomainHelperTests.cs @@ -34,13 +34,13 @@ namespace Umbraco.Tests.Routing Assert.Contains("site2", sites.Keys); var domains = sites["site1"]; - Assert.AreEqual(3, domains.Count()); + Assert.AreEqual(3, domains.Length); Assert.Contains("domain1.com", domains); Assert.Contains("domain1.net", domains); Assert.Contains("domain1.org", domains); domains = sites["site2"]; - Assert.AreEqual(3, domains.Count()); + Assert.AreEqual(3, domains.Length); Assert.Contains("domain2.com", domains); Assert.Contains("domain2.net", domains); Assert.Contains("domain2.org", domains); diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs index 361bd4e8a2..43f5703f0e 100644 --- a/src/Umbraco.Tests/Services/EntityServiceTests.cs +++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs @@ -35,7 +35,7 @@ namespace Umbraco.Tests.Services var entities = service.GetAll(UmbracoObjectTypes.Document).ToArray(); Assert.That(entities.Any(), Is.True); - Assert.That(entities.Count(), Is.EqualTo(4)); + Assert.That(entities.Length, Is.EqualTo(4)); Assert.That(entities.Any(x => x.Trashed), Is.True); } @@ -48,7 +48,7 @@ namespace Umbraco.Tests.Services var entities = service.GetAll(objectTypeId).ToArray(); Assert.That(entities.Any(), Is.True); - Assert.That(entities.Count(), Is.EqualTo(4)); + Assert.That(entities.Length, Is.EqualTo(4)); Assert.That(entities.Any(x => x.Trashed), Is.True); } @@ -60,7 +60,7 @@ namespace Umbraco.Tests.Services var entities = service.GetAll().ToArray(); Assert.That(entities.Any(), Is.True); - Assert.That(entities.Count(), Is.EqualTo(4)); + Assert.That(entities.Length, Is.EqualTo(4)); Assert.That(entities.Any(x => x.Trashed), Is.True); } @@ -72,7 +72,7 @@ namespace Umbraco.Tests.Services var entities = service.GetChildren(-1, UmbracoObjectTypes.Document).ToArray(); Assert.That(entities.Any(), Is.True); - Assert.That(entities.Count(), Is.EqualTo(1)); + Assert.That(entities.Length, Is.EqualTo(1)); Assert.That(entities.Any(x => x.Trashed), Is.False); } diff --git a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs index 6846907f35..abebf4de5f 100644 --- a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs +++ b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs @@ -59,8 +59,8 @@ namespace Umbraco.Tests.Services.Importing var uBlogsyBasePage = contentTypes.First(x => x.Alias == "uBlogsyBasePage"); Assert.That(uBlogsyBasePage.ContentTypeCompositionExists("uBlogsyBaseDocType"), Is.True); Assert.That(uBlogsyBasePage.PropertyTypes.Count(), Is.EqualTo(7)); - Assert.That(uBlogsyBasePage.PropertyGroups.Count(), Is.EqualTo(3)); - Assert.That(uBlogsyBasePage.PropertyGroups["Content"].PropertyTypes.Count(), Is.EqualTo(3)); + Assert.That(uBlogsyBasePage.PropertyGroups.Count, Is.EqualTo(3)); + Assert.That(uBlogsyBasePage.PropertyGroups["Content"].PropertyTypes.Count, Is.EqualTo(3)); Assert.That(uBlogsyBasePage.PropertyGroups["SEO"].PropertyTypes.Count(), Is.EqualTo(3)); Assert.That(uBlogsyBasePage.PropertyGroups["Navigation"].PropertyTypes.Count(), Is.EqualTo(1)); Assert.That(uBlogsyBasePage.CompositionPropertyTypes.Count(), Is.EqualTo(12)); diff --git a/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs b/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs index 17e58fb408..ea8c6d7855 100644 --- a/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs +++ b/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs @@ -45,7 +45,7 @@ namespace Umbraco.Tests.Services var result = txtService.GetAllStoredValues(culture); - Assert.AreEqual(4, result.Count()); + Assert.AreEqual(4, result.Count); Assert.AreEqual("testArea1/testKey1", result.ElementAt(0).Key); Assert.AreEqual("testArea1/testKey2", result.ElementAt(1).Key); Assert.AreEqual("testArea2/blah1", result.ElementAt(2).Key); diff --git a/src/Umbraco.Tests/Services/TagServiceTests.cs b/src/Umbraco.Tests/Services/TagServiceTests.cs index fa339729f5..4a98584bb7 100644 --- a/src/Umbraco.Tests/Services/TagServiceTests.cs +++ b/src/Umbraco.Tests/Services/TagServiceTests.cs @@ -60,7 +60,7 @@ namespace Umbraco.Tests.Services .ToList(); // Assert - Assert.AreEqual(3, tags.Count()); + Assert.AreEqual(3, tags.Count); Assert.AreEqual("cow", tags[0].Text); Assert.AreEqual(3, tags[0].NodeCount); Assert.AreEqual("pig", tags[1].Text); diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs index c7002ce79d..8ca015d1b8 100644 --- a/src/Umbraco.Tests/Services/UserServiceTests.cs +++ b/src/Umbraco.Tests/Services/UserServiceTests.cs @@ -56,9 +56,9 @@ namespace Umbraco.Tests.Services //assert Assert.AreEqual(3, permissions.Count()); - Assert.AreEqual(17, permissions.ElementAt(0).AssignedPermissions.Count()); - Assert.AreEqual(17, permissions.ElementAt(1).AssignedPermissions.Count()); - Assert.AreEqual(17, permissions.ElementAt(2).AssignedPermissions.Count()); + Assert.AreEqual(17, permissions.ElementAt(0).AssignedPermissions.Length); + Assert.AreEqual(17, permissions.ElementAt(1).AssignedPermissions.Length); + Assert.AreEqual(17, permissions.ElementAt(2).AssignedPermissions.Length); } [Test] diff --git a/src/Umbraco.Tests/Strings/StylesheetHelperTests.cs b/src/Umbraco.Tests/Strings/StylesheetHelperTests.cs index 94c44e8114..e169b3ff27 100644 --- a/src/Umbraco.Tests/Strings/StylesheetHelperTests.cs +++ b/src/Umbraco.Tests/Strings/StylesheetHelperTests.cs @@ -126,7 +126,7 @@ world */p{font-size: 1em;}")] var results = StylesheetHelper.ParseRules(css); // Assert - Assert.IsTrue(results.Count() == 0); + Assert.IsTrue(results.Any() == false); } } } diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs index 91ca2b1e0f..bcd5c3dd8f 100644 --- a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs +++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs @@ -41,7 +41,7 @@ namespace Umbraco.Tests.TestHelpers.Stubs _umbracoContext, _logger }; var ctors = t.GetConstructors(); - foreach (var ctor in ctors.OrderByDescending(x => x.GetParameters().Count())) + foreach (var ctor in ctors.OrderByDescending(x => x.GetParameters().Length)) { var args = new List(); var allParams = ctor.GetParameters().ToArray(); diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.cs b/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.cs index f2d9006865..57eceee1f5 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.cs @@ -26,7 +26,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs { base.OnPreRender(e); CountOfMacroProperties = MacroObject != null - ? MacroObject.Properties.Count() + ? MacroObject.Properties.Length : 0; } } diff --git a/src/Umbraco.Web/Dynamics/DynamicQueryable.cs b/src/Umbraco.Web/Dynamics/DynamicQueryable.cs index 2810761788..85721d7b14 100644 --- a/src/Umbraco.Web/Dynamics/DynamicQueryable.cs +++ b/src/Umbraco.Web/Dynamics/DynamicQueryable.cs @@ -236,7 +236,7 @@ namespace Umbraco.Web.Dynamics } private static object GetObjectAsTypeOrDefault(object value, Type type) { - if (type.IsAssignableFrom(value.GetType())) + if (type.IsInstanceOfType(value)) { return (object)Convert.ChangeType(value, type); } diff --git a/src/Umbraco.Web/Models/TemplateQuery/PropertyModel.cs b/src/Umbraco.Web/Models/TemplateQuery/PropertyModel.cs index 6c3bdcf037..d1bc860ea0 100644 --- a/src/Umbraco.Web/Models/TemplateQuery/PropertyModel.cs +++ b/src/Umbraco.Web/Models/TemplateQuery/PropertyModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Umbraco.Web.Models.TemplateQuery +namespace Umbraco.Web.Models.TemplateQuery { public class PropertyModel { diff --git a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs index ec64696106..143e16354e 100644 --- a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs +++ b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs @@ -32,7 +32,7 @@ namespace Umbraco.Web.Routing ITypedPublishedContentQuery publishedContentQuery, IDomainService domainService) { - if (error404Collection.Count() > 1) + if (error404Collection.Length > 1) { // try to get the 404 based on current culture (via domain) IContentErrorPage cultureErr; diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs index 1b90ae0dd8..06cd567581 100644 --- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs +++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs @@ -41,7 +41,7 @@ namespace Umbraco.Web.Trees //find all tree definitions that have the current application alias var appTrees = ApplicationContext.Current.Services.ApplicationTreeService.GetApplicationTrees(application, true).ToArray(); - if (appTrees.Count() == 1 || string.IsNullOrEmpty(tree) == false ) + if (appTrees.Length == 1 || string.IsNullOrEmpty(tree) == false ) { var apptree = string.IsNullOrEmpty(tree) == false ? appTrees.SingleOrDefault(x => x.Alias == tree) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs index dc0aaa3a98..1f8eeafeeb 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs @@ -427,7 +427,7 @@ namespace umbraco.cms.presentation.Trees /// public static bool IsBaseTree(ITree tree) { - return typeof(BaseTree).IsAssignableFrom(tree.GetType()); + return tree is BaseTree; } /// diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs index 984866433e..45ee642267 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs @@ -333,7 +333,7 @@ namespace umbraco.presentation.developer.packages .Where(x => x.Data.Id != _pack.Data.Id && string.Equals(x.Data.Name, _pack.Data.Name, StringComparison.OrdinalIgnoreCase)) .OrderBy(x => Version.TryParse(x.Data.Version, out v) ? v : new Version()); - if (packageVersionHistory != null && packageVersionHistory.Count() > 0) + if (packageVersionHistory != null && packageVersionHistory.Any()) { rptr_versions.DataSource = packageVersionHistory; rptr_versions.DataBind();