diff --git a/src/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs b/src/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs
index f7d6b6bb72..52d670de3c 100644
--- a/src/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs
+++ b/src/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs
@@ -1,13 +1,14 @@
-using BenchmarkDotNet.Configs;
+using System;
+using BenchmarkDotNet.Configs;
using BenchmarkDotNet.Horology;
using BenchmarkDotNet.Jobs;
-using System;
namespace Umbraco.Tests.Benchmarks.Config
{
///
/// Configures the benchmark to run with less warmup and a shorter iteration time than the standard benchmark.
///
+ [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
public class QuickRunConfigAttribute : Attribute, IConfigSource
{
///
@@ -15,11 +16,11 @@ namespace Umbraco.Tests.Benchmarks.Config
///
public QuickRunConfigAttribute()
{
- Config = (ManualConfig) ManualConfig.CreateEmpty()
+ this.Config = (ManualConfig)ManualConfig.CreateEmpty()
.With(Job.Default.WithLaunchCount(1) // benchmark process will be launched only once
.WithIterationTime(new TimeInterval(100, TimeUnit.Millisecond)) // 100ms per iteration
.WithWarmupCount(3) // 3 warmup iteration
- .WithTargetCount(3)); // 3 target iteration
+ .WithIterationCount(3)); // 3 target iteration
}
///
@@ -28,6 +29,6 @@ namespace Umbraco.Tests.Benchmarks.Config
protected ManualConfig Config { get; }
///
- IConfig IConfigSource.Config => Config;
+ IConfig IConfigSource.Config => this.Config;
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs
index 1d5876187b..5588e13d12 100644
--- a/src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs
+++ b/src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Benchmarks
.WithLaunchCount(1) // benchmark process will be launched only once
.WithIterationTime(TimeInterval.FromMilliseconds(400))
.WithWarmupCount(3)
- .WithTargetCount(6));
+ .WithIterationCount(6));
}
}
diff --git a/src/Umbraco.Tests.Benchmarks/Program.cs b/src/Umbraco.Tests.Benchmarks/Program.cs
index c9332e7fa3..62137bd85d 100644
--- a/src/Umbraco.Tests.Benchmarks/Program.cs
+++ b/src/Umbraco.Tests.Benchmarks/Program.cs
@@ -2,11 +2,8 @@
namespace Umbraco.Tests.Benchmarks
{
- internal class Program
+ internal static class Program
{
- public static void Main(string[] args)
- {
- new BenchmarkSwitcher(typeof(Program).Assembly).Run(args);
- }
+ private static void Main(string[] args) => new BenchmarkSwitcher(typeof(Program).Assembly).Run(args);
}
}
diff --git a/src/Umbraco.Tests.Benchmarks/Properties/AssemblyInfo.cs b/src/Umbraco.Tests.Benchmarks/Properties/AssemblyInfo.cs
index 2ab0051c26..9f5a3c7453 100644
--- a/src/Umbraco.Tests.Benchmarks/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Tests.Benchmarks/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Umbraco.Tests.Benchmarks")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("86deb346-089f-4106-89c8-d852b9cf2a33")]
+[assembly: Guid("3a33adc9-c6c0-4db1-a613-a9af0210df3d")]
// Version information for an assembly consists of the following four values:
//
diff --git a/src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs
index 57b47dc1d0..7e73c5e438 100644
--- a/src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs
+++ b/src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Engines;
using Umbraco.Core;
namespace Umbraco.Tests.Benchmarks
@@ -12,9 +14,9 @@ namespace Umbraco.Tests.Benchmarks
private static readonly string Date = "Saturday 10, November 2012";
[Benchmark(Description = "List to IEnumerable")]
- public IEnumerable TryConvertToEnumerable()
+ public IList TryConvertToEnumerable()
{
- return List.TryConvertTo>().Result;
+ return List.TryConvertTo>().Result.ToList();
}
[Benchmark(Description = "Int to Double")]
@@ -41,4 +43,4 @@ namespace Umbraco.Tests.Benchmarks
return Date.TryConvertTo().Result;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 9755e4f9db..99bb768842 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -1,20 +1,17 @@
-
+
Debug
AnyCPU
- {86DEB346-089F-4106-89C8-D852B9CF2A33}
+ {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}
Exe
- Properties
Umbraco.Tests.Benchmarks
Umbraco.Tests.Benchmarks
v4.7.2
512
-
-
-
- false
+ true
+ true
AnyCPU
@@ -25,7 +22,6 @@
DEBUG;TRACE
prompt
4
- latest
AnyCPU
@@ -35,92 +31,27 @@
TRACE
prompt
4
- latest
-
-
- Always
+ false
+ 7.3
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
@@ -130,27 +61,34 @@
-
+
{31785bc3-256c-4613-b2f5-a1b0bdded8c1}
Umbraco.Core
+
+ {07fbc26b-2927-4a22-8d96-d644c667fecc}
+ Umbraco.Examine
+
{5d3b8245-ada6-453f-a008-50ed04bfe770}
Umbraco.Tests
+
+ {4c4c194c-b5e4-4991-8f87-4373e24cc19f}
+ Umbraco.Web.UI
+
{651e1350-91b6-44b7-bd60-7207006d7003}
Umbraco.Web
-
-
- $(NuGetPackageFolders.Split(';')[0])
-
+
+
+ 0.11.2
+
+
-
-
-
\ No newline at end of file
+
diff --git a/src/Umbraco.Tests.Benchmarks/app.config b/src/Umbraco.Tests.Benchmarks/app.config
index b5e577b22c..56efbc7b5f 100644
--- a/src/Umbraco.Tests.Benchmarks/app.config
+++ b/src/Umbraco.Tests.Benchmarks/app.config
@@ -1,298 +1,6 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/umbraco.sln b/src/umbraco.sln
index ceb687b876..41bd8359c3 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -82,8 +82,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{5B03EF4E
..\build\NuSpecs\build\UmbracoCms.targets = ..\build\NuSpecs\build\UmbracoCms.targets
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Benchmarks", "Umbraco.Tests.Benchmarks\Umbraco.Tests.Benchmarks.csproj", "{86DEB346-089F-4106-89C8-D852B9CF2A33}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DocTools", "DocTools", "{53594E5B-64A2-4545-8367-E3627D266AE8}"
ProjectSection(SolutionItems) = preProject
ApiDocs\docfx.filter.yml = ApiDocs\docfx.filter.yml
@@ -92,6 +90,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DocTools", "DocTools", "{53
ApiDocs\toc.yml = ApiDocs\toc.yml
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Benchmarks", "Umbraco.Tests.Benchmarks\Umbraco.Tests.Benchmarks.csproj", "{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -120,10 +120,10 @@ Global
{07FBC26B-2927-4A22-8D96-D644C667FECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07FBC26B-2927-4A22-8D96-D644C667FECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07FBC26B-2927-4A22-8D96-D644C667FECC}.Release|Any CPU.Build.0 = Release|Any CPU
- {86DEB346-089F-4106-89C8-D852B9CF2A33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {86DEB346-089F-4106-89C8-D852B9CF2A33}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {86DEB346-089F-4106-89C8-D852B9CF2A33}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {86DEB346-089F-4106-89C8-D852B9CF2A33}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -133,8 +133,8 @@ Global
{5D3B8245-ADA6-453F-A008-50ED04BFE770} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
{E3F9F378-AFE1-40A5-90BD-82833375DBFE} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D}
{5B03EF4E-E0AC-4905-861B-8C3EC1A0D458} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D}
- {86DEB346-089F-4106-89C8-D852B9CF2A33} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
{53594E5B-64A2-4545-8367-E3627D266AE8} = {FD962632-184C-4005-A5F3-E705D92FC645}
+ {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC}