Commit Graph

1007 Commits

Author SHA1 Message Date
Sebastiaan Janssen
5ada85df29 Provide the correct assembly redirects 2019-07-05 12:11:03 +02:00
Sebastiaan Janssen
8d12170def Correct NuGet transform for the web.config file in the Views folder 2019-06-21 14:58:58 +02:00
Sebastiaan Janssen
40d4a8fe6a Modelsbuilder is asking for too old a version of CodeAnalysis, Immutable and Metadata dependencies 2019-06-21 13:32:53 +02:00
Sebastiaan Janssen
ad4416f663 So apparently Microsoft.CodeAnalysis.CSharp version 1.3.2 contains the dll that has the version 1.3.1.. very confusing 2019-06-21 10:07:45 +02:00
Sebastiaan Janssen
b55d2a8a41 Modelsbuilder is asking for too old a version of the CodeAnalysis dependency 2019-06-21 09:56:01 +02:00
Sebastiaan Janssen
4e44871671 The NuGet packages needs an extra DotNetCompilerPlatform transform to be sure it gets applied as it sometimes didn't
Added SignalR binding redirect for Umbraco Cloud
Added System.Web.Http.WebHost binding redirect for uCommerce
2019-06-20 15:57:31 +02:00
Sebastiaan Janssen
4b2ce522fe Update nuspecs 2019-06-06 15:55:38 +02:00
Sebastiaan Janssen
202f2d2e27 Fix build for VS2019 (not complete yet) 2019-06-06 13:53:42 +02:00
Sebastiaan Janssen
1c87176d80 Merge branch 'v7/dev' into pr/3064
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/packages.config
#	src/umbraco.MacroEngines/packages.config
2019-06-06 12:50:48 +02:00
Shannon
34a3389c17 Updates to latest Examine 2019-03-05 12:50:51 +11:00
Sebastiaan Janssen
e0a38a4d9b Git clone includes a directory to clone to now,
should fix Azure Gallery release.
Tightened up the variables and paths.
2019-01-08 15:53:58 +01:00
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00:00
Stephan
42857ebc2a Simplify version management, SolutionInfo is only the source now 2018-11-15 08:47:47 +01:00
Warren Buckley
e902bb08f6 Removes installing bower from the build powershell 2018-10-11 13:37:20 +01:00
Stephan
f5c5d9f9d5 Update ModelsBuilder to -alpha.24 2018-10-08 17:15:08 +02:00
Stephan
d323d0f330 Fix nuspec 2018-10-08 16:45:12 +02:00
elitsa
85309e8ce5 Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089 2018-10-08 10:23:53 +02:00
elitsa
e2acc8b447 Remove sections icons - not needed anymore 2018-10-08 10:00:52 +02:00
Shannon
b96ba05d22 Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
#	build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.nuspec
#	build/NuSpecs/tools/Readme.txt
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Constants-Conventions.cs
#	src/Umbraco.Core/Constants-System.cs
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Core/Media/Exif/ImageFile.cs
#	src/Umbraco.Core/Models/Property.cs
#	src/Umbraco.Core/Models/PropertyTagBehavior.cs
#	src/Umbraco.Core/Models/PropertyTags.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Security/AuthenticationExtensions.cs
#	src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
#	src/Umbraco.Core/Services/Implement/PackagingService.cs
#	src/Umbraco.Core/Services/ServerRegistrationService.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Tests/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/user.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/card.less
#	src/Umbraco.Web.UI.Client/src/less/navs.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/CanvasDesignerController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
#	src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
#	src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs
#	src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
#	src/Umbraco.Web/Mvc/MasterControllerFactory.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
#	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
#	src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
#	src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
#	src/Umbraco.Web/Scheduling/KeepAlive.cs
#	src/Umbraco.Web/Scheduling/LogScrubber.cs
#	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
#	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
#	src/Umbraco.Web/Scheduling/Scheduler.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/_Legacy/Packager/Installer.cs
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/umbraco.businesslogic/IO/IOHelper.cs
#	src/umbraco.cms/packages.config
#	src/umbraco.cms/umbraco.cms.csproj
#	src/umbraco.controls/packages.config
#	src/umbraco.controls/umbraco.controls.csproj
#	src/umbraco.editorControls/packages.config
#	src/umbraco.editorControls/umbraco.editorControls.csproj
2018-10-01 14:32:46 +02:00
Stephan
b1be86c9d6 fix nuspec, app_browsers is gone 2018-09-28 16:53:48 +02:00
Shannon
beb325eacf oops got a couple versions wrong 2018-09-28 15:01:47 +10:00
Shannon
40dc49ed47 updates nuspecs 2018-09-28 14:27:03 +10:00
Sebastiaan Janssen
00fc1b7c26 Merge branch 'dev-v7' into temp-view-compilation 2018-09-25 15:13:22 +02:00
Umbraco HQ
f9973f602c Fixes the belle build (requires newer node version) 2018-09-25 14:03:21 +02:00
Sebastiaan Janssen
8bf8e0a741 Updates CDF 2018-09-20 08:48:46 +02:00
Paul Seal
9e3cf00cc0 update the release notes url 2018-09-12 13:32:10 +01:00
Shannon
8ff671a7c6 Changes compilation batch mode to true uses Roslyn compiler for views 2018-09-07 13:10:55 +10:00
Stephan
7611f89642 Update nuspec and dependencies 2018-09-04 13:42:04 +02:00
Stephan
b1a59569a3 Cleanup readmes 2018-09-04 11:12:47 +02:00
Stephan
ee5a3fc99a Cleanup UmbracoCms.nuspec 2018-09-04 10:18:33 +02:00
Stephan
ffc7d5ba04 Fix build script 2018-09-04 09:35:39 +02:00
Stephan
1fb7bcb980 Cleanup nuspecs 2018-09-03 17:26:07 +02:00
Shannon
aed9ad3a66 Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
2018-08-29 12:24:38 +10:00
Shannon
b3442be768 removes manual copying of sqlce files, this is taken care of with the Umbraco.sqlce package 2018-08-29 12:16:52 +10:00
Shannon
fe508c5a0f Removes MB files that are already included in the MB package 2018-08-29 11:57:31 +10:00
Shannon
09ee58ddad Removes more refs to umbraco_client, fixes up nuspecs 2018-08-29 10:49:55 +10:00
Stephan
c743ac760d Update ModelsBuilder to -alpha.22 2018-08-28 20:02:25 +02:00
Shannon
46c193c9e2 updates nuspec 2018-08-29 01:45:05 +10:00
Shannon
029eff1f8a Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core. 2018-08-29 01:15:46 +10:00
Shannon
ab6758e7bf Merge branch 'temp8' into temp8-nuget-pkgs
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
2018-08-28 20:53:19 +10:00
Warren
ee91e8cec2 Nuget still not happy - as this merge contains the recent removal of the umbraco_client folder 2018-08-10 16:50:38 +01:00
Warren
1f9c5a48a7 Fix up .csproj after merge & update CMS.Core nuspec to include the new Serilog nuget packages we've added 2018-08-10 16:44:36 +01:00
Warren
a0f083a534 More nupkg cleanup & sync with .csproj's 2018-08-01 11:55:57 +01:00
Warren
e626fe3c8f Merge branch 'temp8' into temp8-nuget-pkgs 2018-08-01 10:46:00 +01:00
Warren
20d8139399 Merge remote-tracking branch 'origin/temp8' into temp8-serilog 2018-07-31 15:28:47 +01:00
Stephan
ee5a834ab0 Ensure build respects NUGET_PACKAGES 2018-07-31 15:55:31 +02:00
Warren
a7fb11ee3b Removed the install.ps1 reference from the core nuspec 2018-07-31 14:43:42 +01:00
Warren
cce6fab687 Remove the commented parts from the nuspec in the new web.nuspec 2018-07-31 14:43:00 +01:00
Warren
05196d5aa0 Add Cms.Web to Nuspecs to Verify in build script 2018-07-31 12:19:11 +01:00
Warren
d2ae7737b6 Update Powershell Build.ps1 to attempt to pack the Web.nuspec 2018-07-31 11:24:07 +01:00