Shannon df04100ff6 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 ...

# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
#	src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs

2017-03-10 10:40:28 +01:00

..

Properties

…

App.config

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

BulkInsertBenchmarks.cs

U4-9121 - improve url perfs

2016-10-28 14:33:44 +02:00

LinqCastBenchmarks.cs

Adds new benchmark and updates the benchmark bootstrapper to be the supported way

2017-01-04 18:11:21 +11:00

ModelToSqlExpressionHelperBenchmarks.cs

Adds new overload to IMediaService.GetPagedChildren to filter on media type ids which turns out to be much easier than filtering on media type aliases, however i did all of the work to make that happen including unit tests and then it turned out to not be required but we now have the code if necessary, i've left comments about it. I've backported some updates from 7.6 for the SqlIn stuff for the ExpressionVisitor which we still use in the media type id filtering. I updated the JS to query for the folders which all works now.

2017-02-22 17:22:22 +11:00

packages.config

Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6

2017-03-10 10:40:28 +01:00

Program.cs

fixing typo and missing file ref in csproj.

2017-02-10 11:41:46 +01:00

Umbraco.Tests.Benchmarks.csproj

Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6

2017-03-10 10:40:28 +01:00

XmlBenchmarks.cs

U4-9121 - improve url perfs

2016-10-28 14:33:44 +02:00

XmlPublishedContentInitBenchmarks.cs

Adds benchmarks for XML perf testing - had to make the init xml code static with out params to test but that's ok.

2017-02-09 16:42:59 +11:00