Shannon
9f2c428a7c
updates to latest Models Builder
2017-04-10 16:12:23 +10:00
Shannon
62ddce60a5
updates nuspec
2017-04-07 12:09:05 +10:00
Shannon
d582d5c827
Fixes log4net nuspec entry
2017-04-07 12:06:17 +10:00
Shannon
e5af5bcc22
more binding redirects missing
2017-04-07 11:47:22 +10:00
Shannon Deminick
9f7f920229
Merge pull request #1868 from umbraco/issue-U4-9745
...
U4-9745 Update outdated NuGet dependencies
2017-04-07 11:38:18 +10:00
Shannon
d1d98372cd
Fixes binding redirects local transforms and nuget transforms
2017-04-07 11:37:23 +10:00
Sebastiaan Janssen
16582c8207
U4-9745 Update outdated NuGet dependencies
2017-04-06 16:27:41 +02:00
Shannon
b2a497ddba
missing signalr reference in nuspec
2017-04-05 19:17:12 +10:00
Shannon
2248a85876
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.nuspec
# src/Umbraco.Core/Services/ContentTypeService.cs
# src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html
# src/Umbraco.Web.UI/packages.config
2017-04-03 21:50:22 +10:00
Stephan
95508c4fb7
Upgrade nuspec accordingly
2017-03-30 09:32:22 +02:00
Shannon
c5f388f6bc
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/packages.config
# src/UmbracoExamine/UmbracoExamine.csproj
# src/umbraco.MacroEngines/packages.config
# src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
2017-03-30 17:03:51 +11:00
Shannon
25f5179b29
updates nuspec
2017-03-30 16:36:54 +11:00
Shannon Deminick
a667058422
Merge pull request #1828 from umbraco/temp-u4-9655
...
U4-9655 - update HtmlAgilityPack version in config
2017-03-29 16:33:37 +11:00
Stephan
a2a9794fdb
U4-9655 - update HtmlAgilityPack version in config
2017-03-24 14:47:27 +01:00
Shannon
2ae236e98d
Adds xml transform for partial view tree types
2017-03-23 18:48:41 +11:00
Shannon Deminick
04d37c590b
Merge pull request #1786 from umbraco/temp-U4-9004
...
U4-9004 Remove URLRewriting.net dependency
2017-03-14 16:25:41 +11: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
Sebastiaan Janssen
13aa615745
U4-9004 Remove URLRewriting.net dependency
2017-03-09 11:41:36 +01:00
Stephan
d1111009e3
Fix SemVer lib version
2017-03-08 18:45:00 +01:00
Claus
9f6e4d4fd5
updating nuspec.
2017-03-08 12:04:48 +01:00
James Coxhead
9acfd8f5d2
Updated dashboard config transform
...
Fix for dupicate dashboards after upgrading
2017-03-02 21:02:25 +00:00
Shannon
f30d7fc68c
Fixes nuspec to be net45 as a min
2017-02-14 14:29:23 +11:00
Shannon
ce0821e2d6
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/Umbraco.Tests/Umbraco.Tests.csproj
2017-02-09 13:20:33 +11:00
Sebastiaan Janssen
311edd3279
Adds missing dependency (it's in dev-v7, must have been a merge where it was forgotten to be merged into dev-v7.6)
2017-02-08 10:36:36 +01:00
Claus
24063c403a
Merge remote-tracking branch 'origin/dev-v7.6' into temp-U4-1324
...
Conflicts:
src/Umbraco.Core/packages.config
src/Umbraco.Tests/packages.config
2017-02-08 09:14:27 +01:00
Shannon
f4f1f6774d
U4-9499 Update to latest Json.Net
2017-02-08 17:47:32 +11:00
Warren Buckley
ba6705a706
Merge branch 'dev-v7.6' into temp-U4-9314
2017-02-07 17:27:07 +00:00
Sebastiaan Janssen
73e219b23c
Fix unit tests
2017-02-07 16:24:34 +01:00
Sebastiaan Janssen
389b29599b
U4-9495 ImageProcessor high CPU usage when trimCache=true
2017-02-07 10:29:11 +01:00
Shannon
a71ec8dd81
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
2017-02-07 12:50:44 +11:00
Shannon
a6c2844d12
updates nuspec with correctly targeted framework
2017-02-07 01:03:50 +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
7be30ad6ac
Moves all binding redirects via code to one place
2017-02-06 23:46:44 +11:00
Sebastiaan Janssen
5a8e37f5b4
U4-9492 Update to latest ImageProcessor
2017-02-06 13:46:10 +01:00
Shannon
f87ccc0a53
Updates nuspec
2017-02-06 23:36:56 +11:00
Claus
29d86b8675
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
2017-01-19 12:08:23 +01:00
Sebastiaan Janssen
54e460cf5b
U4-9392 Upgrade ImageProcessor with cache header and high CPU fix
...
U4-9393 Upgrade to Examine 0.1.80
2017-01-18 11:47:23 +01:00
Shannon
cfd8d39878
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.nuspec
# src/Umbraco.Tests/Umbraco.Tests.csproj
2017-01-12 13:39:15 +11:00
Sebastiaan Janssen
358dd7f32b
Move ImageProcessor.Web.Config to not be in the .Core NuGet, it's not a dll
2017-01-10 07:30:35 +01:00
Shannon
d11e787624
updates Nuspec with IP version
2017-01-10 11:37:31 +11:00
Stephan
5e6f1a92ca
Merge branch origin/dev-v7 into dev-v7.6
2017-01-09 15:31:41 +01:00
Sebastiaan Janssen
770f96b6d5
Merge branch 'dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
2017-01-05 09:47:51 +01:00
Shannon
c2359a96f8
missed nuspec update
2017-01-05 17:09:37 +11:00
Sebastiaan Janssen
dc62272e6e
Revert "Add Microsoft.IO.RecyclableMemoryStream to the nuspec, update to the latest version (1.2.1)"
...
Keep the version the same as what ImageProcessor relies on to avoid confusion and conflicts
This reverts commit 56d2230251
2017-01-03 17:04:38 +01:00
Sebastiaan Janssen
6a374cbfa6
Make the NuGet install and upgrade work
2017-01-03 15:57:21 +01:00
Claus
d866f1d74a
Merge branch 'dev-v7' into dev-v7.6
2017-01-03 11:58:23 +01:00
Sebastiaan Janssen
84c0682f16
Not necessary to install Microsoft.IO.RecyclableMemoryStream, the ImageProcessor dependency will do that for us
2017-01-03 10:20:22 +01:00
Sebastiaan Janssen
56d2230251
Add Microsoft.IO.RecyclableMemoryStream to the nuspec, update to the latest version (1.2.1)
2017-01-03 09:25:10 +01:00
Sebastiaan Janssen
62f21d3cee
Update nuspec to install latest version of ImageProcessor
2017-01-03 09:17:05 +01:00
Shannon
59f39fd535
Ensures we remove the new DLL with the install script like other files
2016-12-28 19:48:35 +11:00
