Commit Graph

689 Commits

Author SHA1 Message Date
Claus
fa1663ed51 Fixes build script to work with VS 2017 (only) and fixes BuildBelle since it didn't work and is missing tools 2017-08-08 13:08:29 +02:00
mikkelhm
374fdcf29e Bumps version to 7.6.5 2017-07-13 12:14:32 +02:00
Shannon Deminick
08c4a75af7 Merge pull request #1945 from protherj/U4-9792-fips-support
U4-9792 -- Update Umbraco to be FIPS compliant
2017-06-13 15:05:21 +02:00
Sebastiaan Janssen
2191d33844 Bumps version 2017-06-05 16:33:47 +02:00
Sebastiaan Janssen
7e6f7f8a2b Bumps version 2017-06-01 13:04:31 +02:00
mikkelhm
b0a739b4ac Bump version to 7.6.2 2017-05-29 15:07:37 +02:00
Shannon
b78c334589 Merge remote-tracking branch 'origin/master-v7' into dev-v7 2017-05-19 12:04:27 +10:00
Shannon Deminick
b41de9b623 Merge pull request #1944 from umbraco/temp-U4-9848
U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors
2017-05-19 12:02:11 +10:00
Shannon
73e47402cb Fixes docs build 2017-05-19 10:20:00 +10:00
Jason Prothero
2334596bf3 Update Unit Tests to check for the correct version of Examine 2017-05-16 11:06:00 -07:00
mikkelhm
3f25d3637a Bump version to 7.5.14 2017-05-16 08:32:33 +02:00
Sebastiaan Janssen
99d4b13bb0 Adds SQLCE assembly redirect on fresh installs and upgrades 2017-05-15 22:54:46 +02:00
Sebastiaan Janssen
e7b007386a U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors 2017-05-15 19:00:05 +02:00
mikkelhm
36e60c774f Bump version to 7.6.1 2017-05-08 14:06:03 +02:00
Sebastiaan Janssen
0c520f2b43 Merge branch 'dev-v7' into dev-v7.6
# Conflicts:
#	build/Build.bat
2017-05-05 16:19:54 +02:00
Sebastiaan Janssen
85d10014c2 Make new build work when there's spaces in the current path 2017-05-05 16:14:59 +02:00
Sebastiaan Janssen
c6956b5e98 Merge branch 'dev-v7' into dev-v7.6
# Conflicts:
#	.gitignore
#	build/Build.bat
2017-05-05 14:30:08 +02:00
Sebastiaan Janssen
fcf5ecc166 Uses vswhere to figure out where VS17 is installed (if needed)
Removes targets file that was almost unused, moved the relevant bits to the main csproj
Updates BuildBelle.bat to be completely independent of installed version of node & npm on the machine
2017-05-05 14:14:37 +02:00
Shannon
c1853e8c51 bumps version to 7.6.0 rtm 2017-05-02 13:42:20 +10:00
Shannon
d9b507c947 bumps version to RC4 so we can build new dependencies against forms/deploy 2017-04-30 23:26:04 +10:00
Shannon
d3fcdfb176 updates nuget semver ref in nuspec 2017-04-30 23:24:26 +10:00
Shannon
9f505a7976 bumps to rc3 version 2017-04-28 08:27:31 +10:00
mikkelhm
4775aff749 Bump version to RC2 2017-04-25 11:15:51 +02:00
Shannon
bec4e442fb bumps to RC1 2017-04-21 17:45:27 +10:00
mikkelhm
c9a816f25e Adds assemblyRedirect for log4net in the nuget upgrade transform 2017-04-19 12:21:49 +02:00
Shannon
d5a71ec1da Adds important note for 7.6 upgrades to the nuget upgrade doc 2017-04-19 16:05:24 +10:00
Shannon
777b02b84c Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/IO/IFileSystem.cs
#	src/Umbraco.Core/Media/ImageHelper.cs
#	src/Umbraco.Core/Models/ContentExtensions.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/packages.config
2017-04-18 20:17:59 +10:00
Sebastiaan Janssen
376c78381d One more.. Reverts CodeAnalysis update to stay compatible with Models builder 2017-04-10 15:02:04 +02:00
Shannon
f2c7c1e2c6 bumps version 2017-04-10 16:42:31 +10:00
Shannon
9f2c428a7c updates to latest Models Builder 2017-04-10 16:12:23 +10:00
Shannon
a958f946ef bumps version (beta) so i can post the patch release 2017-04-08 13:57:43 +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
dce9dea8f3 Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-04-05 19:17:35 +10:00
Shannon
b2a497ddba missing signalr reference in nuspec 2017-04-05 19:17:12 +10:00
Sebastiaan Janssen
0e67c787a8 Bump version to RC :) 2017-04-04 08:05:32 +02:00
Shannon
ebfb2b536f bumps version to RC01 2017-04-04 13:12:03 +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
Emil Wangaa
d51082f651 Bumps version 2017-03-30 10:27:54 +02: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
7cdb48b6c9 bumps version 2017-03-29 16:35:37 +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
mikkelhm
bfd201efcc Bump version to 7.6-Beta5 2017-03-23 15:46:18 +01:00