Commit Graph

84 Commits

Author SHA1 Message Date
Stephan
38eae90640 Cleanup and get rid of warnings 2018-05-31 11:53:14 +02:00
Stephan
e0f97feb1c Update Benchmarks csproj 2018-05-31 11:53:14 +02:00
Stephan
f535f6d324 Cleanup ModelsBuilder merge 2018-05-21 11:49:08 +02:00
Stephan
20ecb6a779 Merge branch origin/temp8 into temp8-xbuild 2018-05-17 13:04:57 +02:00
Claus
70d1bed396 Merge branch 'temp8' into temp-U4-11218 2018-05-17 08:16:17 +02:00
Stephan
fe1a4f7d4f Depend on Umbraco.SqlServerCE 2018-05-16 15:54:07 +02:00
Shannon
ea6c466323 Fixes up some warnings 2018-05-16 10:06:51 +02:00
Shannon
971114e0fd Updates to 472 and re-targets to the original System.Threading.Tasks.Dataflow package against netstandard 1.3 but with 472 this completely fixes dependency outputs 2018-05-15 17:17:05 +02:00
Stephan
bb0f6fe0e3 Cleanup benchmarks SqlCE nuget dependency 2018-05-05 10:02:04 +02:00
Shannon
e10698532b Merge branch 'dev-v8' into temp-U4-11127
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
2018-04-06 13:56:07 +10:00
Stephan
f7a14a03f2 Fix build, still some weird csc.exe versionning 2018-04-04 17:41:55 +02:00
Shannon
6d1e50c44d Merge branch 'dev-v8' into temp-U4-11127
# Conflicts:
#	src/Umbraco.Web.UI/web.Template.config
2018-04-04 16:51:00 +10:00
Shannon
d89009bbe7 Changes targetFramework to 4.7, removes the huge assembly list, removes post build scripts since they don't work 2018-04-04 16:17:57 +10:00
Shannon
d618151e4f Fixes the csproj, binding redirects and versions 2018-04-04 15:54:39 +10:00
Shannon
f775fd8672 removes sqlce build commands since no packages folder exists anymore 2018-04-04 15:35:13 +10:00
Shannon
cdd50b899a Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11127
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
2018-04-04 15:04:11 +10:00
Stephan
cdd064ba08 Upgrade Dependencies 2018-04-03 14:54:01 +02:00
Stephan
62b6efc4da Fix upgrading 2018-03-30 10:28:49 +02:00
Shannon
881fbb7f76 Merge remote-tracking branch 'origin/dev-v7' into dev-v8
# Conflicts:
#	build/Modules/Umbraco.Build/Umbraco.Build.psm1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Core/IO/FileSystemProviderManager.cs
#	src/Umbraco.Core/ObjectExtensions.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
#	src/Umbraco.Core/Services/IdkMap.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Tests.Benchmarks/app.config
#	src/Umbraco.Tests/UI/LegacyDialogTests.cs
#	src/Umbraco.Web/Cache/MediaCacheRefresher.cs
#	src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
#	src/Umbraco.Web/PublishedContentQuery.cs
#	src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
2018-03-29 20:01:14 +11:00
Stephan
0d22478186 Port v7@2aa0dfb2c5 - WIP 2018-03-27 17:59:53 +02:00
Stephan
6b1ed89cb0 Port v7@2aa0dfb2c5 - WIP 2018-03-27 16:42:52 +02:00
Stephan
6bc68005f4 U4-10756 - id/guid cache, new version 2018-03-15 09:46:39 +01:00
Stephan
c0439b3c4e DataTypes refactoring - troubleshooting 2018-02-08 16:08:52 +01:00
Sebastiaan Jansssen
7cd540c37e Remove additional premature uses of C#7 features 2018-01-29 14:35:30 +01:00
Shannon
d104525a50 Updates core to use latest CDF version 2018-01-23 11:15:37 -07:00
James Jackson-South
b0a64655b4 Fastest dictionary lookups 2018-01-22 16:43:02 +11:00
Stephan
363c8fab2c Cleanup 2018-01-21 10:03:17 +01:00
James Jackson-South
24071eb3b1 Faster TryConvertTo 2018-01-20 14:54:52 +11:00
James Jackson-South
62ffbe7cf0 Cleanup benchmarks and add TryCOnvertTo 2018-01-20 13:00:10 +11:00
Stephan
b5856803e1 DataType refactoring preparation - Entity refactoring 2018-01-10 12:48:51 +01:00
Stephan
af43ea0beb Reorg code, move dtos 2017-12-28 09:06:33 +01:00
Stephan
2182b0f18f Migrations refactoring - WIP - move code 2017-12-19 11:00:46 +01:00
Shannon
131fea3ba4 updates some proj refs 2017-12-06 15:38:00 +01:00
Stephan
aa25990681 Integer version ID, cleanup 2017-12-01 20:00:33 +01:00
Stephan
ef11fda272 More content refactoring (tests) 2017-11-15 08:53:20 +01:00
Stephan
fcf2b27953 More content refactoring (tests) 2017-11-10 11:27:12 +01:00
Stephan
14eb4fe6e0 Refactor PublishedContentTypes 2017-10-19 12:00:55 +02:00
Stephan
ccd54392b7 More reflection utilities 2017-09-29 18:33:34 +02:00
Stephan
101ba8f620 Facade cleanup and refactoring 2017-09-29 18:33:16 +02:00
Stephan
e7a0d79ea7 Bugfix, getting things to run 2017-09-27 16:14:11 +02:00
Stephan
91b8f073ad Reflection and model factory 2017-09-27 10:26:35 +02:00
Stephan
e71c9740cd More SqlTemplates 2017-09-24 18:54:31 +02:00
Stephan
d9aaba192c Port 7.7 - WIP 2017-09-14 19:29:12 +02:00
Stephan
b10d370b16 Merge branch dev-v7.7 into user-group-permissions 2017-07-28 12:54:13 +02:00
Stephan
76569d58fe Cleanup DotSettings 2017-07-26 19:26:55 +02:00
Shannon
b8e2e49a44 Updates to latest Katana libs 2017-07-26 17:50:58 +10:00
Stephan
db9eccc220 Cleanup versions 2017-07-25 18:06:28 +02:00
Stephan
83f84f05b9 PropertyValueConverter - refactoring WIP 2017-07-25 13:57:42 +02:00
Stephan
0e832d195a Benchmark dynamic ctors 2017-07-25 13:57:38 +02:00
Stephan
c76403077f Normalize cr/lf/tab 2017-07-20 11:21:28 +02:00