Commit Graph

21 Commits

Author SHA1 Message Date
Shannon
183103dc16 reverts Moq which has regression issues 2017-04-07 14:16:28 +10:00
Shannon
604bddabdf Updateing the app.configs with the correct redirects for log4net since alll package installs are going to change these 2017-04-07 12:04:05 +10:00
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
Claus
7fa8f04b11 deploy-257 Downgrade Core and Deploy to framework 4.5 2017-03-08 11:20:48 +01:00
Shannon
90ba9a1a3a 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
Claus
8cf3110708 fixing typo and missing file ref in csproj. 2017-02-10 11:41:46 +01:00
Claus
57945fcec6 fixing broken build - referencing files that aren't committed. 2017-02-09 14:41:22 +01:00
Shannon
f04d70f2d9 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 2017-02-09 17:04:41 +11:00
Shannon
58c5618d30 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
Shannon
f4f1f6774d U4-9499 Update to latest Json.Net 2017-02-08 17:47:32 +11:00
Shannon
72910cb35e Updates everything to .Net 4.6.2, had to update the semver reference too - no breaking changes though 2017-02-07 00:22:34 +11:00
Shannon
2acde54880 Adds new benchmark and updates the benchmark bootstrapper to be the supported way 2017-01-04 18:11:21 +11:00
Shannon
4e2fb8e5dc Fixes IP nuget references and fixes up several other Nuget assembly references. 2017-01-03 10:36:26 +11:00
Stephan
2bc07ad4cc Merge branch 'dev-v7' into temp-U4-9105 2016-11-14 18:13:45 +01:00
Stephan
958392f09b U4-9105 - bit of cleanup 2016-10-28 16:30:20 +02:00
Stephan
c500f98ad8 U4-9121 - improve url perfs 2016-10-28 14:33:44 +02:00
Shannon
3f609fdf90 Moves a few queries to re-used query instances 2016-10-27 18:03:13 +02:00
Shannon
9717d03a75 oops, didn't mean to commit this 2016-10-27 18:03:13 +02:00
Shannon
21e2c35ab0 U4-9111 Benchmark BulkCopy changes from U4-9107 2016-10-27 18:03:13 +02:00
Stephan
7495d89a79 U4-9107 - enable bench on empty db 2016-10-26 19:26:10 +02:00
Shannon
1a6986cfcf U4-9111 Benchmark BulkCopy changes from U4-9107 2016-10-25 12:34:06 +02:00