yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,880 Commits 4 Branches 7 Tags
1abdca2432b3b4e028573d244a3a4dde400a77be
Commit Graph

124 Commits

Author SHA1 Message Date
Sebastiaan Janssen
c0baac2b38 Should fix the build for real now. Sets GenerateSerializationAssemblies to Off which then doesn't produce umbraco.XmlSerializers.dll any more. 
Should be safe as this is only used for updatechecker and packageinstaller. From:  http://hashtagfail.com/post/5255977780/sgen-loaderexceptions-error - "Visual Studio attempts to generate a serialization assembly containing the types in your solution, to improve XmlSerializer serialization performance, should you choose to serialize your types."

Conflicts:
	build/NuSpecs/tools/install.core.ps1
 2014-11-15 12:38:28 +01:00
Sebastiaan Janssen
b20fc22577 U4-5814 Apply MVC 4.0.0.1 security update 2014-11-14 16:51:51 +01:00
Sebastiaan Janssen
ed8cc2ad0d Also fixes U4-5592 and U4-5746 for 7.1.9 2014-11-12 12:40:24 +01:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Jeavon Leopold
b2ca814fdb Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0 2014-08-12 16:59:31 +01:00
Sebastiaan Janssen
6014608d5a Microsoft.AspNet.WebApi.Host doesn't exist ;) 2014-07-24 14:24:13 +02:00
Shannon
6e20be993b updates nuspec to have latest versions for all dependencies 2014-07-23 12:31:03 -07:00
Shannon
0f7c407a7c Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/LocalizationServiceTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
 2014-06-26 11:51:25 +10:00
Shannon
392634eb76 bumps nuspec versions 2014-06-26 11:44:28 +10:00
Shannon
259bc863f0 Removes Examine.dll deploy from nuspec 2014-06-26 11:32:43 +10:00
Shannon
3ecc974325 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
 2014-06-25 14:33:32 +10:00
Shannon
bef6ce66f1 Updated core nuspec to include Examine 2014-06-25 14:19:06 +10:00
Sebastiaan Janssen
ea32776174 Bump version 2014-05-28 17:07:51 +02:00
Sebastiaan Janssen
3ec6d2b82f U4-4861 6.2.0 Nuget package copies wrong files 2014-05-19 10:08:26 +02:00
Sebastiaan Janssen
d697c590e7 U4-4930 NuGet update fails to copy new Umbraco binaries 2014-05-16 18:54:49 +02:00
Sebastiaan Janssen
1dd103caa3 U4-4930 NuGet update fails to copy new Umbraco binaries 2014-05-16 18:53:23 +02:00
Sebastiaan Janssen
8d45898274 UmbracoVersion property no longer needed. Added data folder to the targets. 2014-05-16 12:44:02 +02:00
Sebastiaan Janssen
b42d3b226d Bump version 2014-05-16 11:29:35 +02:00
Graham Ambrose
6b313aba48 CopyUmbracoFilesToWebRoot assumes packages loacation 
CopyUmbracoFilesToWebRoot assumes packages folder is always one dir up from
project file which is not always the case.

I have changed to use MSBuildThisFileDirectory which makes the path
relative the the UmbracoCms.targets file.
MSBuildThisFileDirectory is supported from MSBuild 4 but as ToolsVersion is
already set to 4.0 that should not be a problem.

UmbracoVersion property is no longer required but removing it may break
external target files depending on it. Have moved it to props file as this
makes it more reliable for external targets files.
 2014-05-15 22:43:24 +01:00
Sebastiaan Janssen
cbad216387 Update the install ps to do logging of copies and to actually copy the /umbraco folder properly 2014-05-09 13:07:41 +02:00
Sebastiaan Janssen
c1796dd5ac Update ImageProcessor dependency to latest version 2014-05-08 13:28:46 +02:00
Sebastiaan Janssen
28550e3bb7 Require a recent version of NuGet in order to install Umbraco. 2014-05-08 13:28:32 +02:00
Sebastiaan Janssen
16d98488e4 Losen up the requirement for json.net dependency 2014-05-01 14:06:28 +02:00
Sebastiaan Janssen
3134668cec Bump version number 2014-04-30 12:00:19 +02:00
Sebastiaan Janssen
e3162d223d Tiny update 2014-04-24 17:37:15 +02:00
Sebastiaan Janssen
6e53e19e60 Adding an Allbinaries NuSpec for use on UaaS 2014-04-24 14:03:28 +02:00
Shandem
95cd32ad8c Merge pull request #359 from Jeavon/7.1.2-ImageCropper 
Adding support for Image Crop Ratio Dimension Support & UpScale to GetCropUrl & More Tests
 2014-04-23 20:20:09 +10:00
Sebastiaan Janssen
56d949ab9d Correcting some more paths, come on, work! 2014-04-23 11:22:45 +02:00
Sebastiaan Janssen
65ecff4248 D'oh, automated builds make obj folders, not bin folders 2014-04-23 10:57:21 +02:00
Sebastiaan Janssen
421162d809 Bump version + Attempt at U4-4742 Publish debugging symbols for NuGet package 2014-04-23 10:11:36 +02:00
Jeavon Leopold
9a14a29a53 Updating ImageProcessor to v1.8.8 and ImageProcessor.Web to v3.2.2 2014-04-18 20:39:38 +01:00
Sebastiaan Janssen
670a67225a Upgrade to Json.Net 6.0.2 2014-04-08 11:37:40 +02:00
Sebastiaan Janssen
ab7371e146 Bump version number 2014-04-07 14:29:59 +02:00
Sebastiaan Janssen
66d61c9d20 One more ImageProcessor update 2014-04-03 11:29:13 +02:00
Sebastiaan Janssen
5efc45a7dd Bump version number 2014-04-03 09:29:52 +02:00
Sebastiaan Janssen
c3fc27565d Update version of ImageProcessor and refer to NuGet in the csproj instead of the bin (!) 2014-04-03 09:26:51 +02:00
Sebastiaan Janssen
3235678d29 U4-4510 nuget targets file creates an invalid path in the property group 
That should fix this one properly now
 2014-03-25 20:40:44 +01:00
Sebastiaan Janssen
f13ddddc16 U4-4510 nuget targets file creates an invalid path in the property group 
That should fix this one properly now
 2014-03-25 20:39:46 +01:00
Sebastiaan Janssen
14ea374b24 Also removing stray semicolons here for U4-4510 nuget targets file creates an invalid path in the property group 2014-03-24 15:44:09 +01:00
Sebastiaan Janssen
a569796adb Removes stray semicolons from the nuget targets files 2014-03-24 14:00:12 +01:00
Sebastiaan Janssen
8391c32886 Fix whitespace 2014-03-24 09:34:48 +01:00
Shannon
2e8993adb8 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	build/NuSpecs/build/net40/UmbracoCms.targets
	build/NuSpecs/build/net45/UmbracoCms.targets
	build/NuSpecs/build/net451/UmbracoCms.targets
	build/NuSpecs/tools/Readme.txt
	build/NuSpecs/tools/install.ps1
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2014-03-24 11:31:52 +11:00
Sebastiaan Janssen
006a89e136 U4-4498 Doc & Media Type, Server Error when upgrade, 7.0.4 to 7.1.0 RC via Nuget 
Have to copy in the Umbraco and Umbraco_Client folder during NuGet updates as well.
 2014-03-23 16:10:58 +01:00
Sebastiaan Janssen
424ff02734 Forgot a few includes, fixed! 2014-03-20 17:29:16 +01:00
Sebastiaan Janssen
80bd8d962b Make sure the App_Plugins folder is there 2014-03-20 16:58:35 +01:00
Sebastiaan Janssen
4b4efde490 Make sure the App_Plugins folder is there 2014-03-20 16:57:53 +01:00
Sebastiaan Janssen
956364decd v7 NuGet changes also apply to v6 2014-03-20 16:02:24 +01:00
Sebastiaan Janssen
c43ab7942a Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-20 15:38:52 +01:00
Morten Christensen
166f9b939c Moving the sqlce dlls to UmbracoFile in the nuspec 2014-03-20 15:37:41 +01:00
Morten Christensen
ede9e00a7f Updating the targets to include a few more folders 2014-03-20 15:37:21 +01:00