Shannon
f30d7fc68c
Fixes nuspec to be net45 as a min
2017-02-14 14:29:23 +11:00
Claus
771f8d92f2
adding in missing extension method stuff for some udis.
2017-02-10 14:44:56 +01: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
f3b364022a
bumping version for deploy.
2017-01-31 10:33:57 +01:00
Sebastiaan Janssen
a5a42854ef
Bump version to alpha055
2017-01-26 22:02:18 +01:00
Sebastiaan Janssen
639d04381e
Bump version
2017-01-26 14:48:19 +01:00
Claus
501cef665f
version bump alpha054
2017-01-24 15:18:31 +01:00
Claus
16e9bf265d
bumping version.
2017-01-24 14:46:20 +01:00
Claus
a3e7153bca
bumping version to alpha052.
2017-01-24 11:38:00 +01:00
Claus
b08e38f9ed
Merge branch 'dev-v7.6' into temp-deploy-176
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Tests/Umbraco.Tests.csproj
2017-01-24 09:51:59 +01: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
44732e5f52
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/DatabaseContext.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2017-01-17 18:21:45 +11:00
Shannon
256ebe7c14
bumps version for MyGet
2017-01-17 15:29:58 +11:00
Sebastiaan Janssen
b7d37af933
Bumps version
2017-01-16 11:04:28 +01:00
Shannon
8a11b0f7a8
publisizes a constant (moves it to where it should be), publicizes another required class for deploy, bumps version
2017-01-12 17:33:30 +11:00
Shannon
5a2836eb6d
bumps version
2017-01-12 13:45:17 +11: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
Stephan
d8b70d79e8
Version 7.6.0-alpha044 on MyGet
2017-01-03 09:29: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
6b038186be
Fixes SignalR registration, the mapping was registered in the wrong place and too early so security was not working, bumps version for MyGet
2017-01-03 13:11:05 +11:00
Shannon
95187becaf
bumps to next alpha for MyGet
2017-01-03 11:50:29 +11:00
Shannon
ee925692e5
Bumps version to put on MyGet
2016-12-30 16:06:40 +11:00
Shannon
ffefe417db
bumps version
2016-12-29 12:23:30 +11:00
Shannon
59f39fd535
Ensures we remove the new DLL with the install script like other files
2016-12-28 19:48:35 +11:00
Shannon
fae5dd517e
bumps version to next alpha
2016-12-28 18:57:25 +11:00
Shannon
8e06a88a2c
bumps version, publicizes method
2016-12-23 14:52:18 +11:00
Shannon
0aa8a5c243
more whitespace fixing
2016-12-23 09:41:23 +11:00
