Compare commits

...

1213 Commits

Author SHA1 Message Date
Shannon Deminick 1e0a4690fc Added an error log if timed out 2013-04-23 20:31:32 -10:00
Shannon Deminick 52163494db changed the async state object to be a custom class to hold the original values of alias/text 2013-04-23 20:19:48 -10:00
Shannon Deminick 8416764a83 removed the trace from the page 2013-04-23 20:01:26 -10:00
Shannon Deminick 2d3eb8c208 Working on #U4-493, updated ContentTypeControlNew and EditNodeTypeNew to use correct webforms class structures.
Changed the saving logic in ContentTypeControlNew to use the page's async execution and changed the page to support async.
Changed the page's async timeout to be 5 minutes.
2013-04-23 20:00:48 -10:00
agrath 3594693f4b Backported fix for u4-335 from Commit b15d0ab0b879 into 4.11.7 2013-04-22 11:12:03 -12:00
Sebastiaan Janssen b99de245bf Fixes U4-2052 for new mediatypes as well 2013-04-21 09:44:08 -02:00
Shannon Deminick 82fc1a5304 updated proj file 2013-04-20 03:47:57 +06:00
Shannon Deminick f0aab6ae81 Fixes: U4-2089 - sort dialog behavior when clicking on column headers. Updated to latest version of table sorting, had to create a custom sort parser
upgraded the sort.aspx to have the proper code behind structure and updated the page to have proper css and js files instead of inline. Fixes missing images.
2013-04-20 03:42:47 +06:00
Sebastiaan Janssen 721f813d1e U4-1604 Fix latest edits dashboard control so that it doesn't make a zillion queries - Limit the latestedits query to specified amount of rows 2013-04-19 06:10:58 -02:00
Shannon Deminick 6c9e82e735 fixed typo 2013-04-19 04:31:55 +06:00
Shannon Deminick f7ddb1ed49 fixed typo 2013-04-19 04:30:15 +06:00
Shannon Deminick c0fd974cc1 fixes typo on word disallow 2013-04-19 04:20:24 +06:00
Shannon Deminick e9c4a031c9 Fixes up directory browser and removes legacy request params which are prone to xss 2013-04-19 04:10:35 +06:00
Shannon Deminick a159b50c05 Fixed a couple threading issues. Improved the performance of the nodeSorter but this should be better improved in 6.x 2013-04-18 20:52:49 +06:00
Shannon Deminick 3891e46549 Fixed a couple threading issues. Improved the performance of the nodeSorter but this should be better improved in 6.x 2013-04-18 20:52:30 +06:00
Shannon Deminick e7bcc642a9 fix build error on build server 2013-04-18 19:50:01 +06:00
Shannon Deminick 4983990d39 Big optimization for content.SortNodes - 92% performance increase for this method which is a big
contributor to CPU time during publishing.
2013-04-18 05:43:05 +06:00
Shannon Deminick 2f6dada481 Fixes issue with ctor not setting default property 2013-04-17 23:20:20 +06:00
Shannon Deminick ff5dc324fe Fixes: #U4-227 - ensures data is not persisted to the db for members/media if validation fails.
Fixes up (enables) validation summary for members too.
2013-04-17 22:41:43 +06:00
Shannon Deminick 096c5ad69f Fixes: #U4-485, changes name field from saving to the db if it is empty. cleans up some code. 2013-04-17 22:05:10 +06:00
Sebastiaan Janssen 77ee87178e Merge 2013-04-17 07:04:04 -02:00
Sebastiaan Janssen a6997a5cb7 Revert U4-1922 to resume expected sorting behavior. 2013-04-17 07:03:18 -02:00
Stephan 3b9bf7b0f9 U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies 2013-04-16 12:58:03 -02:00
Sebastiaan Janssen 158f4d0614 Merge 2013-04-15 07:32:00 -02:00
Sebastiaan Janssen 7a38970cf4 U4-2109 Regex text-field in DocTypes > (a type) > Properties (a property) >
Validation + Description lack Trimming
2013-04-15 07:31:24 -02:00
Shannon Deminick 26a7bf8187 Fixes: #U4-2087 2013-04-12 02:11:01 +06:00
Sebastiaan Janssen 3ff1b01e46 Add DotSettings file for custom code inspections. In this case: Replace
!someBool with an explicit false check (someBool == false) for readability.
2013-04-11 07:15:06 -02:00
Shannon Deminick 36e803713c Fixed up some code in UmbracoEnsuredPage and moveOrCopy 2013-04-11 02:15:48 +06:00
Shannon Deminick a3e7f644de merges changes for UmbracoHelper from 6.0.x to deal with null objects when using Content method (dynamic) 2013-04-10 22:51:19 +06:00
Sebastiaan Janssen 809badd1cf Update version to 4.11.7 2013-04-10 08:54:31 -02:00
Sebastiaan Janssen da92ece774 Update version to 4.11.7 2013-04-10 07:57:56 -02:00
Sebastiaan Janssen a531afb819 Don't need IronPython license any more either. 2013-04-10 07:46:05 -02:00
Sebastiaan Janssen 8dfeb1e616 Cleanup solution and folders, removes Linq2Umbraco and IronPython engine from
the project as we don't ship with them any more. Updated readme and docs.
2013-04-10 07:30:14 -02:00
Shannon Deminick 1012a4814d updates #U4-2070 for tiny mce plugins 2013-04-10 03:22:11 +06:00
Shannon Deminick bae41cde14 updates #U4-2070 for skin module files in live editing 2013-04-10 03:16:26 +06:00
Shannon Deminick b3260f05c0 updates #U4-2070 for templateskinning.aspx 2013-04-10 03:05:57 +06:00
Shannon Deminick e33a79ac65 updates #U4-2070 for insertMasterpageContent.aspx 2013-04-10 03:02:10 +06:00
Shannon Deminick c4dbabf654 updates #U4-2070 for translation/xml.aspx and translation/preview.aspx 2013-04-10 02:59:47 +06:00
Shannon Deminick 423643d66c updates #U4-2070 for tinymce3/insertmacro.aspx 2013-04-10 02:46:11 +06:00
Shannon Deminick 4ccb655f73 updates #U4-2070 for members/search.aspx 2013-04-10 02:43:03 +06:00
Shannon Deminick c8330d60f9 updates #U4-2070 for sendToTranslation.aspx 2013-04-10 02:41:22 +06:00
Shannon Deminick a9aa3a04b5 updates #U4-2070 for search.aspx 2013-04-10 02:39:32 +06:00
Shannon Deminick 0bffa8e3f4 updates #U4-2070 for preview.aspx 2013-04-10 02:35:31 +06:00
Shannon Deminick 436322f58c updates #U4-2070 for directoryBrowser.aspx 2013-04-10 02:34:44 +06:00
Shannon Deminick e90c46dd78 updates #U4-2070 for canvas.aspx 2013-04-10 02:33:08 +06:00
Shannon Deminick deda2534f8 updates #U4-2070 for SendPublish.aspx 2013-04-10 02:30:53 +06:00
Shannon Deminick 8112c13857 updates #U4-2070 for insertMacro.aspx 2013-04-10 02:28:50 +06:00
Shannon Deminick 57792de185 updates #U4-2070 for imageViewer.aspx 2013-04-10 02:21:59 +06:00
Shannon Deminick e1f93029a5 updates #U4-2070 for assigndomain.aspx 2013-04-10 02:19:29 +06:00
Shannon Deminick f64e0c7eb7 updates #U4-2070 for autodoc.aspx 2013-04-10 02:17:02 +06:00
Shannon Deminick bf024e9011 updates #U4-2070 for assemblyBrowser.aspx 2013-04-10 02:14:13 +06:00
Shannon Deminick 036b888d30 updates #U4-2070 for ShowUmbracoTags.aspx 2013-04-10 02:08:56 +06:00
Shannon Deminick 1838a8dac5 updates #U4-2070 for NewRelationType.aspx 2013-04-10 02:07:16 +06:00
Shannon Deminick 205bf5fe4e updates #U4-2070 for EditRelationType.aspx 2013-04-10 02:05:52 +06:00
Shannon Deminick a50e192ab7 updates #U4-2070 for sort.aspx 2013-04-10 02:03:04 +06:00
Shannon Deminick 9684255e6e ensures validation is correct in editContent, cleans up some code. 2013-04-10 01:58:22 +06:00
Shannon Deminick 72790d74f5 Fixes: #U4-2072 and cleans up some code. 2013-04-10 01:47:17 +06:00
Shannon Deminick bb70bee6ae Fixes: #U4-2071 and cleans up some code. 2013-04-10 01:42:15 +06:00
Shannon Deminick 0430e7966c Fixes: #U4-2074 and cleans up a bit of code 2013-04-10 01:24:06 +06:00
Shannon Deminick 2e9a52b1f8 Fixes: #U4-2075 2013-04-10 00:56:43 +06:00
Sebastiaan Janssen e6ccd8a5b5 Fix for U4-2081 tinymce Image picker does not work in 6.03 2013-04-09 11:33:35 -02:00
Sebastiaan Janssen 7ae8b28466 Fix the medium trust error in the about box 2013-04-09 10:20:34 -02:00
Sebastiaan Janssen 527375b238 Fixes U4-2052 Creating a new document type has a bin icon by default
Also deals better with pre-existing selected id's before switching the behaviour
2013-04-09 07:49:22 -02:00
Sebastiaan Janssen 1929f60ea8 Update the webservices version 2013-04-09 07:10:24 -02:00
Sebastiaan Janssen b9cc2efc8c Add authentication to creating templates in webservices 2013-04-09 07:07:13 -02:00
Shannon Deminick bad284515c Fixes: #U4-2076 2013-04-09 07:32:13 +06:00
Shannon Deminick 5b660d95f1 Fixes: #U4-2077 2013-04-09 07:26:21 +06:00
Shannon Deminick 106ac44e64 Fixes: #U4-2073 2013-04-09 07:23:33 +06:00
Shannon Deminick 64bb7e1db0 Fixes up an app check 2013-04-09 07:14:58 +06:00
Shannon Deminick 25b9ca3b0e Works on #U4-2078 - adds new base classes for HttpHandlers just like for web services. 2013-04-09 07:01:43 +06:00
Shannon Deminick b928170103 Works on #U4-2078 2013-04-09 06:40:02 +06:00
Shannon Deminick e25ee246fb Works on #U4-2078 2013-04-09 06:31:26 +06:00
Shannon Deminick 8e8ec41dae Works on #U4-2078 2013-04-09 06:25:47 +06:00
Shannon Deminick fb34c4716a Works on #U4-2078 2013-04-09 06:18:15 +06:00
Shannon Deminick 29bf61b1f2 Starts on #U4-2078, mostly just some initial code cleanup 2013-04-09 06:07:25 +06:00
Shannon Deminick 9803309e34 imports patch from 846d845a5a87 since it belongs in the main dev branch. 2013-04-09 05:04:57 +06:00
Shannon Deminick 3a539629dc imports patch from ed6939e5927f since that fix belongs in the main dev branch 2013-04-09 05:04:21 +06:00
Shannon Deminick 74b970d586 Fixes: #U4-529 - Created 2 base classes for web services - UmbracoWebService and UmbracoAuthorizedWebService for use in
creating asmx classes. This makes it easier to authenticate/authorize per app and also exposes Umbraco standard
objects like UmbracoContext, ApplicationCOntext, etc...
2013-04-09 05:00:22 +06:00
Shannon Deminick 518898b04b Merge 2013-04-09 01:09:27 +06:00
Sebastiaan Janssen 99fe89addc Fix U4-1864 the same way as in 6.0.x 2013-04-08 06:55:48 -02:00
Sebastiaan Janssen 668d4f9f91 Fixes U4-1864 Publishing document type with Upload field and related
umbracoWidth, umbracoHeight, etc fields added
2013-04-08 05:59:02 -02:00
Shannon Deminick 90e73cb89f cleans up some code in codeEditorSave 2013-04-06 01:59:28 +06:00
Shannon Deminick dcd6477030 Removes un-needed ShowUmbracoTags files from legacy files. 2013-04-06 01:54:41 +06:00
Shannon Deminick 7d5589118f Merge 2013-04-06 01:43:41 +06:00
Shannon Deminick 103efbdc27 removes config check on p.aspx since we need it to show the feeds when installer is done. 2013-04-06 00:30:37 +06:00
Shannon Deminick 9736aaafaa Fixes authorize issue with insertchar.aspx 2013-04-06 00:09:43 +06:00
Shannon Deminick bf3fa20a53 Cleaned up the code fro rsd and wlwmanifest and ensures wlwmanifest actually returns the results in xml format. 2013-04-06 00:04:23 +06:00
Shannon Deminick f936f8b0dd updates install utility to throw exception if the app is configured already. 2013-04-05 23:40:02 +06:00
Shannon Deminick 1bd20c9b06 Fixes: #U4-2059 and removes un-needed ping.aspx files, cleans up some code 2013-04-05 23:28:43 +06:00
Shannon Deminick 099b713947 Fixed ValidateProxyUrl to check for invalid Urls. 2013-04-05 22:29:45 +06:00
Shannon Deminick 165d9c7dff Fixed nonodes to now show version information and updated it so that it redirects to root if there
is actually content so the page is actually not accessible unless you actually have no nodes.
2013-04-05 21:58:13 +06:00
Stephan 7934ba7ec4 U4-2030 - failed to update UmbracoContext on some devt webservers 2013-04-05 10:28:19 -02:00
Shannon Deminick 60b6608289 patch for fix #U4-2027 2013-04-05 06:42:52 +06:00
Sebastiaan Janssen de0e6f3179 Merge 2013-04-02 08:08:31 -02:00
Sebastiaan Janssen 39edb9b7e2 Fixes U4-2032 Preview for an RTE field shows published content instead of actual
preview
2013-04-02 08:07:18 -02:00
Shannon Deminick a638488eb7 Fixes unit tests which require the ApplicationContext.Current singleton to be setup 2013-04-01 23:30:19 +06:00
Shannon Deminick a2a539f7db Merge 2013-04-01 23:12:47 +06:00
Shannon Deminick 6768bb4793 Fixes: #U4-1874 - merges in thread-safe fixes for static object caching from 6.1 and cleans up
a bunch of the code in ContentType.cs. Back ports fixes for Languages.cs from 6.1 and cleans up code.
2013-04-01 23:12:17 +06:00
Sebastiaan Janssen 71aa248a4e Fixes U4-535 Stylesheet content gets deleted if you change case 2013-04-01 14:27:20 -02:00
Sebastiaan Janssen bea50f4562 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:50:27 -02:00
Shannon Deminick 55c7f72d8e Converts create.aspx to have the correct webforms file/class structure, fixed logging for userTask,
fixed issue with last regex fix for xss
2013-03-29 23:14:42 +06:00
Shannon Deminick 5f4eaef4a2 Fixes: #U4-2022 2013-03-29 21:31:27 +06:00
Sebastiaan Janssen 27c0c4d64e Opening new branch 2013-03-27 14:47:35 -01:00
Sebastiaan Janssen 52cf559536 Closing 4.11.6 branch 2013-03-27 12:00:18 -01:00
Sebastiaan Janssen 3d0be3836c Added tag release-4.11.6 for changeset 14338b0ab173 2013-03-27 11:13:56 -01:00
Sebastiaan Janssen 2bc33e0115 Merge 2013-03-27 08:58:34 -01:00
Sebastiaan Janssen 8576d9c67e Bump version to 4.11.6 2013-03-27 08:56:30 -01:00
Shannon Deminick 9452d5fd09 adds patch for #U4-1754 and updates 2013-03-27 03:08:37 +06:00
Shannon Deminick 1f40d726de adds patch for #U4-1754 2013-03-27 02:59:42 +06:00
Shannon Deminick 2699611ba3 adds patch for #U4-1754 2013-03-27 02:58:59 +06:00
Shannon Deminick b1fa06bfe8 Removes unused code. 2013-03-26 22:02:49 +06:00
Shannon Deminick 4dc22b6ce4 Applies patch for #U4-497 for getting exceptions for xslt 2013-03-26 22:02:08 +06:00
Sebastiaan Janssen 883277125a Can't use parameters here as the query gets butchered. 2013-03-26 13:27:46 -01:00
Sebastiaan Janssen ff961abaab Actual fix for U4-1987 Error when attempting to save document type 2013-03-26 09:50:48 -01:00
Sebastiaan Janssen b2414c1ab8 Fixes U4-1987 Error when attempting to save document type 2013-03-26 09:33:08 -01:00
Stephen Roberts 0e392b398c Fixed Property order for document types with Master document types. 2013-03-14 11:08:02 +00:00
Sebastiaan Janssen 5914690ad8 Allow leading sign in number field so that negative numbers are supported 2013-03-25 10:09:02 -01:00
Shannon Deminick dbbdd16bb9 Fixes: #U4-497 2013-03-23 02:34:34 +06:00
Shannon Deminick 762cca145f Fixes: #U4-1931 - allow empty string in dictionary item. 2013-03-22 21:59:21 +06:00
Morten Christensen 5cd2d568e3 Fixes U4-1938 by actually calling and checking the Before/AfterDelete events for DataTypeDefinitions.
Backported from 32fb51f603a3
2013-03-22 11:12:32 -01:00
Sebastiaan Janssen 259fbcb8f0 Fixed U4-1934 Error in comments of config files 2013-03-18 08:50:24 -01:00
Shannon Deminick db3f21429e Fixes infinite loop bug with string trimming. 2013-03-15 11:31:11 +06:00
Shannon Deminick 04b9607741 Fixes: #U4-1916 and another issue for vdirs, added unit tests, changed UI web project to always
launch in a VDIR.
2013-03-15 08:03:19 +04:00
Shannon Deminick 5bd2571395 Merge 2013-03-12 00:01:14 +04:00
Shannon Deminick c0cd157e60 applies patch for #U4-1890 2013-03-12 00:00:55 +04:00
Sebastiaan Janssen ac2f9b172c .transformed files are auto-generated and shouldn't be under source control 2013-03-11 17:15:30 -01:00
Sebastiaan Janssen b8e4a73c3b Revert Casey's mistakenly added files 2013-03-11 15:55:35 -01:00
Shannon Deminick 68c4255a51 updates proper error handling for razor script macros 2013-03-11 21:49:04 +06:00
Shannon Deminick d07212c89b Fixed changes with new MacroErrors config and how macros are rendered so it supports all macro types and also fixes up a bit of code
in the umbraco.macro class.
2013-03-11 21:06:02 +06:00
Shannon Deminick 28c55320a1 Updates the pull request for handling macro errors.
Backports fixes for partial view macros from 6.x - U4-1488, U4-1844, U4-1730, U4-1843
2013-03-11 20:11:11 +06:00
Shannon Deminick fd58017e97 imported patches for pull request spudstuff/u4497 2013-03-11 18:49:45 +06:00
Casey Neehouse 09408b898e Merge 2013-03-08 19:38:33 +05:00
Morten Christensen d1b05332c5 Manually adds fix for U4-1869 from 6.0.3 branch 2013-03-07 20:28:13 -01:00
Casey Neehouse caad0afed8 Corrects u4-1870 - Refactor Load Content SQL to check if ID is in published list
versus using a join that can cause duplicate entries.
2013-03-07 21:00:31 +05:00
Shannon Deminick 62d365573f Back ports fixes for: #U4-1614, #U4-793 - preview working properly in mvc 2013-03-06 03:17:18 +06:00
Shannon Deminick f3b7a8a581 Fixes: #U4-1471 - issue with having NewRelic installed and some sort of conflict with shutting down
our logger.
2013-03-05 23:49:45 +06:00
Shannon Deminick a765f36d24 Adds unit tests for DynamicNode and DynamicPublishedContent, fixes both when querying for recursive properties.
Fixes: #U4-1839
2013-03-05 21:00:16 +06:00
Shannon Deminick 046da1a8ce Fixes: #U4-1824 - issue with razor dynamic node property access performance enhancements. 2013-03-05 07:06:41 +06:00
Shannon Deminick ca7abd6c78 Merge 2013-03-05 06:08:59 +06:00
Shannon Deminick 7cc0f2a514 Fixes: #U4-1819 2013-03-05 05:56:53 +06:00
Shannon Deminick 4882df43bd Back merged from 6.1 the changes required for #U4-1822 and #U4-1797 2013-03-02 01:50:53 +06:00
Sebastiaan Janssen ee2943b9fb Created branch 4.11.6 2013-03-01 06:56:34 -01:00
Sebastiaan Janssen c250fa560e Restrict the NuGet .Core dependency to the same version. 2013-02-28 15:08:30 -01:00
Sebastiaan Janssen b017e8690a Fix errors in log caused by no prevalues beind selected. 2013-02-28 09:53:57 -01:00
Shannon Deminick 8a9680e75c updated unit test logic 2013-02-27 23:13:48 +06:00
Shannon Deminick 36c66e676a Fixed unit tests 2013-02-27 22:35:27 +06:00
Sebastiaan Janssen ba530061a0 Merge 2013-02-27 13:53:14 -01:00
Sebastiaan Janssen 89ae3bc143 Add RevertToCleanInstall.bat to 4.11.5 too, it's handy. 2013-02-27 13:51:58 -01:00
Shannon Deminick 3951f59d09 Merge 2013-02-27 20:46:06 +06:00
Shannon Deminick cd8c998ebf Fixes: U4-1788 - ensures internal reserved paths and urls (that cannot be modified) are stored staticly in code,
Also fixes that the _reservedPathsCache and _reservedUrlsCache actually works, before we were doing an
object.ReferenceEquals comparison which would never have worked and it was also not thread safe.
2013-02-27 20:42:11 +06:00
Sebastiaan Janssen 2cb544591b Pull in new translations 2013-02-27 12:43:21 -01:00
Stephan 1b1b5c047c U4-1779 - Web.BaseRest supports rest extensions over multiple classes 2013-02-26 16:52:06 -01:00
Sebastiaan Janssen fa5b9e5689 Typo: U4-512 "Memebertype saved" 2013-02-26 17:29:53 -01:00
Sebastiaan Janssen c26df8da6f U4-591 Access bug in dashboard 2013-02-26 15:48:22 -01:00
Shannon Deminick 1e02d85fca Fixes: #U4-1773 (backport fix from 6.0.1) 2013-02-26 21:35:09 +06:00
Shannon Deminick d1dc2331f8 Merge 2013-02-26 21:15:31 +06:00
Shannon Deminick d503deb8c5 reverted member index config, for pre 6.1 we will still need to manually set the member fields. 2013-02-26 21:07:59 +06:00
Morten Christensen 0859b92aaf Fixes U4-1781 so Saved is called when saving a DataTypeDefinition in the backoffice 2013-02-26 13:59:08 -01:00
Sebastiaan Janssen 695d26434c U4-600 Wrong membersearch.png path in MemberSearch.ascx 2013-02-26 09:48:14 -01:00
Shannon Deminick a19de645e4 Merge 2013-02-26 00:59:06 +06:00
Shannon Deminick de9a27db10 Updates to latest Examine lib (another bug fixed) 2013-02-26 00:45:42 +06:00
Sebastiaan Janssen b6d5b7d603 Fixes U4-1776 SafeAlias culture problem 2013-02-25 13:33:51 -01:00
Sebastiaan Janssen 93d7cf4dc3 Fixes U4-1776 SafeAlias culture problem 2013-02-25 13:28:54 -01:00
Tom Fulton 0c42596dc8 Fixed: U4-1678 Saving a Media should show a SpeechBubble 2013-02-25 08:39:18 -01:00
Sebastiaan Janssen 8cf9c1ba97 Fixes: U4-1769 Dictionary Item with "Illigal" character can not be deleted 2013-02-22 14:15:22 -01:00
Shannon Deminick 7a47d63b48 Fixed remaining tests 2013-02-22 19:55:22 +06:00
Sebastiaan Janssen 4648a8c103 Fixes U4-1746 Duplicate image source (src) when inserting resized image in tiny
mce (richtext editor)
2013-02-22 11:41:01 -01:00
Sebastiaan Janssen 87947871d1 Have to add new Examine version to Web.UI as well, else the build output from
build.bat file will not be able to find it.
2013-02-22 09:57:58 -01:00
Sebastiaan Janssen 87fee572ff Enable nuget package restore for teamcity, upgrade examine dll 2013-02-22 09:47:23 -01:00
Shannon Deminick 89f7a3ec63 Clearly these files shouldn't be deleted :P 2013-02-22 06:23:03 +06:00
Shannon Deminick 7092a9ccbb Reverted the macro engines and web proj's, it would seem as though 4.x on the build server hasn't
been configured for nuget package restor (or something like that)
2013-02-22 06:05:10 +06:00
Shannon Deminick e9ea9b5e1b Updates DynamicNode with some performance enhancements especially around things like HasProperty and GetProperty.
Also when it returned children, it was actually re-iterating over all children (going to the repo to find them even though
they were already resolved).
2013-02-22 05:44:17 +06:00
Shannon Deminick fd1efb29ec Fixes issue when saving settings to web.config, not sure how this error never came up before. Was missing a "\" between the path and "web.config".
Using Path.Combine is much safer than just string.Concat!
2013-02-22 04:45:20 +06:00
Shannon Deminick cf4781153e Fixes: #U4-873, #U4-888 - fixes media sorting in razor + MVC. Updates Nunit libs and Examine lib. Adds unit tests to
support new sorting fixes. Fixes up a few other issues with the legacy ExamineBackedMedia class, it will now handle all data
stored in Examine. Simplifies the Examine internal index sets to include all data.
2013-02-22 04:12:24 +06:00
Shannon Deminick ebed142cd5 Another fix for file sys test 2013-02-21 23:47:16 +06:00
Shannon Deminick d162aba14a Fix for file system test 2013-02-21 23:07:37 +06:00
Shannon Deminick ec075f5807 Merge 2013-02-21 22:38:38 +06:00
Sebastiaan Janssen dca90e6316 Merge 2013-02-21 15:09:20 -01:00
Sebastiaan Janssen df31fafec5 Update en_us umbracoembed file, had the wrong content 2013-02-21 15:06:37 -01:00
Shannon Deminick 828dc64035 Backports fix for FullpathToRoot in GlobalSettings... not sure how some unit tests have been working this whole time.
Changes UseLegacySchema default value to false... was set to true!?
un-ignores LookupByNiceUrl tests and still ensures it doesn't require a database to test by passing in an optional parameter
to LookupByNiceUrl to specify if we want to include domain lookups or not (default is true)
2013-02-21 22:02:56 +06:00
Shannon Deminick 0b74164a8e New base test class for anything relating to published content/media, un-ignores strongly typed tests. 2013-02-21 21:01:00 +06:00
Shannon Deminick 62be1b1267 un-ignores Can_Get_File_Dates in AbstractFileSystemTests... not sure why it was ignored seems to work properly. 2013-02-21 20:42:49 +06:00
Sebastiaan Janssen 85ae7e764f Merge 2013-02-21 08:52:48 -01:00
Sebastiaan Janssen 3daa624627 Fixes U4-1668 4.11.4 NiceUrl property on dynamicnode does not work until a
property has been requested from the dynamic node
2013-02-21 08:52:23 -01:00
Shannon Deminick d8af1aaf7b Changed logging in unit tests to filter out things we don't need to see 2013-02-21 03:13:16 +06:00
Shannon Deminick f2d105d8b9 Fixed #U4-814 and got all possible unit tests that were not working for DynamicNode but were working for
DynamicPublishedContent working. And fixed up the DynamicPublishedContent unit tests as these weren't working at all...
but seemed to say they did on the build server. strange.
2013-02-21 05:44:44 +06:00
Stephan 5b0a8c0668 Tests - fix build broken by back-porting 6.x code 2013-02-20 10:12:41 -01:00
Stephan c3ccf3a609 Tests - cleanup settings handling for more reliable tests 2013-02-19 18:01:52 -01:00
Stephan 60bbede408 U4-1441 - fix, fix and fix! 2013-02-19 17:49:49 -01:00
Stephan 1d0299af89 U4-1611 - bugfix 2013-02-19 13:58:16 -01:00
Shannon Deminick c2d0e255df Fixes: #U4-1537 2013-02-19 20:17:17 +06:00
Shannon Deminick 005d3e7d64 Removes area routing for local surface controllers and BeginUmbracoForm, adds strongly typed Html.Action<T>
method for rendering SurfaceController child actions regardless of area (so you don't have to specify).
All relates to #U4-1727
2013-02-19 06:19:26 +06:00
Shannon Deminick 12f8638223 Fixes: #U4-1727 2013-02-19 06:18:51 +06:00
Shannon Deminick e3f9e8c842 Fixes: #U4-552 2013-02-19 03:42:19 +06:00
Shannon Deminick a475f72d50 Fixes: #U4-1695 2013-02-19 02:25:57 +06:00
Shannon Deminick a559ef9f90 Fixes: #U4-1732 2013-02-19 00:59:21 +06:00
Sebastiaan Janssen be83302b14 Fixes U4-1451 2013-02-18 13:22:12 -01:00
Sebastiaan Janssen 83d7ea9ef1 Ignoring wrong unit test for now 2013-02-18 12:53:15 -01:00
Sebastiaan Janssen 95024442de Copy the umbracoSettings for PublishMediaStoreTests as well 2013-02-18 12:22:53 -01:00
Sebastiaan Janssen 69f54b5f22 Copy the umbracoSettings for LibraryTests as well 2013-02-18 11:57:58 -01:00
Sebastiaan Janssen 3404f95b2e Forgot one trailing slash in previous commit 2013-02-18 11:42:45 -01:00
Sebastiaan Janssen e56738481b Adding trailing slash to failing routing tests.
The issue with these tests might again be because of the UmbracoSettings file, which has the trailing slash setting. But with the settings being reset after teardown the tests were still failing, so made these minor corrections which shoudl correspond to the default setting.
2013-02-18 11:38:07 -01:00
Sebastiaan Janssen cb59dc353b Update version to 4.11.5 2013-02-18 10:31:43 -01:00
Sebastiaan Janssen d1b75eac08 Update wrong config path in unit tests 2013-02-18 10:31:17 -01:00
Sebastiaan Janssen 8fabd4e4ed Merge 2013-02-15 12:05:46 -01:00
Sebastiaan Janssen 564d92bed7 Possible fix for TeamCity 2013-02-15 12:05:25 -01:00
Shannon Deminick 95f103ccc2 Merge 2013-02-15 18:55:50 +06:00
Stephan 0ace2fdae7 U4-1611 - fix xpath special chars escaping issues in published content store 2013-02-14 16:31:45 -01:00
Stephan 5da3541584 U4-1441 - bugfix 2013-02-14 16:27:27 -01:00
Shannon Deminick ef86d2f1f1 Manually applies patch for #U4-1718 2013-02-14 23:26:29 +06:00
Sebastiaan Janssen a10a6d1af8 Need to wrap the login javascript in a placeholder for Concorde 2013-02-14 09:06:15 -01:00
Stephan 6d87174cc1 U4-1441 - improve logging 2013-02-08 07:54:16 -01:00
Stephan 9af9c3fe77 U4-1441 - change trySkipIisCustomError config key 2013-02-08 07:36:35 -01:00
Stephan 9cedf5da4c U4-1441 - make trySkipIisCustomError value a setting 2013-02-08 08:08:36 -01:00
Shannon Deminick 906d675dca Merge 2013-02-07 02:09:32 +06:00
Shannon Deminick f1b3105202 Patch for #U4-1653 - media library cache refresh issue 2013-02-06 20:56:47 +06:00
Shannon Deminick 3ebb213916 Patches installer issue. 2013-02-06 19:18:42 +06:00
Stephan a65ca205de U4-1441 - fix issue with IIS taking over custom errors 2013-02-05 16:29:10 -01:00
Stephan 3e1120612b Update version number 2013-02-04 12:00:58 -01:00
Stephan 8d06d39a62 Create branch for 4.11.5 2013-02-04 11:59:30 -01:00
Stephan da7fea47c6 U4-1441 - refactor (fix) legacy NotFoundHandler support 2013-02-03 14:34:04 -01:00
Shannon Deminick f2442b25f6 Close 4.11.4 branch 2013-02-01 19:25:12 +06:00
Sebastiaan Janssen 300d3ff09b Added tag Release-4.11.4 for changeset e02f5aebb87e 2013-02-01 08:41:26 -01:00
Sebastiaan Janssen e6337b8f14 Properly reference uGoLive MyGet package 2013-02-01 08:38:13 -01:00
Sebastiaan Janssen 2be785ace3 Merge 2013-02-01 08:16:18 -01:00
Sebastiaan Janssen 5e2d991fab Update uGoLive 2013-02-01 08:16:10 -01:00
Morten Christensen 536cb4caf1 Fixes U4-1571 2013-02-01 07:42:51 -01:00
Morten Christensen 27745ea141 Fixes U4-1483 2013-02-01 07:35:48 -01:00
Sebastiaan Janssen 5289c55740 Translation updates 2013-02-01 07:24:21 -01:00
Sebastiaan Janssen 791773fc8a Add some more translations 2013-02-01 07:23:33 -01:00
Shannon Deminick 1da27e6c2b Removes all upgrade script stuff since we've deployed the fix in a package. 2013-02-01 06:42:42 +06:00
Shannon Deminick a909b7904e Fixes uGoLive ascx 2013-02-01 05:29:54 +06:00
Shannon Deminick 1b1abce7da Merge 2013-01-31 04:48:29 +06:00
Shannon Deminick fbc10be381 Reverted logic of Document to be what it used to be... Published and HasPublishedVersion() are the same and will
return the same thing, though we've kept the lazy loading and optimizations.
2013-01-31 04:46:51 +06:00
Shannon Deminick 61f2647b62 missing file 2013-01-31 04:26:47 +06:00
Shannon Deminick a5bea7fc59 Added the ability to automate any c# scripts for an upgrade process. I realize this is superceded already in 6.0
but we need a way to do this in 4.x too especially for this release since we need to run a script to fix some db
issues. I've added a framework using an UpgradeScriptManager and another install step + unit tests for some of the
UpgradeScriptManager methods.
2013-01-31 04:26:37 +06:00
Sebastiaan Janssen b9be5c2561 Also implement optimization in fdfa687e6f41 to v4: no need to try and republish
the child pages if the page you are trying to publish was already published
2013-01-30 15:01:38 -01:00
Shannon Deminick 97556de447 Changed methods created yesterday to internal so we can port to 6+ nicely. 2013-01-30 18:58:42 +06:00
netaddicts d5bde0d8df Makes sure preview is not using cached versions of any macro 2013-01-24 11:00:15 -01:00
Sebastiaan Janssen cc5ca0b5fe Fixing U4-359 Previewing new nested pages doesn't work 2013-01-30 09:21:43 -01:00
Shannon Deminick 0cb9cc6840 just cleaned up some code formatting. 2013-01-30 07:59:15 +06:00
Shannon Deminick d38d7b1ff4 Updates all code calling UnPublishSingleNode & UpdateDocumentCache to pass in the already existing Document object if there is one
instead of the ID... this'll save a another ton of SQL calls.
2013-01-30 07:59:03 +06:00
Shannon Deminick 2d87f933d5 Updates Document's Published property to return true if the document is 100% published (viewable on the front-end)
Reverts Document's HasPublishedVersion() to return true if the document has any published version (may or may not be viewable on the front-end)
Updates the Document's new UpdatePublishedOnDescendants to set both the Published and PathPublished fields.
Reverts some stuff in the editContent to use HasPublishedContent() to set the _documentHasPublishedVersion field.
Reverts the BaseContentTree to use the Published property now that it returns the correct value.
Updates the editContent method to use the UpdateDocumentCache overload accepting an object so there's not another N+1 SQL call made.
2013-01-30 07:57:31 +06:00
Shannon Deminick a734a0cff7 Fixes unit tests for Umbraco_Route_User_Defined_Controller_Action 2013-01-30 05:37:32 +06:00
Shannon Deminick d0ace55d03 Fixes: #U4-1593 - Content tree doesn't check for correct publish state. 2013-01-30 05:04:31 +06:00
Shannon Deminick 3fda0308ac Fixes: #U4-1594 - SQL for SqlOptimizedSingle not correct for published state
Fixes: #U4-1596 - new GetPathPublishedDescendants method on Document for optimizations
Fixes: #U4-1595 - Obsoletes HasPublishedVersion() method and ensures lazy loading of Published property,
as well as ensuring that the backing property is set correctly on first load (optmization)
Fixes: #U4-1597 - PathPublished property should be set in an optimized way and/or lazy loaded if it cannot be
2013-01-30 04:56:28 +06:00
Shannon Deminick d796b2afc1 Fixes: #U4-1170 - template with hyphen or dash 2013-01-29 21:19:16 +06:00
Shannon Deminick f95cfc2ee0 Changes v4.x config transforms 2013-01-29 21:18:17 +06:00
Shannon Deminick c5d1439422 Fixes: #U4-1458 - due to a null check on PublishedContentRequest on UmbracoContext 2013-01-29 08:35:09 +06:00
Shannon Deminick 5e9f4559b6 Fixes: #U4-1536 2013-01-29 07:49:14 +06:00
Shannon Deminick 4bbb0441a6 Merge 2013-01-29 05:50:50 +06:00
Shannon Deminick 4cf1d7d9a4 Fixes: #U4-1577 - HasPublishedVersion checks for trashed 2013-01-29 05:48:18 +06:00
Shannon Deminick a6a3ddca75 Fixes: #U4-1580 - m_SQLOptimizedMany includes the 'trashed' flag which can be used by business logic. 2013-01-29 05:37:14 +06:00
Shannon Deminick 27cfa85d3a Fixes: #U4-1579 - moving a node doesn't update the descendants of that node's level or path. 2013-01-29 04:39:44 +06:00
Shannon Deminick a9e1e7b634 Updating: #U4-1491 - Updated HasPublishedVersion() to ensure it checks for 'newest' 2013-01-29 03:42:58 +06:00
leekelleher 9f5f920c81 MNTP: Corrected a typo in the example XPath (additional apostrophe) 2013-01-28 17:18:20 +00:00
Shannon Deminick f9a0d91299 Fixes: #U4-1527 - Creates a public property on UmbracoHelper to return the currently assigned IPublishedContent of the UmbracoHelper. 2013-01-25 06:04:10 +03:00
Shannon Deminick 82c2560822 Ensures all resolvers are sealed. Changes CacheRefreshersResolver, DataTypesResolver, MacroFieldEditorsResolver, PackageActionsResolver, ActionsResolver
to all be lazy resolvers as they are not needed instantly on app startup (not needed by the front-end) This will
make app startup a lot quicker. Fixes ActionsResolver to not use the PluginManager to resolve the types when it
is instantiating them since these are passed in the ctor. Updates all unit tests to use lazy delegate for these resolvers
and they are all passing.
2013-01-23 18:40:40 +03:00
Shannon Deminick f467b8cb6c Adds more functionality for LazyManyObjectsResolverBase - adding type list delegates for lazy resolution. 2013-01-23 17:39:07 +03:00
Shannon Deminick aea1a03453 Updates ManyObjectsResolverBase to properly check for resolution freezing and fixes a few issues found regarding
inheritance in complex situations like the new LazyManyObjectsResolverBase.
Creates the new LazyManyObjectsResolverBase to lazily resolve types in order to create them. This is for
work item : #U4-1522
Adds unit test to support.
2013-01-23 07:45:00 +03:00
Shannon Deminick 1568e5f19c updated comments. 2013-01-23 01:44:01 +03:00
Shannon Deminick 8dff47db78 Merge 2013-01-23 01:39:45 +03:00
Shannon Deminick 987e48733a Merge 2013-01-23 01:39:25 +03:00
pcw@pcw-PC.shout.local ac5142443a Fixed EncryptWithMachineKey to handle values longer than FormsAuthentication.Encrypt max length limit
http://issues.umbraco.org/issue/U4-1455
2013-01-15 20:40:28 +00:00
pcw@pcw-PC.shout.local 44360d83aa Fixed EncryptWithMachineKey to handle values longer than FormsAuthentication.Encrypt max length limit
http://issues.umbraco.org/issue/U4-1455
2013-01-15 20:20:05 +00:00
pcw@pcw-PC.shout.local 021cb817d4 Fixed EncryptWithMachineKey to handle values longer than FormsAuthentication.Encrypt max length limit
http://issues.umbraco.org/issue/U4-1455
2013-01-15 20:17:12 +00:00
pcw@pcw-PC.shout.local f4f91fba78 Fixed EncryptWithMachineKey to handle values longer than FormsAuthentication.Encrypt max length limit
http://issues.umbraco.org/issue/U4-1455
2013-01-15 20:09:29 +00:00
pcw@pcw-PC.shout.local dec5e8ad6c Fixed EncryptWithMachineKey to handle values longer than FormsAuthentication.Encrypt max length limit
http://issues.umbraco.org/issue/U4-1455
2013-01-15 20:07:07 +00:00
Sebastiaan Janssen a6b2196c10 Make sure the filename gets set correctly if we're building the release locally 2013-01-15 16:18:24 -01:00
Max Rotvel 4321c8d24e Fix part of U4-1355 by making umbracoembed translatable and supply da lang files 2013-01-15 14:33:25 -01:00
NielsHartvig@UMBRACORATI.localdomain 4cff3a3c28 Fixed U4-1439 4.11.2 DataEditorSetting not working for UserControl wrapper. 2013-01-15 13:18:37 -01:00
Shannon Deminick 5458c9a310 Adds Encryption/Decryption string extension methods that work in medium trust, with unit tests. 2013-01-15 01:35:10 +03:00
Shannon Deminick 0045ec353f Apply patch for #U4-1156 - IFileSystem public changes. 2013-01-15 01:27:44 +03:00
Shannon Deminick 716d3e95f1 Imported patches from 6.0 for #U4-1453, #U4-1454 2013-01-15 00:58:11 +03:00
Shannon Deminick beeb28f390 Fixes #U4-1467 2013-01-15 00:23:40 +03:00
Sebastiaan Janssen 080e8816a5 Remove non-existing files from project.. 2013-01-14 17:01:32 -01:00
Sebastiaan Janssen f7eb323bd5 Updated razor templates 2013-01-14 14:04:33 -01:00
Sebastiaan Janssen 0f484fdf49 Improve build so that you can't forget to set the version number, the version in
GlobalSettings.cs will be updated with the version configured in build.bat
2013-01-14 10:55:59 -01:00
Sebastiaan Janssen d779422bf4 U4-1457 Missing File for "English (US)" Language Option 2013-01-14 09:08:23 -01:00
Stephan 11ea698969 U4-1017 - more explicit error message on internal cache errors 2013-01-12 10:40:42 -01:00
Shannon Deminick 0e0e6b5c41 Fixes: #U4-1451 2013-01-13 23:24:02 +03:00
Sebastiaan Janssen 4c218621c6 Fixes: #U4-1405 - Added DynamicXmlConverter's 2013-01-14 08:57:49 -01:00
Sebastiaan Janssen c150a91e50 Update uGoLive & Fixes U4-1447 uGolive result: Unable to find node
/configuration/system.web/compilation/@debug in config file web.config
2013-01-14 08:43:50 -01:00
Sebastiaan Janssen 7be9a0a987 Update version to 4.11.4 2013-01-14 08:42:54 -01:00
Sebastiaan Janssen 50589c0911 Removed tag Release-4.11.3.1 2013-01-12 17:30:08 -01:00
Sebastiaan Janssen e61ae618e8 Added tag Release-4.11.3.1 for changeset e4d0c7e74055 2013-01-12 17:30:05 -01:00
Sebastiaan Janssen 930e6a0989 Forgot some parenthesis .. 2013-01-12 17:29:48 -01:00
Sebastiaan Janssen 7c50b32684 Merge with 4.11.3 2013-01-12 17:06:10 -01:00
Sebastiaan Janssen 0f7daf7ebd Closing branch 4.11.3 2013-01-12 17:05:45 -01:00
Sebastiaan Janssen 12cbc2a9c5 Added tag Release-4.11.3 for changeset baa44b79cf90 2013-01-12 17:04:25 -01:00
Sebastiaan Janssen 959d263619 Update the build files to build more automatically (like v6) 2013-01-12 17:02:52 -01:00
Sebastiaan Janssen 6a1fb52b25 Fixes U4-1442 This must be a bug. 4.11.2.2 can't create Macro. 2013-01-12 14:41:21 -01:00
Sebastiaan Janssen 18cd043421 Open branch for 4.11.3 and updated version number 2013-01-12 14:24:27 -01:00
Sebastiaan Janssen ddb2f82aba Added tag Release-4.11.2.2 for changeset 54cde33b809d 2013-01-11 12:31:27 -01:00
Sebastiaan Janssen 6c99e7951f Forgot to update the version for 4.11.2.1 - oops.. Updating again! 2013-01-11 12:25:23 -01:00
Sebastiaan Janssen e44e745761 Merge with 4.11.2 2013-01-11 09:35:46 -01:00
Sebastiaan Janssen 30c11439e4 Re-closing branch 4.11.2 2013-01-11 09:34:55 -01:00
Sebastiaan Janssen 0883f621f6 Update NuGet and making automation better for the dummy files 2013-01-11 09:24:47 -01:00
Sebastiaan Janssen 2d0784d1e5 Added tag Release-4.11.2.1 for changeset 77db220b89e1 2013-01-11 08:31:58 -01:00
Sebastiaan Janssen af0011f32a Fixes U4-1432 4.11.2 - Tinymce strips 'src' attribute from images 2013-01-11 08:23:31 -01:00
Sebastiaan Janssen ab6c5ac21a Added tag Release-4.11.2 for changeset 73711b806a40 2013-01-10 11:05:52 -01:00
Sebastiaan Janssen 227a38fb98 Removed tag 4.11.2 2013-01-10 11:05:43 -01:00
Sebastiaan Janssen 06f9dee649 Added tag 4.11.2 for changeset 73711b806a40 2013-01-10 11:05:34 -01:00
Sebastiaan Janssen 75680192bb Merge 4.11.2 into default 2013-01-10 11:05:13 -01:00
Sebastiaan Janssen a53efb394f Closing 4.11.2 branch 2013-01-10 10:54:56 -01:00
Sebastiaan Janssen 98ed32c8cf Include the new translation files in the project so they get in the build too 2013-01-10 09:55:35 -01:00
Sebastiaan Janssen df10ebebca Get latest translations in 2013-01-10 08:21:27 -01:00
Sebastiaan Janssen 88dc73cd66 Fix the unpublished/pendinchanges/published display 2013-01-10 07:29:04 -01:00
Sebastiaan Janssen cd0919aeeb Update version to 4.11.2 2013-01-09 16:03:56 -01:00
Sebastiaan Janssen ce6711b587 Duplicate fix (ce2f47c11322) #U4-1366 - conflict with partial view macro engine. 2013-01-09 13:58:55 -01:00
Stephan 6cb3fcf9ad U4-1411 - fix post-4.9 regression in NotFoundHandler url 2013-01-08 16:41:31 -01:00
Sebastiaan Janssen e5878554bd Fixes U4-1482 Regression - RTE unable to edit hyperlink on image 2013-01-21 14:21:29 -01:00
Sebastiaan Janssen 44c8c4b5b8 Revert 024896ba7bcf as it's a breaking change 2013-01-18 08:47:38 -01:00
Shannon Deminick c0b5525dd7 Removed 'Boot' method from WebBootManager as it was never supposed to be there in the first place.
Removed test code from 'SurfaceController'.
Added comments to IApplicationEventHandler.
2013-01-18 02:31:51 +03:00
Sebastiaan Janssen 36f8a8e1dd Fixed U4-1492 Insert image in RTE gives null reference error 2013-01-17 14:17:04 -01:00
Sebastiaan Janssen 16f73b56ab Weird failing test for getting the date of a file, works only 10% of the time.. 2013-01-17 09:53:47 -01:00
Sebastiaan Janssen 47dc2e6214 Merge 2013-01-17 09:18:12 -01:00
Sebastiaan Janssen c6483f0380 Revert e4bb9041cf54 as it was a breaking change 2013-01-17 09:16:45 -01:00
NielsHartvig@UMBRACORATI.localdomain 168b38b2a3 Update to U4-1485 for 4.11.4 2013-01-17 08:47:42 -01:00
NielsHartvig@UMBRACORATI.localdomain 70ca4ac913 Fixes U4-1485 Booting.aspx has potential Open Redirect flaw 2013-01-17 08:38:09 -01:00
Sebastiaan Janssen 72099192b5 My bad, teamcity wasn't building the test project before running tests :) 2013-01-16 17:01:00 -01:00
Sebastiaan Janssen ea48128869 The nunit console runner is being such a tease, ignoring the [Ignore] attribute 2013-01-16 16:44:50 -01:00
Sebastiaan Janssen f0b22146c8 Ignore tests that have been failing for AGES 2013-01-16 16:31:15 -01:00
Sebastiaan Janssen fe0d94687a Use the original workaround for now 2013-01-16 16:25:54 -01:00
Sebastiaan Janssen 238c3d38e8 Un-ignore .exe files 2013-01-16 15:37:31 -01:00
Sebastiaan Janssen 6af4f1f2c6 Corrected the path for the tools folder 2013-01-16 15:21:43 -01:00
Sebastiaan Janssen e215fb056f Work around for TeamCity NUnit test runner see:
http://umbraco.com/follow-us/blog-archive/2013/1/16/make-teamcity-respect-failing-nunit-tests-and-stop-the-build.aspx
2013-01-16 15:19:45 -01:00
Sebastiaan Janssen e6178efcfb Duplicating fix for U4-483 so that this also fixes U4-1391 in the 4.11.x branch 2013-01-07 08:12:53 -01:00
Sebastiaan Janssen 30cf0e2040 Add some logging to PhysicalFileSystem 2012-12-26 06:49:54 -01:00
Sebastiaan Janssen 48d620cdb0 Cleanup RTE ImageHelper a little bit, still bad code but more readable now 2012-12-26 06:27:30 -01:00
Sebastiaan Janssen 3bd487d092 Fixed #U4-1323 Stripping umbraco path out of source is not needed any more 2012-12-26 05:54:34 -01:00
Sebastiaan Janssen 6c8c37256b Cleanup media uploader in RTE a little 2012-12-26 05:50:48 -01:00
Sebastiaan Janssen 37b1fcbaf0 Fix image uploader in RTE, when used in VDir it returns the right path now
no need for relative path hacks
2012-12-26 05:49:03 -01:00
Sebastiaan Janssen dc111768e3 Slight MediaFactory refactors, mostly to fix issue U4-1344 where files wouldn't
upload if the "magic" umbraco props don't exist (witdth, height, bytes)
2012-12-23 11:46:04 -01:00
leekelleher 6589d5d5d3 MNTP: Fixed an long-time CSS bug. Aligned the header with the right-panel. 2012-12-21 15:58:02 +00:00
Sebastiaan Janssen e6975a71d5 Additional fix for U4-1312 Cant publish child node, because parent not published
When you unpublish a node which it's descendants also get unpublished, but as
soon as you publish the parent node again, they don't end up in the XML cache
any more, leading to this error again. Now putting all previously published
documents back into the XML cache when the parent gets published
2012-12-20 14:05:28 -01:00
Sebastiaan Janssen 33b497e5f4 Additional fix for U4-1341 - nodes should appear dimmed when unpublished, but
they appeared as changed (and not dimmed, therefore looked published)
2012-12-20 13:42:30 -01:00
Sebastiaan Janssen c5e7c81c19 Notification and tree refresh when unpublishing content 2012-12-20 09:25:50 -01:00
Sebastiaan Janssen 47d1fe7082 Fixed U4-703 - Updating or re-installing package causes duplicate trees 2012-12-19 09:05:23 -01:00
Sebastiaan Janssen 735bd574ff Didn't mean to commit test code, sorry! 2012-12-17 12:29:43 -01:00
Sebastiaan Janssen 5c0d9785e0 Don't check log comment length if it is null.. helped with a broken recycle bin
not deleting content because sometimes the title of the content would be null
2012-12-17 09:25:55 -01:00
Sebastiaan Janssen db14868324 attributes["macroalias"] would YSOD instead of give back a null 2012-12-14 13:51:01 -01:00
Stephan 06952833ef U4-1212, U4-1312 - fix Document.PathPublished 2012-12-13 15:48:46 -01:00
Shannon Deminick 2a90e93a6f Updated partial view macro engine to support storing the files in the App_Plugins/[packagename]/Views/MacroPartials
so they can be stored with a package and not pollute the main file system.
2012-12-07 07:04:11 +05:00
Shannon Deminick 0d94ddb96e Got macro parameters working with Partial View Macros, changed PartialViewMacroPage to inherit from
UmbracoViewPage<PartialViewMacroModel> so that UmbracoHelper, etc... are available.
2012-12-07 06:31:53 +05:00
Shannon Deminick c7645b55ba Partial View Macros now being rendered, now to implement the remaining parts with things like
parameters, etc...
2012-12-04 22:06:55 +05:00
Shannon Deminick 208806c027 Updated more partial view macro engine and its rendering... nearly there. 2012-12-04 11:31:03 +05:00
Shannon Deminick 8024610364 Fixes up some logging API issues. Fixed up tracing in the macro class. Added support for Partial View macro rendering in the macro class. 2012-12-04 11:08:02 +05:00
Shannon Deminick 8e4644568b Updated loghelper to be able to Warn and also trace Warn with an exception. Updated the macro control to check for the
Partial View Macro, added Partial View macro to the enum.
2012-12-04 05:58:24 +05:00
Shannon Deminick e0a71830fa Updated macro editor to support Partial view macros. Improves the JS in the editor (no more c# based js) which auto clears
other fields and drop downs when other files are selected.
2012-12-04 05:42:15 +05:00
Shannon Deminick 5b0057c258 Added missing files. 2012-12-04 03:29:02 +05:00
Shannon Deminick fb61c55fa7 Started on PartialViewMacros 2012-12-04 03:26:04 +05:00
Stephan a70ef52964 fix xpath syntax error with legacy XML schema 2012-11-30 13:33:24 -01:00
Stephan 51204ee401 U4-1212 - bugfix Document.PathPublished 2012-12-11 17:37:33 -01:00
Sebastiaan Janssen 657f165ffb Created branch 4.11.2 2012-12-17 12:22:11 -01:00
Casey Neehouse 3bd98d851a Reverting the config files that inadvertently got committed. 2012-11-29 21:42:37 +05:00
Casey Neehouse 9eea46b19b Modification of UserControl usage to allow for Virtual Path to be used correctly. 2012-11-29 21:27:42 +05:00
Sebastiaan Janssen 76fb5d260f Moved tag Release-4.11.1 to changeset 6eb5f2fb5a88 (from changeset 7f827760cb49) 2012-11-28 13:35:30 -01:00
Sebastiaan Janssen 267cd46ea0 Another additional fix to make the reloading of trees work after package install 2012-11-28 13:34:35 -01:00
Sebastiaan Janssen 96f6a0161f Merge with 4.11.1 2012-11-28 13:08:13 -01:00
Sebastiaan Janssen 7bc53adc67 Closing 4.11.1 branch 2012-11-28 13:06:01 -01:00
Sebastiaan Janssen 8ecff73c18 Added tag Release-4.11.1 for changeset 7f827760cb49 2012-11-28 13:05:21 -01:00
Stephan 35e65ad18c add support for "/foo" hostnames ONLY for backward compat.
fix invalid hostname message
2012-11-28 12:43:19 -01:00
Sebastiaan Janssen 8def8eaa86 Bumping the version to 4.11.1 2012-11-28 09:44:03 -01:00
Sebastiaan Janssen c0774ad9b9 Merge 2012-11-28 09:24:54 -01:00
Sebastiaan Janssen f306cbe457 Move invalidDomain entry to the correct area. 2012-11-28 09:24:40 -01:00
Sebastiaan Janssen 577b989c4c Aha, string needs to start all the way to the left to appear nicely in the editor 2012-11-28 08:41:54 -01:00
Sebastiaan Janssen e6b162f4f6 Add translation for invalid hostname 2012-11-28 08:37:08 -01:00
Stephan b40cc1879f missing entry in language file 2012-11-28 07:36:08 -01:00
Shannon Deminick 8a7c7bf77d Merge 2012-11-27 21:47:20 +05:00
Shannon Deminick 38a1179de5 applied patch from rev 189f37a1dd63 which reverts the last minute changes before 4.11
release, namely changes to the ApplicationTreeRegistrar, TreeDefinitionCollection, theend installer step.
2012-11-27 21:45:57 +05:00
Sebastiaan Janssen f263b4d92b Fixes U4-1162 - In MVC mode, creating a child template doesn't set the layout
correctly (it's missing the .cshtml extension)
2012-11-27 15:36:54 -01:00
Sebastiaan Janssen c612727116 Add translations that got lost in merge, fixes U4-1254 2012-11-27 14:07:13 -01:00
Sebastiaan Janssen ab9c9df7d6 Reverting last minute hacks around the pluginmanager and adding Shannon's fixes
from changeset 85f9e5879e60
2012-11-27 13:27:33 -01:00
Stephan c607e50433 U4-1245, U4-1186... fix the mess I created with hostnames 2012-11-27 12:43:57 -01:00
Stephan df5555bdf1 Opened branch 4.11.1 2012-11-27 12:40:42 -01:00
Sebastiaan Janssen 9506339e6f Merge with 4.11.0 2012-11-23 13:37:17 -01:00
Sebastiaan Janssen 68605a7560 Closed branch 4.11.0 2012-11-23 13:36:14 -01:00
Sebastiaan Janssen 839dd7315a Added tag Release-4.11.0 for changeset 20e4dff821d8 2012-11-23 13:33:15 -01:00
Sebastiaan Janssen f1314628d7 One last hack to get the the macroengines to show up after install. 2012-11-23 12:01:43 -01:00
Sebastiaan Janssen e23ed30b0c Took out the temporary tree fixes and put another temp fix in (reverts to the 4.10.x code)
Also removed dependency on ClientDependency.Mvc for now to make upgrades easier (no requirement to do assembly redirects in web.config)
2012-11-23 11:45:51 -01:00
PerPloug 55cb46927e Changes to template and masterpages helper 2012-11-23 09:37:35 -01:00
Sebastiaan Janssen 654c3b7403 Another temporary fix for trees being unavailable after install, the context is null during upgrades in the installer, so would cause a YSOD 2012-11-23 08:02:23 -01:00
Sebastiaan Janssen 4195754b0c Pull in new translations before release 2012-11-23 07:36:58 -01:00
Sebastiaan Janssen 96a6f17bd7 Update for the WebPI build, should now automatically be good
Fixes U4-132
2012-11-22 16:06:06 -01:00
Sebastiaan Janssen 61d99c4061 Of course we also need the assembly redirect for MVC2 -> 3 in the template config to start with (so the build.bat picks it up as well) 2012-11-22 15:45:14 -01:00
Sebastiaan Janssen 0a6e91a2f9 Fixed U4-1235 Changing document type alias YSOD's on SQL CE 2012-11-22 15:04:27 -01:00
jeavonleopold cf9e786e45 U4-1241 Fix - BaseTreePicker GetItemBreadcrumbs causes YSOD for Property Editors that do not store numeric ID's 2012-11-22 15:17:12 +00:00
Sebastiaan Janssen ba1d3fd3e6 Fix Library.Search not giving back an list of DynamicNodes any more, breaking accessibility to custom properties 2012-11-22 13:23:20 -01:00
Sebastiaan Janssen ac01fd48fa Some refactoring of the Umbraco:image implementation after code review 2012-11-22 12:30:58 -01:00
Sebastiaan Janssen f53fb694be Tightened up and renamed the ReadPublished method (relating to pull request for U4-606) 2012-11-22 09:53:11 -01:00
Sebastiaan Janssen 1ecd8fa87d Temporary fix for trees being unavailable after install 2012-11-22 09:34:05 -01:00
Sebastiaan Janssen ce1c9d697b Add assemblyredirect for System.Web.Mvc because ClientDependency.Core.Mvc relies on Mvc v2 while we're using 3. 2012-11-22 09:30:07 -01:00
Sebastiaan Janssen c67a76fb03 json2.js was not included in VS, so not in the build 2012-11-22 08:06:39 -01:00
Shannon Deminick 3d72a4497c Merge 2012-11-22 02:56:53 +05:00
Sebastiaan Janssen 30cc8e0861 Merge 2012-11-21 11:05:38 -01:00
Sebastiaan Janssen 30ca3f6df9 Bump the version to 4.11.0 2012-11-21 11:05:30 -01:00
Stephan cccfed6efe U4-1222 - improve alternate template consistency 2012-11-21 10:12:04 -01:00
Sebastiaan Janssen 82c148e997 Fixed U4-596 with thanks to firepol! 2012-11-21 09:50:47 -01:00
Sebastiaan Janssen c50a3e7a27 I broke the build, oh noes! Sorry. :-) 2012-11-21 09:46:04 -01:00
callicj@M2UA1450WRW.us.maritz.net 811cbe2339 Added new method to the Document Service named readPublished() which returns the published version of the document.
Added new method to the Document class named GetPublishedVersion() which returns the published version of the document.
2012-11-21 08:03:53 -01:00
ksykora@ksykora-Win7 a8bf881ae1 * Fixed an umbraco bug where the macro editor, if it tried to enumerate over a
property whose value was null, would throw a null reference exception instead
 of just ignoring the property.
2012-11-21 07:53:29 -01:00
ksykora@ksykora-Win7 c446be734c Moved ParseMacros from Init into Load in ItemRenderer to fix an issue where the
NodeId property on the Item control was being set after the ItemRenderer had
already loaded it into memory.
2012-11-21 07:54:17 -01:00
Morten Bock f0f7f6af55 Include some missing files 2012-11-21 07:23:15 -01:00
Shannon Deminick 19bd8ae193 Fixes overloads for TypedMedia, TypedContent, Content, Media calls on UmbracoHelper now that
GetPropertyValue returns 'object'
2012-11-21 09:09:37 +05:00
Shannon Deminick 81d8f74e0d Small update to hashcodecombiner and pluginmanager 2012-11-21 08:39:10 +05:00
Shannon Deminick 0011d568c6 Fixes up HashCodeCombiner with correct long field intead of int with correct initialization.
Adds App_Code and global.asax to be monitored for changes to create the hash code.
2012-11-21 08:28:11 +05:00
Shannon Deminick 159718bf4f Updated sln to use Nuget for ClientDependency references, ensures that all config changes
are backward compatible. Have updated the new ClientDependency.config file with the new
features, though these are not required for existing installs but we should advise to merge
the new changes in.
Added ClientDependency.Core.Mvc to the UI project so that it will now ship with this library.
2012-11-21 08:01:23 +05:00
Shannon Deminick b9ff3ca729 updated proj references, was getting warnings in build that they could not be referenced. Might be a VS 2012 thing. 2012-11-20 07:41:12 +05:00
Shannon Deminick 4f3ac36d7f Merge 2012-11-19 19:57:23 +05:00
Shannon Deminick a9257ad366 Fixes #U4-1213, much better support for ignoring routes in route table. Fixes issue with LogHelper. Adds unit tests
for ignoring routes.
2012-11-19 19:56:52 +05:00
Sebastiaan Janssen 2218459877 Correcting the path for the targets file, should work now even if there are spaces in the path 2012-11-19 08:59:23 -01:00
Sebastiaan Janssen 8f5e2946d6 Merge 2012-11-19 08:10:16 -01:00
Sebastiaan Janssen 19c3b251a0 Include the VS targets file so that the build server can find it as well 2012-11-19 08:09:43 -01:00
Shannon Deminick ce4c855f00 Fixes up the resulting casts when invoking extension methods dynamically in our dynamic objects. 2012-11-19 05:47:34 +05:00
Shannon Deminick 48c45447e4 Fixes: #U4-1207, Enhancements to DynamicXml (legacy and new), now implements proper IEnumerable<T> interfaces.
Added DynamicInstanceHelper for any dynamic object that should find matches on methods, properties and
extension methods. Fixed ExtensionMethodFinder to find the Enumerable extensions (was previously set to IEnumerable which would
find nothing).
2012-11-18 10:28:53 +05:00
Shannon Deminick 4683144987 Changed CacheHelper to be public so it can be exposed publicly by the app context. 2012-11-18 03:34:31 +05:00
Shannon Deminick 238a237cb5 Merge 2012-11-18 03:31:15 +05:00
Shannon Deminick cde1ca9f83 updated some logging on content class. 2012-11-18 03:31:02 +05:00
Shannon Deminick 93e2d8d822 added missing file for tests. 2012-11-18 02:49:55 +05:00
Stephan 8609389bdb U4-1198 - publish dialog does not detect that a parent is not published 2012-11-17 14:55:58 -01:00
Stephan 48f985b70a U4-1212 - can publish grand-child of unpublished node
fixed by introducing Document PathPublished property
2012-11-17 14:37:41 -01:00
Stephan b02afb3af8 u4-1186 - Manage hostnames UI bug with validators 2012-11-17 13:45:53 -01:00
Stephan b9d814c3fb (michielvoo pull request) Consitent new lines in templates 2012-11-17 13:28:38 -01:00
Stephan 1b54ce1d48 U4-1210 - ysod on rollback 2012-11-17 12:29:05 -01:00
Stephan e3efc0d19b U4-1194 - Mvc templates do not work when running in a virtual directory 2012-11-16 15:52:14 -01:00
Sebastiaan Janssen 3ba9e09164 Update obsolete messages to point to the correct classes (instead of being misleading) :-) 2012-11-16 14:41:30 -01:00
NielsHartvig@UMBRACORATI.localdomain d148c10c66 Update to sanitizer 2012-11-16 14:24:24 -01:00
NielsHartvig@UMBRACORATI.localdomain 2b573b9070 The BOSS is fixing U4-367 2012-11-16 14:08:28 -01:00
Shannon Deminick 4cb03ab36c Fixes issue with ChildActions when inherting from UmbracoViewPage<T> and using the @Umbraco helper. 2012-11-16 10:08:12 +05:00
Shannon Deminick 3ebbcc77e9 Merge 2012-11-16 00:45:29 +05:00
Shannon Deminick 8be97295dc Added new method to RenderMvcController for easier return of the current template when hijacking routes.
Added better error checking for media handling in MVC.
2012-11-16 00:38:03 +05:00
Shannon Deminick 3dd411f159 Working on #U4-1174, lots of updates/fixes to media in MVC regarding loading data from the examine cache to return media + lots of unit tests. 2012-11-15 21:46:54 +05:00
Shannon Deminick 8b141dc51a Working on #U4-1174, lots of updates/fixes to media in MVC + unit tests. 2012-11-15 20:11:10 +05:00
Stephan 278aa3f820 U4-1203 - UmbracoHelper.RenderMacro displays trace output at the wrong place 2012-11-15 13:41:44 -01:00
Shannon Deminick a7a38478db Working on #U4-1174 - issue with TypedMedia in MVC, fixes a few things and ensures Children() works
as expected, adds unit tests.
2012-11-15 04:18:23 +05:00
Shannon Deminick b2e004b825 renamed namespace in test proj 2012-11-15 02:04:46 +05:00
Shannon Deminick 10df6e878c updated config 2012-11-14 22:05:58 +05:00
Shannon Deminick eac11c1b80 cleaned up some of the install auth attribute 2012-11-14 21:22:30 +05:00
Shannon Deminick 0ad5da67ea Merge with 4.10.1 2012-11-14 21:18:34 +05:00
Shannon Deminick 3fb9ffca5b Update for installer rest service, updates version 2012-11-14 19:50:39 +05:00
Stephan 8e7fe5ee55 fix f3a3bdaf6329 2012-11-14 06:40:09 -01:00
Shannon Deminick 9554c6a1c6 Fixes #U4-1174 - allows MVC views to render when using RenderTemplate. Added new UmbracoHelper method RenderTemplate. Cleaned up some code and
ensuring that the string writers are disposed. Moved TemplateRenderer to a better namespace.
2012-11-14 10:47:40 +05:00
Shannon Deminick 8597876c92 Fixed up the library calls to RenderTemplate, no longer a ton of duplicated code and removed
the requirement to build up query strings as this is completley not required since we use 'preserveForm'
in the Server.Execute.
2012-11-14 09:31:20 +05:00
Shannon Deminick 3df7d81bde Fixed up the webforms url gen 2012-11-14 09:19:39 +05:00
Shannon Deminick f82ae4fdda Fixes: #U4-1174, this now works for all webforms related templates, however RenderTemplate will currently not work for
MVC templates... this will come soon. If you try to it will just throw a NotImplementedException.
2012-11-14 09:13:53 +05:00
Shannon Deminick 4a981225b3 Merge 2012-11-14 03:52:34 +05:00
Shannon Deminick 0cd115c268 Fixees: #U4-1166, automatically adds parsable routes in the route table to the reserved paths
so you don't have to explicitly add reserved paths to Umbraco config that you are creating routes for.
2012-11-14 03:32:50 +05:00
Sebastiaan Janssen 291b0582e4 Merge 2012-11-12 07:41:40 -01:00
Sebastiaan Janssen f4e48872a2 Imported pull request by Michiel van Oosterhout (consistent line endings)
Removed some commented out code
Pull: http://umbraco.codeplex.com/SourceControl/network/forks/michielvoo/UmbracoU4451/contribution/3482
2012-11-12 07:40:58 -01:00
Shannon Deminick 9e320700e2 Fixes: #U4-1178, adds another strongly typed overload to GetPropertyValue<T> and adds more unit tests. 2012-11-12 10:50:23 +05:00
Shannon Deminick 7f0ff70ca9 Fixes: #U4-1132, this is a bit of a hack fix because the Media should include creatorName/id but it doesn't. 2012-11-12 09:20:54 +05:00
Shannon Deminick 65e3b7f951 Merge 2012-11-12 08:24:36 +05:00
Shannon Deminick 156f145c69 Updated the build manager to find instances based on persisted cache of previous lookups but uses BuildManager to do so, after
some benchmark unit tests against loading a type from an assembly this is about 100% faster. Updated the UmbracoModule to write more diagnostics
for benchmark debugging. Have basically reduced the startup time to approx 50% of what it used to be based on the current
benchmarks run. Previously app startup on my machine was about 5 seconds, now after the first startup it is about 2.5 seconds.
2012-11-12 08:10:12 +05:00
clausjensen a0c941dac2 Fixes U4-1092 - TinyMce breaks script tags by double wrapping in CDATA on save 2012-11-11 09:50:42 -01:00
Bitmapped 33eb9d40f3 Catches exception thrown by native ActiveDirectoryMembershipProvider when there
is no current user.
Fixes U4-709
2012-11-11 09:40:48 -01:00
Sebastiaan Janssen cf8186653c Merge 2012-11-11 09:19:02 -01:00
Sebastiaan Janssen 75403d3b94 Fix by Tom Witherington - U4-1167 tags not saving or deleting in Tags data type
Also cleaned up the usage of obsolete method calls
2012-11-11 09:17:20 -01:00
Shannon Deminick 083bab0528 Added HashCodeCombiner and unit tests to support. Added ability to create a hashed file based on scanned assemblies in the
PluginManager and added a cached plugin xml file to the PluginManager. Now we don't actually scan any assemblies on app startup
during plugin finding if none of the DLLs have changed. Added trace statements to the UmbracoModule for better benchmarking for
how long a full request takes to load from start to finish.
2012-11-11 09:09:06 +05:00
leekelleher ee3e3787a8 PropertyEditorConverters - reusing TryConvertTo<T>, removing duplicate code. 2012-11-10 21:41:40 +00:00
leekelleher a3895ab149 Added unit tests for PropertyEditorValueConverters. 2012-11-10 21:40:37 +00:00
Matt@MBP13-PC c590c6a265 Fixes issue #U4-1169 wherby Umbraco.Field always runs in the context of the current page regardless of whether a custom IPublishedContent is passed in 2012-11-10 16:40:00 +00:00
leekelleher 6c1bf4b85f Added unit test for ObjectExtensions TryConvertTo<DateTime>.
Modified CustomBooleanTypeConverter to accept an empty string as a FALSE.
2012-11-10 14:09:27 +00:00
Sebastiaan Janssen 3632d6b0c6 Opened branch 4.11.0 2012-11-08 15:31:41 -01:00
Sebastiaan Janssen bf95792524 Merge with 4.10.0 2012-11-08 15:00:52 -01:00
Sebastiaan Janssen 885b421201 Closed branch 4.10.0 2012-11-08 14:48:26 -01:00
Sebastiaan Janssen b11143e2c4 Added tag Release-4.10.0 for changeset f6da531fbb4c 2012-11-08 14:46:56 -01:00
Sebastiaan Janssen 00a625fb7f Recursion was wrong on this one.
Fixed #U4-1147
2012-11-08 12:41:18 -01:00
jeavonleopold e9ae11ff2b U4-366 - AllowThousands for Integer property editor 2012-11-08 09:28:41 +00:00
Sebastiaan Janssen bd4e6eaa62 Merge 2012-11-08 11:30:10 -01:00
Sebastiaan Janssen b2e4489e66 Umbraco.Web.UI is now the first project in the solution file, so you won't have
to manually do "Set as startup project"
2012-11-08 11:22:28 -01:00
Sebastiaan Janssen d27e32e918 Medium Trust on by default in debug web.configs
Don't overwrite root web.config on each build if already exists
Should make F5-debug a lot easier
2012-11-08 11:17:21 -01:00
pgregorynz 3a6dae9d0d Merge 2012-11-08 01:06:59 -10:00
sitereactor 9f95c48242 Updating swedish language file. 2012-11-08 08:26:24 -01:00
Sebastiaan Janssen e2934bb036 Merge 2012-11-08 07:06:07 -01:00
Sebastiaan Janssen 664a0ff4ec Add MVC3 dlls to bin folder so that hosts don't have to have MVC installed
Fixed #U4-1137
2012-11-08 07:05:29 -01:00
sitereactor 715f0ddac1 Updating Chinese language files from github. 2012-11-08 06:56:55 -01:00
pgregorynz 4d5f142a30 fix for ItemRenderer.cs to work with Partials 2012-11-07 21:19:35 -10:00
Shannon Deminick f4dc045561 Removed MediaFileSystemExtensions and just added the methods to the MediaFileSystem which are more discoverable.
Added Code Annotations to all file system classes pointing to the new #U4-1156 tracking item to publicize.
2012-11-08 08:27:38 +05:00
Shannon Deminick ca55372f89 Merge 2012-11-08 08:12:33 +05:00
Shannon Deminick 29c96c2c64 Converted QuickSearch over to use correct codebehind 2012-11-08 08:12:24 +05:00
pgregorynz 1a969d76e1 Revert change to Umbraco Helper as caused issues with the itemRender not being
able to process fallback or formating options.
2012-11-07 15:20:19 -10:00
Shannon Deminick fba31a0a6a Added Code annotations for IPublishedContentStore, etc... as experimental features with links to the
tracker.
2012-11-07 10:16:36 +05:00
Shannon Deminick 5132d66924 Created code annotation attributes and descriptions 2012-11-07 09:55:21 +05:00
Shannon Deminick 36f367f9d6 Added a unit test to confirm any ctor of a custom typed file system 2012-11-07 09:40:33 +05:00
Shannon Deminick 67d9e578f5 Fixes: #U4-919, we will just use real classes for extension methods and all custom file systems like the MediaFileSystem must inherit from
FileSystemWrapper
2012-11-07 09:30:40 +05:00
Shannon Deminick 306f0f9679 Merge 2012-11-07 03:50:32 +05:00
Shannon Deminick b9d53ceac8 Fixes more of U4-1140, ensure that only legacy objects are returned from the dynamic stuff in the razor macros. Adds unit test for it. 2012-11-07 03:49:32 +05:00
Søren Reinke@Windows-7 1bceb746fa Switched to non obsolete method call 2012-11-06 20:32:26 -01:00
Søren Reinke@Windows-7 d390a4c0a9 Made speech bubbles for MediaTypes act the same as for DocumentTypes 2012-11-06 20:24:48 -01:00
Søren Reinke@Windows-7 e4f8b5c586 Deleting a Tab now removes it from the list in the browser 2012-11-06 19:21:41 -01:00
Sebastiaan Janssen 869915f991 Updated to the Medium Trust-safe version of SQL CE SP1
(assembly version 4.0.0.0 instead of 4.0.0.1)
2012-11-07 12:12:57 -01:00
Sebastiaan Janssen 0cb4a9ad9c Fixes issue where upload will fail in medium trust due to use of FileInfo
Related to earrlier fixes for U4-919
2012-11-07 09:28:08 -01:00
Sebastiaan Janssen 8c7dbd7207 Merge 2012-11-06 09:50:28 -01:00
Sebastiaan Janssen 0110cf01f2 Removed unused variable that was causing problems, cleaned up the code a tiny bit
Fixed #U4-1119
2012-11-06 09:49:27 -01:00
Stephan fee1a0dd9e fix broken CreateXPathQuery in legacy requestHandler 2012-11-06 07:09:54 -01:00
Shannon Deminick 315e8b27a0 Migrated loadStarterKitDesigns to use the new codebehind structure. 2012-11-06 09:14:39 +06:00
Shannon Deminick fb0c9c3fbb Changed DynamicXml to public (somehow this wasn't checked in before) #U4-U4-1146
Added unit tests for DynamicXml.Find methods which are passing.
2012-11-06 08:32:21 +06:00
Sebastiaan Janssen 0df1ebb83e Merge 4.9.1 into default 2012-11-01 07:12:47 -01:00
Sebastiaan Janssen 204d7a79aa Closed branch 4.9.1 2012-11-01 07:10:42 -01:00
Sebastiaan Janssen e68629b8bc Added tag Release-4.9.1 for changeset 8d7d8609e2e4 2012-11-01 07:10:31 -01:00
Matt Watson f80fa2f373 Datatype Tags, multiple render when multiple instance on same doctype
Fixed #U4-915
2012-10-31 21:51:17 +00:00
Sebastiaan Janssen 55ac779bf2 Changed the Chines language files to have a zh prefix in the key instead of en.
Now the chinese translation files actually work.
Fixed #U4-1126
2012-11-05 10:07:51 -01:00
Sebastiaan Janssen f8732cd70b Removed the ExportCode dialog as it's not needed any more now that L2U is gone. 2012-11-05 09:19:20 -01:00
pgregorynz ff5c5c8a03 Relates to bud U4-1142 Umbraco helper in wrong context with used in a Partial.
Fix to context of Umbraco helper when used in partials.
2012-11-04 21:24:04 -10:00
Shannon Deminick 7df9921441 Fixes: #U4-1142, Changed ctor for RenderModel so people can actually create one to pass in to their views if they want.
Changed the way that UmbracoTemplatePage works in that if you pass in an IPublishedContent model instead of a RenderModel,
it will be generated for you without a YSOD. Changed the UmbracoHelper ctor so that it can be passed a custom IPublishedContent model
so that it's context is of that model and not the one routed to. Added Umbraco.Web.Mvc to the imported namespaces for Views.
2012-11-05 11:27:28 +06:00
Shannon Deminick 329431e6df Fixes: #U4-1141 - IPropertyEditorValueConverter is not a plugin type and is searched for on app startup. 2012-11-05 06:14:44 +06:00
Shannon Deminick 292ded852e Changed IPropertyEditorValueConverter to public #U4-1141
Changed the /umbraco folder in the UI project to be properly cased according to VS (this is initial, we need to
do this for everything but need to write a script, see https://groups.google.com/forum/?pli=1#!topic/umbraco-dev/_KDTHpPPFM8 )
2012-11-05 06:04:40 +06:00
Shannon Deminick a4a9b26d93 Committed first tests of strongly typed querying with strongly typed document types using what would be generated code and extension methods. 2012-11-04 09:24:24 +06:00
Shannon Deminick e4d4aa935a fixed attempt to initialize it's False property, changed IPublishedStore back to internal... was my mistake to make this public just yet. 2012-11-04 08:56:50 +06:00
Shannon Deminick b337f4e5e4 Fixes issue with installing starter kits in the back office after upgrading the installer to install
the starter kits properly. Not sure if this was actually working before 4.10 but in any case does work again
now and installs them the correct way whilst waiting for the app pool to restart (we need to put this in place
for the normal packages too!). Upgraded the StarterKits.aspx to have the correct code behind structure. Fixes issue
with missing or invalid referenced images.
2012-11-03 07:18:12 +06:00
Shannon Deminick 6f5689004d Fixes: #U4-1113 2012-11-03 05:48:23 +06:00
Sebastiaan Janssen ed5a0be20e Merge with updated language files 2012-11-02 09:32:54 -01:00
Sebastiaan Janssen 4e82d282bf Cleaned up and updated the web.Template.config before release
Also reformatted in hopes to keep the formatting consistent between releases from now on
2012-11-02 09:32:20 -01:00
sitereactor fe003edd02 Adding language files from github localization repo. 2012-11-02 09:23:59 -01:00
Sebastiaan Janssen 17f326dc89 Enable relationtypes tree in release version as well 2012-11-02 08:52:12 -01:00
Stephan 2c38f7ce7f fix BaseRest config management - would throw when missing config files 2012-11-01 16:46:04 -01:00
Sebastiaan Janssen 3ba31cc82c Fixed breaking change: method signature of Template.MakeNew changes when you add
optional params, breaking uSiteBuilder.
2012-11-01 12:51:46 -01:00
jeavonleopold e502ce4ff9 U4-1112 - Add Any() property to DynamicXml 2012-10-31 10:47:04 +00:00
Shannon Deminick 8fff66dcb7 Merge 2012-10-31 20:48:50 +06:00
Shannon Deminick bc47e0c4a6 Fixed the get enumerator method in the legacy DynamicXml so that it still returns the legacy class instead of the new one. 2012-10-31 20:42:06 +06:00
Shannon Deminick 85c110bad5 missing changed file 2012-10-31 11:46:02 +06:00
Shannon Deminick 8866607582 changed milliseconds to seconds 2012-10-31 11:43:14 +06:00
Shannon Deminick 0db6c2cc11 Fixed issue that locally declared SurfaceControllers are routed through 'umbraco' area, this should not have been the case.
Created new CacheHelper which replaces the old Cache class and is accessible via the UmbracoContext.
Added new CachedPartial extension method to be able to cache the output of your partials (also by page and by member)
Added mew CacheHelperApplicationEventListener in order to automatically clear the partials cache when content is published, media or members is saved.
2012-10-31 11:36:22 +06:00
Sebastiaan Janssen 84858bea65 Move the Umbraco.Web.UI project up to the first position in the .sln file so
that when you first clone the project and hit F5 it will actually start the
correct project (and not the class library)
2012-10-30 15:27:59 -01:00
Shannon Deminick c3795d7e5a Added some code comments and did a check for redirects (returns null if this is the case) 2012-10-30 06:49:36 +06:00
Shannon Deminick 36eea348ba changes the fix for U4-1097 to use an InvariantEquals instead of a direct equals just in case! 2012-10-30 06:23:29 +06:00
Stephan be3f95610b U4-1081 - treat missing template at 404 2012-10-29 12:35:39 -01:00
Stephan f9aa4b28af U4-889 - cancelling publish via an event caused a JavaScript error 2012-10-29 07:48:45 -01:00
Stephan 232c2292cb U4-1093 - fail to publish a node w/new content type
the way we added the new content type to the schema just could not work
also, stop reloading the whole XML from DB because the schema changes
2012-10-28 19:35:19 -01:00
Stephan 80dca1e3f2 U4-1089 - non-ascii chars in urls cause 404 2012-10-28 11:58:48 -01:00
Stephan 47b6f7f4d5 fix U4-1087 : preview badge does not show 2012-10-28 10:58:56 -01:00
pgregorynz 03af54b1d5 Merge 2012-10-25 14:21:16 -10:00
Casey Neehouse bbd62f20a9 Corrects a couple minor issue with Directory support when mapped to a
Virtual Directory and network shares.
2012-10-26 04:19:14 +04:00
pgregorynz 9738227189 Making the CTOR for UmbracoHelper public so it can be newed up for other uses 2012-10-25 14:18:53 -10:00
Shannon Deminick 6bf3a7a74a Merge 2012-10-26 03:01:21 +05:00
Shannon Deminick 07f8f79620 Fixes: #U4-1077, found an bug with both our code and Microsoft's code in that if you RemapPath with an incorrect URL which contains
2 '?' the internals of ASP.net actually force a secondary internal request which causes BeginRequest to fire but doesn't follow the normal
chain of the module. It was a bug with our code having two query strings, however its pretty strange behavior on their part!
Have removed UmbracoContext.ClientUrl since it is not necessary to have. Have renamed UmbracoContext.UmbracoUrl = CleanedUmbracoUrl and UmbracoContext.RequextUrl = OriginalRequestUrl
Have moved the route processing logic to a static method on PublishedContentRequest which auto assigns the request back to the UmbracoContext, plus this is a cleaner
way to do the processing, including allowing us to unit test this one aspect.
Lastly, we are now rewriting the path back to the original URL in the RenderRouteHandler so that in MVC controllers the HttpContext.Request actually
reflects the URL that the client requested, not the rewritten URL (we do this in webforms too)
2012-10-26 02:55:57 +05:00
Ismail Mayat f0690ec55f U4-1069 localize file umbraco.web.ui\umbraco 2012-10-25 14:47:00 -01:00
Tom Fulton e4bfccf974 U4-1057: Add localization of 'relate copied items' text 2012-10-25 19:42:16 +04:00
Hendy 51d08a353c U4-1084: media file links now updated after save 2012-10-25 14:33:50 -01:00
Hendy 982825dd56 Merge 2012-10-25 14:01:14 -01:00
NielsHartvig@UMBRACORATI.localdomain c8c4e2437b Implements U4-1022: Request: Disable Canvas mode by default 2012-10-25 13:00:31 -02:00
Hendy 1970b20eb9 Merge 2012-10-25 14:00:10 -01:00
Hendy a5499cff26 U4-1080 - updateDate value for media item pulled from it's xml fragment (as only verison in db for media is the created version) 2012-10-25 13:59:48 -01:00
Ismail Mayat d9c37a03b9 U4-989 Editing Macro Scripts should force any attached macros to refresh their cached code 2012-10-25 13:48:44 -01:00
Tim@MiniNinja e17b93bcfe Fixes issue U4-872 2012-10-25 14:04:32 -01:00
Stephan 6ffc231be0 bugfix UriUtility when running in a virtual directory 2012-10-25 12:28:33 -02:00
Tim@MiniNinja 99d8aca0c5 Fixes U4-864 also fixes similar issues for:
Xslt
Javascript
Stylesheets
Scripting Files
Macros
If file exists, will redirect to existing file instead of cretaing new
2012-10-25 13:24:44 -01:00
Sebastiaan Janssen 3c2ac0e90e Include new files for U4-858 Default icons for Media Types 2012-10-31 12:03:52 -01:00
AnthonyCogworks@Anthony-PC 7af10e3b67 Issue : http://issues.umbraco.org/issue/U4-858
Fixed media thumbnails for SQL CE
2012-10-25 14:00:33 -01:00
Stephan 62a48df421 bugfix NiceUrlProvider when running in a virtual directory 2012-10-25 12:14:21 -02:00
Hendy f146b8f6af Merge 2012-10-25 11:30:56 -01:00
NielsHartvig@UMBRACORATI.localdomain 946f905885 Fixes U4-1079, Installer database step gives no error on failure 2012-10-25 10:30:08 -02:00
Hendy 707eca930f U4-430 - saving a media item now updates the udpated date in the xml 2012-10-25 11:27:12 -01:00
Stephan e4a002c976 properly cleanup views/masterpages when changing the type of a template 2012-10-25 09:34:02 -02:00
AnthonyCogworks@Anthony-PC e731afadc9 Issue : http://issues.umbraco.org/issue/U4-858
Fixed media thumbnails for SQL Server, MySQL, & Azure
2012-10-25 10:23:53 -01:00
Tom Fulton a006a480f7 U4-855: Small update to allow Preview to work when pasting custom source, and fix Insert not highlighting right away if ctrl+v 2012-10-25 18:14:11 +04:00
Tom Fulton 674923468d U4-855 Embed Media - allow inserting custom HTML into Source tab 2012-10-25 17:52:50 +04:00
Sebastiaan Janssen afafcfbb7a Merge 2012-10-31 10:32:58 -01:00
Matt@MBP13-PC c489d910b8 Fixes issue #U4-322 "Custom section name is the name of the previous section" by passing through the app alias to shitApp if no key is found in uiKeys 2012-10-31 11:31:08 +00:00
Sebastiaan Janssen 6e226ef995 Update the tinyMCE release config as well for U4-717 and u4-1006 2012-10-31 10:11:02 -01:00
AnthonyCogworks@Anthony-PC 0b1c479428 Case: http://issues.umbraco.org/issue/U4-715
Removed 2nd call to cleanPropertiesOnDeletion(_contenttypeid); in PropertyType.delete()

Replaced multiple calls to db to get all documentTypes.
2012-10-25 13:35:47 -01:00
AnthonyCogworks@Anthony-PC 3f2ca8a823 Case: http://issues.umbraco.org/issue/U4-648
Fixed issue in CMSNode where Parent was being set twice.
The issue was due to logic in Move(CMSNode newParent).
I renamed the parameter to newParent as it is more clear.
Changed the logic to check againse ParentId, rather than Path, and deleted
the redundant assignment to Parent.
2012-10-25 14:55:46 -01:00
Tom Fulton 78d57e89d5 U4-408: Prevent dragging of toolbar icons by adding onmousedown="return false" 2012-10-25 16:36:21 +04:00
Tom Fulton d9049864f3 U4-395: Fix RTE in Members section (add ValidateRequest = false) 2012-10-25 19:21:46 +04:00
Hendy 21632d2ffc Merge 2012-10-25 10:14:50 -01:00
Hendy da3d20a5bb ImageCropper property alias now set via a drop down of all available aliases, and a safety check on the dataeditor to ensure the selected property was found 2012-10-25 10:14:24 -01:00
Anders Burla Johansen c0f0dcca3a Fixed some attributes in tinyMCEConfig.config U4-717 and U4-1006 2012-10-25 09:02:33 -02:00
Tom Fulton 22f7d8797c U4-377: Fix exception when attempting to access Value externally during a new dictionary item creation 2012-10-25 14:47:29 +04:00
Tom Fulton 25da44825e U4-377: Add code from michielvoo's pull request (trigger the dictionaryitem.saving event from dictionaryitem.setvalue() by calling
its Save() method.)
2012-10-25 14:46:12 +04:00
Sebastiaan@SEBTHINK 55d4a7e367 Merge 2012-10-25 08:53:41 -02:00
NielsHartvig@UMBRACORATI.localdomain 33e73ab965 Fixes U4-802, MacroEngine should sort the built in engine first 2012-10-25 08:37:55 -02:00
NielsHartvig@UMBRACORATI.localdomain 05db49c66d Merge 2012-10-25 07:56:34 -02:00
NielsHartvig@UMBRACORATI.localdomain 4cf2035039 Fixes U4-862, Hide Preview Button and "Link to Document" on content nodes that are not intended for display (e.g., those that have no templates) 2012-10-25 07:55:34 -02:00
Hendy 27f059bf58 Merge 2012-10-25 08:53:11 -01:00
Hendy aee8730315 Bugs: U4-902 & U4-366
Prevalue field removed from the integer datatype & regex validation now fires
2012-10-25 08:51:38 -01:00
Ismail Mayat b517d59bee U4-998Saving a User Type - speech bubble says "User Saved" 2012-10-25 08:38:25 -01:00
Ismail Mayat e4f3081da2 U4-998 Saving a User Type - speech bubble says "User Saved" 2012-10-25 08:21:47 -01:00
NielsHartvig@UMBRACORATI.localdomain 5cca506d20 The new Template.GetByAlias with optional useCache parameter breaks bw compat as method signature changes. Adding an overload and removing default value on overload 2012-10-25 07:13:34 -02:00
Shannon Deminick e3f9375fd2 changes template creator to use new UmbracoTemplatePage class instead of RenderViewPage 2012-10-24 11:10:27 +05:00
Shannon Deminick cbd8085675 Merge 2012-10-24 11:06:31 +05:00
Shannon Deminick a9d6c7872a Changed the PublishedContentRequestBuild to use the cached template lookup instead of going to the db each time,
added caching to the business logic template class's GetByAlias method. All of this will save db queries for each request meaning even
faster rendering. Fixed GetTemplateAlias extension method to use the correct Template class with caching.
2012-10-24 11:02:36 +05:00
Shannon Deminick d4d4272b1b Moved RenderModel to Models namespace. Created new base UmbracoViewPage to use for umbraco partial views, etc... and renamed
RenderViewPage to UmbracoTemplatePage which now inherits from UmbracoViewPage. Added NiceUrl and NiceUrlWithDomain as extension
methods to IPublishedContent.
2012-10-24 09:59:23 +05:00
Sebastiaan Janssen e9aef79747 Member search didn't work
#U4-643 Fixed
2012-10-23 18:38:27 -02:00
Sebastiaan Janssen 3b5a1ddcdd Fixed the build, forgot to remove file reference from the csproj file 2012-10-23 14:52:58 -02:00
Sebastiaan Janssen 14ad9f571c Upgrade to TinyMCE 3.5.7 2012-10-23 13:32:21 -02:00
Sebastiaan Janssen 258d19df22 Remove Container DocTypes for now 2012-10-23 10:40:22 -02:00
Stephan 8261fa2aea fix package installer, use encodeURIComponent() vs escape() to support utf8 2012-10-23 09:37:33 -02:00
Stephan c434790b2f do not validate input when live editing to support RTE 2012-10-23 09:05:57 -02:00
Sebastiaan Janssen 4397319ac3 Add z-index too treePickerToolTip to get it on top when media picker preview is on 2012-10-23 08:24:33 -02:00
Sebastiaan Janssen 7309c7c02f Templates that have a space in the alias will be created without spaces in the
file name, when determining if the template exists, remove spaces from the alias
2012-10-22 10:36:54 -02:00
Sebastiaan Janssen 12e9ab050a Rewrite some more references to the tabId column and cmsTab table 2012-10-22 08:29:18 -02:00
sitereactor d0fd7c1374 Merge 2012-10-22 05:59:20 -02:00
sitereactor f7ccad4269 Updating language files with updates from github 2012-10-22 05:58:42 -02:00
Sebastiaan Janssen 1bf20b9c97 Update the version tests for mysql installer 2012-10-22 05:27:47 -02:00
Sebastiaan Janssen f03d861942 Updated MySql update script for 4.10.0 2012-10-21 11:47:01 -02:00
Sebastiaan Janssen c0eb3e256b MySQL total script updated for 4.10.0 2012-10-21 11:31:32 -02:00
Sebastiaan Janssen 41d7571e29 Merge 2012-10-21 11:08:57 -02:00
Sebastiaan Janssen c2f420be7a Fix issue where installer would not create properties on the media types because
it was trying to put information in the tabId column that's no longer there
2012-10-21 11:07:48 -02:00
Stephan b0e083e8fc refactor nice urls in editContent (U4-1017 and other issues) 2012-10-19 08:50:49 -02:00
Sebastiaan Janssen 04197a5900 Updated query to tabId to use propertyTypeGroupId instead, removed unreachable code 2012-10-18 11:39:38 -02:00
Sebastiaan Janssen d2fd02315a Fix skin configurator in Chrome not working after install.
SORRY for the commit to both files, still need to dive into the ASCX seperation
2012-10-18 07:46:46 -02:00
Sebastiaan Janssen f654c67540 Fix skin configurator in Chrome not working after install. 2012-10-18 07:41:24 -02:00
Sebastiaan Janssen 9b28214c3e Merge 2012-10-18 06:44:20 -02:00
Sebastiaan Janssen 6a665efd7e Styles dropdown is not updated when styled text is highlighted in the rich text editor
#U4-659 Fixed
2012-10-18 06:41:16 -02:00
Shannon Deminick 5aee883bd2 Added TypedSearch methods to UmbracoHelper and Search extension methods to the IPublishedContent.
Added GetTemplateAlias() extension method to IPublishedContent and to DynamicPublishedContent.
2012-10-18 08:00:07 +05:00
Shannon Deminick c0f7493e70 Merge 2012-10-18 07:17:20 +05:00
Shannon Deminick 7d8524dd55 Added additional namespace imports for MVC views in the views web.config. 2012-10-18 06:55:41 +05:00
Sebastiaan Janssen 4c667a6a3e Set web.config output to none because it might not exist when running automated
builds like build.bat or teamcity
2012-10-17 06:11:31 -02:00
Shannon Deminick ce06a30e64 added additional timeout to installer to ensure DOM is updated before redirecting. 2012-10-17 09:28:02 +05:00
Shannon Deminick 1be891d05f Added Thread.Sleep hack during package installer to attempt to always fluke out that the app pool will be restarted after redirect.
Currently this has worked in the past but only by fluke, this hack just makes the fluke probably work more often. In the next release we'll
need to refactor the package installers (there are about 7 instances of them in the codebase) to all use the same ajax methodology to ensure
that the app pool is restarted properly (which is now done properly during the install process).
2012-10-17 08:51:58 +05:00
Shannon Deminick e85f594b84 Fixed issue with trees not showing up for some packages, was issue with PluginManager caching between finding global types or finding types with specific attributes.
In this case, we were finding attributed trees only which was cached against the type of ITree, then we were looking for all ITrees but previously we cached finding ITrees
but the cache value was only the attributed ones.
Removed the caching of some plugin finding since they are only found once and there's no reason for the additional mem overhead.
2012-10-17 08:44:32 +05:00
Shannon Deminick a3278be3fe updated .ignore again with casing 2012-10-17 07:31:01 +05:00
Shannon Deminick 90aa8c3b5a reverted web.config back to standard (without user defined values) and added it to .ignore so that
user changes don't keep changing it and 'forgot' it in the source control.
2012-10-17 07:30:08 +05:00
Shannon Deminick ea217edaae Merge 2012-10-17 07:25:15 +05:00
Shannon Deminick 3cf9a45724 Finalized initial refactor of package installation for the installer, ensures the app pool is properly restarted
before installing Business Logic.
2012-10-17 07:08:35 +05:00
funka@WETWIRED 38fc6c980d Resolves redundant BaseTreePicker script initialization (U4-192) 2012-10-17 05:36:22 +07:00
Shannon Deminick cc34208871 More work on installer update for packages, nearly there. 2012-10-16 03:12:16 +05:00
Shannon Deminick 6f778c26d1 Initial commit of refactoring of package installer for the installer process. Converted a few webforms pages/controls to the new format, created
new JS class to manage the installation, created new MVC controller for managing the ajax installation
2012-10-16 01:33:35 +05:00
Sebastiaan Janssen 29b978c1cd Fixes issue where scrubbing the log would fail because of wrong datetime format 2012-10-15 12:11:31 -02:00
Sebastiaan Janssen 346a2d4fc9 Whoops, logging a little bit too much now, should only log errors 2012-10-15 11:38:15 -02:00
Sebastiaan Janssen 02cc7e69ec Merge 2012-10-15 07:03:29 -02:00
Sebastiaan Janssen acb66f45ac Change query to use propertyTypeGroupId instead of tabId (which has been renamed) 2012-10-15 07:03:12 -02:00
Sebastiaan Janssen 487fdea34e Logging for the datalayer now properly uses the LogHelper in Umbraco.Core 2012-10-15 07:02:29 -02:00
Shannon Deminick 0e0c4fcb1f Fixed an issue with unit tests and not resetting settings. 2012-10-14 08:11:49 +05:00
Shannon Deminick f7868b2cf1 Updated some of the Object resolver code, adds new protected AddTypes method, renamed method on Legacy resolver.
Fixes yet another issue with templates and package installs.
2012-10-13 10:59:21 +05:00
Shannon Deminick 0368f2846e Removed erroneous logging on plugin manager. 2012-10-13 09:26:30 +05:00
Shannon Deminick ee94652a0c Added unhandled exception logging. Added error checking to the DataTypeDefinition class... trying to
pinpoint where/when this bug occurs.
2012-10-13 08:49:44 +05:00
Shannon Deminick a1da12f033 Fixed SQL and CE installer to have the proper version spec queries... only by pure fluke did it ever work for 4.8! Argh!
Modified the CE one so that it is consistent with the Sql one, we should be relying on the same scripts here (or at least the same logic)
the one for CE will not work because even if the db is not installed it would have still returned 0 which would pass and the installer would have
thought it was installed.
2012-10-13 07:05:11 +05:00
Shannon Deminick ea406d2d7c Fixed SqlServer and CE installers to flag their latest available install version as 4.9, looks like MySQL hasn't been done yet
so have left it's installer flagged as 4.8 (just means that the intall will just hang... not sure why we have this flag anyways??
shouldn't we always support the latest version for all dbs??)
2012-10-13 06:43:24 +05:00
Sebastiaan Janssen 093a33e495 Fixed last setup/teardown problem for SQLCE in the unit tests 2012-10-12 15:05:07 -02:00
Sebastiaan Janssen 7a4ccc825d Only reset the DataDirectory path after clearing the database, else it will
never clear as it can't find a database at path null
Updated PublishedContentTests with correct amount of expected results
2012-10-12 14:45:13 -02:00
Sebastiaan Janssen a22efcdb2b Renamed datalayer loghelper to TemporaryLogHelper so it will stand out like a sore thumb 2012-10-12 13:29:27 -02:00
Sebastiaan Janssen 1b71c66256 Corrected some of the counts in PluginManagerTests so we can see why they start
failing when they do start failing again (upon inspecton of the returned
collections the current counts seem to reflect reality)
2012-10-12 12:45:31 -02:00
Sebastiaan Janssen f6c51205fc Re-include splitbutton.js 2012-10-12 11:41:29 -02:00
Sebastiaan Janssen d45b5a3139 Re-include ItemEditing javascripts 2012-10-12 11:09:32 -02:00
Sebastiaan Janssen 15dd774229 The ISNULL function is not supported in SQL CE, changed to COALESCE 2012-10-12 10:15:18 -02:00
Sebastiaan Janssen b248604c0f Added logging to SqlHelper to debug install/upgrade and find obsoleted queries 2012-10-12 10:14:54 -02:00
Sebastiaan Janssen f01a195369 Updated total.sql for SQL CE - Installs with CE from scratch work again
Upgrade detection from 4.9 > 4.10 added
UNTESTED: Upgrades from 4.9 > 4.10 should perform the database upgrade now
2012-10-12 10:13:50 -02:00
NielsHartvig@UMBRACORATI.localdomain 75af1e9d7c Merge 2012-10-12 05:39:31 -02:00
Shannon Deminick 689fe2a44f Fixes issue with wrapping the UmbEditor init in doc ready causing template editing not to work. 2012-10-12 09:15:33 +05:00
NielsHartvig@UMBRACORATI.localdomain 06519ab238 Fixes U4-1018. 2012-10-11 11:38:11 -02:00
Sebastiaan Janssen 65d5bc9155 Change from enableMvcSupport to defaultRenderingEngine in the release config too 2012-10-11 08:42:20 -02:00
Casey Neehouse a3b87a1d8b Wraps Code Editor initialization in a document ready call to correct an IE7
sizing bug.
2012-10-11 13:02:36 +04:00
Shannon Deminick b6f7d99039 Fixed why all the unit tests were failing. Ported over a couple of unit tests from the legacy test project to see how
easy it would be and it looks pretty easy, just need the propery initialization data for the tests. Currently ported over the
Dictionary biz logic tests.... most fail but pretty sure it's due to init data.
2012-10-11 08:32:06 +05:00
Shannon Deminick c1aa60c1ac Merge 2012-10-11 07:55:00 +05:00
Shannon Deminick a2988a30c0 updated ignore. Fixed issue when media is not found and YSOD is displayed. 2012-10-11 07:54:04 +05:00
Casey Neehouse 23f2382947 Merge 2012-10-11 03:03:38 +04:00
Casey Neehouse 4d94909782 Folder Browser Enhancements - IE 7 Thumbnail list CSS corrections,
Added labels to the thumbnail size setter,
Capture/cancel the return key on the filter textbox.
2012-10-11 03:00:28 +04:00
Shannon Deminick 422a2a685c Fixes: U4-1015, U4-1014 2012-10-11 03:42:18 +05:00
Shannon Deminick c4f1235f0b Fixes issues with ApplicationRegistrar and ApplicationTreeRegistrar during install, they now check if the
application is configured, if not then they exit otherwise exceptions will be logged every time the app starts during install.
Added a log on application end with the reason for shutdown and nicer methods to override in global.asax.
2012-10-11 03:02:23 +05:00
Shannon Deminick ce4828d678 Fixes HasContent if there is actually no content (new install).
Fixes issue with TreeDefinitionCollection not initializing when accessing singleton... not sure how i overlooked that before. This fixes
issues with MNTP initialization and probably some other tree stuff.
Removes warning log in umbracomodule for not a document as this just takes up space in the log.
Fixes issue with logger that was logging 'Info' for our internal Debug calls.
2012-10-11 02:30:48 +05:00
Shannon Deminick 8e914e751c Fixes: U4-1013 - editing a View file in template edit ensures no duplicated files. 2012-10-11 00:46:19 +05:00
Shannon Deminick 7fefde4c8a Fixes: U4-1011, YSOD is generated if any created/installed packages files exist but they are empty. 2012-10-10 23:44:42 +05:00
Shannon Deminick 29614d6b03 Fixes: U4-1010, U4-1009 -> issues relating to template business logic changes which checks for default rendering engine (MVC vs WebForms) and fixes package
installation issues associated with them.
2012-10-10 23:31:54 +05:00
Shannon Deminick 16b47539b4 Fixes up an issue relating to U4-1010 but is only the initial fix, now need to look at the changing
the package installation process to ensure the templte files are there before the template db entries.
2012-10-10 22:33:49 +05:00
Shannon Deminick 83c53333c6 Removed GetDictionaryValue from RenderViewPage, this can be accessed through the @Umbraco property. 2012-10-10 20:45:51 +05:00
Shannon Deminick 77db6cad01 Fixes issues with last commmit. Fixes: U4-786 - made some things public 2012-10-10 20:44:29 +05:00
Shannon Deminick a10daaab52 Updated code from code review 2012-10-10 20:20:16 +05:00
Shannon Deminick 3ddb9785c7 added missing codebehinds. updated ignore file. 2012-10-10 20:04:11 +05:00
Sebastiaan Janssen 585eea1c6b Merge 2012-10-10 11:03:27 -02:00
Sebastiaan Janssen 10095a4ee7 Upgrade to CodeMirror 2.34 2012-10-10 11:02:59 -02:00
Shannon Deminick 8f4ccc53d5 Merge 2012-10-09 20:17:51 +05:00
Shannon Deminick f04db8c52c Converted umbracoPage.master to have the correct codebehind structure. Added base2 as a default lib in umbracoPage.
Converted EditView to use propery JS class so that we can now better support the editor for the new buttons (i.e. insert macro, etc...)
2012-10-09 20:17:27 +05:00
Sebastiaan Janssen e2283c2310 Made CodeMirror 100% height again 2012-10-09 12:25:36 -02:00
NielsHartvig@UMBRACORATI.localdomain 635f09fb75 Updates new Total.Sql for SQL Server to match the 4.10 db schema.
IMPORTANT: If you upgrade a previous 4.10 dev site, make sure to run the 'src\umbraco.datalayer\SqlHelpers\MySql\Sql\Version4_8_Upgrade.sql' script
IMPORTANT v2: The DB updates haven't been ported to SQL CE and MySQL yet, so they'll currently BREAK!
2012-10-09 06:56:18 -02:00
Shannon Deminick 9022894d23 Changed EnableMvcSupport config section and classes to be: DefaultRenderingEngine which uses an enum.
Added a real handy Enum<T> class for parsing/traversing enums.
2012-10-09 02:42:09 +05:00
Shannon Deminick 747675816d Changed editMacro over to use the correct codebehind structure. 2012-10-08 23:57:27 +05:00
Shannon Deminick 2833a8c5c7 Changed editTemplate over to use the correct codebehind structure 2012-10-08 23:52:37 +05:00
Shannon Deminick 75a686bc07 Changed umbracoDialog.master to have correct codebehind structure. 2012-10-08 23:46:49 +05:00
Shannon Deminick 76a521dd8b fixes script manager reference 2012-10-08 23:36:25 +05:00
Shannon Deminick 8fa36f3f22 Converted UmbracoField to use JS class Umbraco.Dialogs.UmbracoField.
Adds base2 lib o the default umbracoDialog.Master.
2012-10-08 23:32:43 +05:00
Shannon Deminick 18aef90017 Merge 2012-10-08 21:55:16 +05:00
Shannon Deminick 82bb410f4f Changed @Model.CurrentContent to @Model.Content, updated some ext methods for IPublishedContent. 2012-10-08 21:55:03 +05:00
pgregorynz caa937a4ef Updates to ViewEditor. Insert Page Field, Insert Dictionary Item,
Master Template Selector
2012-10-08 06:05:07 -10:00
pgregorynz d7103a3b83 Merge 2012-10-08 05:57:57 -10:00
pgregorynz e555520ddf Insert field Views. 2012-10-08 05:40:55 -10:00
Morten Bock a71961c35b Indenting 2012-10-08 13:33:18 -02:00
Niels Hartvig ed3f715988 Container Document Types 2012-10-08 11:53:35 -02:00
Casey Neehouse 26aca92337 Updates to the Change password dashboard UI - better language and corrected the
validation. Related to comments in issue U4-914.
2012-10-09 03:33:55 +04:00
tg@umbraco.com 406e3663f6 Merge 2012-10-08 08:43:38 -02:00
tg@umbraco.com 775b2192ff Fixes U4-680: insert Macro split buttons not working 2012-10-08 08:42:47 -02:00
PerPloug 458de6296e Wraps masterpages selector in try/catch
to avoid exceptions if masterpage is missing for some reason
2012-10-08 07:19:36 -02:00
PerPloug b55ce96d85 Changes to editView, editTemplate and loadTemplates
to fix wrong create dialog, and missing master pre-selection
in master template dropdown
2012-10-08 07:12:02 -02:00
Shannon Deminick 8ae867389d Merge 2012-10-08 00:15:51 +05:00
Shannon Deminick 5fc3d8e248 Fixes threading issue with Dynamicexpression... would have caused some strange behavior in the past!
Fixes: U4-995 - most methods will now work in dynamic expressions
2012-10-08 00:09:44 +05:00
Sebastiaan Janssen 227d910722 Merge 2012-10-07 15:27:47 -02:00
Sebastiaan Janssen a356552d2d Moved tree picker tooltip style to default.css so it also works in editMacro (and elsewhere) 2012-10-07 11:45:22 -02:00
Michiel van Oosterhout 5c6a595e48 Changed conditions to put the constant last, so (x == false) instead of (false == x).
Code now conforms to project coding standards.
2012-10-07 08:50:09 -02:00
Michiel van Oosterhout c1cfcaf9ea Deprecated MacroProperty.Public because its value is ignored. Removed the checkbox
for setting MacroProperty.Public from the macro editor.
2012-10-06 20:51:00 -02:00
callicj 40a413cd70 Added releaseDate, expireDate columns to the query defined on m_SQLOptimizedMany so the corresponding fields are populated when this query is used to load the object. 2012-10-07 11:28:43 -02:00
Michiel van Oosterhout c7c10b8ab6 Fixed typo for consistency and incorrect grammar. 2012-10-06 18:46:31 -02:00
Michiel van Oosterhout 2da0728b78 Do not call .Trim() on a string inside .IsNullOrEmpty(), the string may be null.
Instead use .IsNullOrWhiteSpace().

Saving a global setting will insert an appSetting in web.config if it does not
yet exist.
2012-10-06 18:46:12 -02:00
Casey Neehouse a71f3f8412 Updated SQLCE to 4.0.8876.1 (SP1) and closes u4-677 2012-10-07 00:39:04 +04:00
Casey Neehouse b21423efe2 Updates SQLCE to v.4.0.8854.1 to resolve a SQL issues related to Contour. 2012-10-07 00:02:38 +04:00
Shannon Deminick 5895858e6e Merge 2012-10-07 00:08:21 +05:00
Shannon Deminick cd38123fbd Fixes issue with DynamicExpression and parsing to ensure that it is using generic types, not hard coded types.
Ensures unit tests passing for Where, Single, SingleOrDefault with filters with dynamics.
2012-10-07 00:07:51 +05:00
Shannon Deminick 842d7120e6 Obsoletes DynamicQueryable in MacroEngines lib, proxies all calls to new DynamicQueryable in Umbraco.Web.
Adds more support for NodeTypeAlias and DocumentTypeAlias param names for compatibility.
Adds IsDocumentType is-helper method.
Adds unit tests for complex Linq using a Typed IPublishedContent object.
Adds unit tests for complex Linq using dynamics.
Adds support for Single, SingleOrDefault, First, FirstOrDefault, Last, LastOrDefault to dynamics for both DynamicNode and DynamicPublishedContent + unit tests.
Adds support for 'Children' on DynamicNode to keep things consistent, no longer required to have to do 'ChildrenAsList'.
DynamicNode now implements INode... not sure why this wasn't like that before.
2012-10-06 23:41:42 +05:00
Sebastiaan Janssen cae2183ab4 Merge 2012-10-06 11:47:55 -02:00
Sebastiaan Janssen 07e75dab15 BaseRestExtensions.Release.config should not be in the build package, output set to None 2012-10-06 11:47:01 -02:00
Sebastiaan Janssen 5cebbd8a91 Adds a nice tooltip when hovering over the content/media picker
#U4-192 Fixed
2012-10-06 11:46:37 -02:00
Stephan db59b08f58 fix config files for BaseRestExtension.config 2012-10-06 07:20:12 -02:00
funka@WETWIRED 2b2c75f5e4 Resolves feature request U4-192 Add more meta data to Content and Media pickers 2012-10-06 01:26:56 +07:00
Casey Neehouse 8c7b06fe2b U4-914 - Added additional security to the change password
dashboard control to require current password.
2012-10-05 21:12:12 +04:00
Sebastiaan Janssen 540db7137a Fixed config transform for BaseRestExtension.config 2012-10-05 13:45:06 -02:00
Stephan 079aae7e63 bugfix unit tests polluting each other - static settings issue 2012-10-05 08:23:43 -02:00
Stephan 6183e01642 bugfix xpath in DefaultPublishedContentStore for legacy XML schema 2012-10-05 08:00:06 -02:00
Sebastiaan Janssen cf91933791 Add some dummy files to ensure (empty) directories in the test project get created 2012-10-04 15:15:23 -02:00
Sebastiaan Janssen d10c3a960f Merge 2012-10-04 15:04:14 -02:00
Sebastiaan Janssen 4d6d89dbe7 Add Masterpages and Views folder in the unit tests to project so almost 250 more tests will run properly 2012-10-04 15:03:40 -02:00
Morten Bock c138c6643a Ignore casing, and avoid null http contexts 2012-10-04 14:48:14 -02:00
Morten Bock a2b876608f Refactoring to use object resolver, instead of ProviderBase 2012-11-21 07:14:40 -01:00
Shannon Deminick 9e113564fa Merge 2012-10-04 21:39:36 +05:00
Shannon Deminick f8848086fd Adds support for legacy schema to the DefaultPublishedContentStore, adds unit tests to support this. 2012-10-04 21:37:11 +05:00
Shannon Deminick 261a6af60a Fixes issue when xml file is corrupt and no doc type is registered, the mvc controller factory throws an exception. 2012-10-04 21:06:32 +05:00
Sebastiaan Janssen c66d70fbd8 Merge 2012-10-04 13:52:12 -02:00
Sebastiaan Janssen e8c7af8b25 Removed legacytests project for now. 2012-10-04 13:51:51 -02:00
Shannon Deminick 8804d912f2 More unit tests written and passing. 2012-10-04 06:00:47 +05:00
Shannon Deminick 54e5140d6a Added more extension methods to our strongly typed IPublishedContent object and IEnumerable<IPublishedContent> to match all of the available methods
that are on the DynamicPublishedContent object. Added more unit tests for all of these classes.
Moved some of the Dynamic objects into the web project which simplifies things quite a bit as some of these classes require access to the biz logic layer.
Now we have intellisense for all of the nice magical methods that were on DynamicPublishedContent on our strongly typed object!
2012-10-04 03:26:56 +05:00
Shannon Deminick c0102f1c71 Refactored the traversal, ishelper, etc... methods to be extension methods on IPublishedContent so now all of these methods are available on the Typed object not just the dynamic object which makes a whole lot more sense... and you can have intellisense.
Updated DynamicPublishedContent's methods to just proxy calls to the new extension methods so that all of the logic is contained in one place.
Added new GetRootDocuments to the IPublishedContentStore since we need this in order to get the root list of documents for many of these methods.
Fixed an issue with the DynamicNode to IPublishedContent converter.
Fixed many of the failing unit tests.
2012-10-04 01:31:08 +05:00
Shannon Deminick 831d1966dc Added IEnumerable extensions to TypedContent, TypedMedia, Content, and Media methods 2012-10-02 22:55:36 +05:00
Shannon Deminick ef5525e67f renamed DynamicDocumentList to DynamicPublishedContentList
simplified some of the DynamicPublishedContent methods to accept Func<IPublishedContent> instead of Func<DynamicPublishedContent>, made the IsHelper method private as this shouldn't be exposed.
renamed other objects starting with DynamicDocument to DynamicPublishedContent
2012-10-02 22:51:53 +05:00
Shannon Deminick f3e04ac871 Changed method name ContentTyped to TypedContent and MediaTyped to TypedMedia. 2012-10-02 22:10:18 +05:00
Shannon Deminick ba98f587b2 Changed query methods on UmbracoHelper to just Content, ContentTyped, Media, MediaTyped 2012-10-02 21:58:07 +05:00
Shannon Deminick 2753dbe5b4 ensures enctype attribute is added in BeginUmbracoForm.
Adds CurrentCulture to RenderModel
2012-10-02 21:19:21 +05:00
Shannon Deminick 56c93891a8 Fixes the ClearDatabase call in SqlCEHelper... pretty flukey that unit tests were even working with this bug for so long.
Fixes the RenderRouteHandlerTests.
2012-10-02 02:33:19 +05:00
Shannon Deminick 6bd005775d After talks with morten and stephane, this renames
DocumentNotFoundHandler  -> PublishedContentNotFoundHandler
2012-10-02 01:43:59 +05:00
Shannon Deminick 73c79e8528 After talks with morten and stephane, this renames
IDocumentLookup -> IPublishedContentLookup
2012-10-02 01:43:05 +05:00
Shannon Deminick 827d4dd6c0 After talks with morten and stephane, this renames
DocumentRequestBuilder -> PublishedContentRequestBuilder
2012-10-02 01:41:54 +05:00
Shannon Deminick ffd14c839b After talks with morten and stephane, this renames
DocumentRequest -> PublishedContentRequest
2012-10-02 01:40:19 +05:00
Shannon Deminick f8d8b767b8 update ignore file 2012-10-02 01:37:02 +05:00
Shannon Deminick 4f011e0390 Some naming tweaks to fix up from previous commit. 2012-10-02 01:36:42 +05:00
Shannon Deminick 053df24640 After talks with morten and stephane, this renames
IDocument -> IPublishedContent
DynamicDocument -> DynamicPublishedContent
2012-10-02 01:35:39 +05:00
Shannon Deminick 45c335702d Updated view engine to look only in App_Plugins/ not App_Plugins/Packages/.
Updated view engine to automatically create the required razor web.config in the packages
Views folder if it is not there already.
2012-10-01 23:43:47 +05:00
Shannon Deminick bc04d4f8da Added PluginViewEngine for App_Plugins 2012-10-01 23:22:23 +05:00
Shannon Deminick be5076783f Adds ~/App_Plugins/Packages folder to be created in build script 2012-10-01 23:10:27 +05:00
Shannon Deminick 5c20f4f6ec Fixes: U4-U4-917
Fixes: U4-821
2012-10-01 23:04:57 +05:00
Shannon Deminick 42da98e020 Moves codebehind for EditView into UI project 2012-10-01 22:09:49 +05:00
Stephan eeb305c740 fix uQuery.GetNodeIdByUrl 2012-10-01 13:08:10 -02:00
Stephan c19541cb11 handle routing cache corruption cases, more unit tests 2012-10-01 12:20:51 -02:00
Stephan dea22f22cb fix UriUtility, fix unit tests 2012-10-01 09:52:32 -02:00
Stephan 656c61d1e2 fix xpath for finding default node because sortOrder may not start at zero 2012-10-01 06:55:44 -02:00
Shannon Deminick bac038b82d Converted treeInit.aspx so that it's codebehind and designer files are in the UI project and only
the old TreeInit class exists in the Umbraco.Web project (not the aspx file). It needs to stay there
to maintain backwards compatibility for anyone that may have inherited from that file.
2012-10-01 03:57:57 +05:00
Shannon Deminick dd6d0e380e Updated the /umbraco/umbraco.aspx page to have all of it's aspx + codebehind + designer files in the UI project and
left the original class in the Umbraco.Web project as to not break backwards compatibility for anyone that may have inherited from that
class.
2012-10-01 03:41:37 +05:00
Morten Bock c95c1a7038 Add support for thumbs and crops from standard datatypes. 2012-09-30 20:37:05 -02:00
Morten Bock 9e1c5e71e4 Adding the umbraco:image control, and the ImageUrl feature with a some generic ProviderFeature classes, to make it easier to implement future provider based features. 2012-11-21 07:13:31 -01:00
Sebastiaan Janssen aba68720bb Localized the create window for new Scrips (js) 2012-11-21 06:54:52 -01:00
Sebastiaan Janssen 1b1722c875 Renamed method to remove characters that are illegal in XML and made the method internal for now 2012-11-21 06:23:31 -01:00
Michiel van Oosterhout 248af2eaa2 Correct code that validates the user name when the session times out by serializing
user name and password.

Adds a minified 4KB JSON library to umbraco.aspx to support older browsers, namely
https://github.com/douglascrockford/JSON-js (public domain)
2012-10-07 20:54:34 -02:00
Casey Neehouse 0709174560 Merge 2012-11-20 21:11:11 +05:00
Casey Neehouse b0c0ed050d Adds SQL to validate that a node is published before loading the xml.
U4-759, u4-590, U4-589
2012-11-20 21:09:19 +05:00
Sebastiaan Janssen e3a085774c Revert 5c828605ef65 / 8b3a266b2d00 because that would have nasty side effects,
see http://issues.umbraco.org/issue/U4-1061
2012-11-20 14:49:30 -01:00
Sebastiaan Janssen 6f0ddc37a0 Include System.Data.SqlServerCe* should do a copy local 2012-11-20 14:13:47 -01:00
Sebastiaan Janssen d3eb5ceabe Merge 2012-11-20 12:55:17 -01:00
Stephan 1bffb7395c U4-1192 - uQuery.GetNodeIdByUrl should not follow redirects etc 2012-11-20 09:12:45 -01:00
Stephan e636a42744 .hgignore ~/scripts and ~/images 2012-11-20 08:52:56 -01:00
Stephan d3927a1265 code annotation attributes TLC 2012-11-20 08:49:06 -01:00
Stephan d6fc106588 fix DisposableTimer so args can be evaluated _after_ completion 2012-11-20 08:34:32 -01:00
Stephan 68fc833280 U4-1186 - bugfix previous commit 2012-11-19 16:09:43 -01:00
David@David-PC 5a8443fe72 committed wrong version 2012-11-18 18:48:56 -01:00
David@David-PC 153fb4a248 Do a recursive unpublish (fixes U4-462, U4-594, U4-1061) 2012-11-17 14:25:04 -01:00
Michael Wulff Nielsen 72ef5b01d2 Fixes bug 383, inserting macro parameters with quotes fails in macrocontainer 2012-11-20 09:29:38 -01:00
NielsHartvig@UMBRACORATI.localdomain 0854fee4ee Update to sanitizer 2012-11-16 14:24:24 -01:00
NielsHartvig@UMBRACORATI.localdomain e122d40fb9 The BOSS is fixing U4-367 2012-11-16 14:08:28 -01:00
Sebastiaan Janssen b696aa4340 ApplicationContext.Current.ApplicationCache wasn't public due to an oversight, it is now. 2012-11-19 15:31:58 -01:00
Sebastiaan Janssen e32dd303e3 Have to revert Microsoft.WebApplication.target file change as we got weird
results (umbraco.presentation folder and a XmlSerializers dll in the root).
Copied the targets file to the appropriate Program Files folder on the build
server. :-(
2012-11-19 15:02:43 -01:00
Stephan 7c524abb84 U4-1186 - support wildcard domains to change the culture 2012-11-19 14:11:34 -01:00
Stephan 993bac8a29 bugfix LogHelper 2012-11-19 14:09:52 -01:00
Shannon Deminick b40dbf73ca Changes case back to the correct EditView 2012-10-01 03:00:05 +05:00
Shannon Deminick 0808665342 Changes editView to editViewTEMP so that we can change it back to the correct case. 2012-10-01 02:55:53 +05:00
Shannon Deminick 7623746f64 changed editViewTEMP to EditView with correct casing. 2012-10-01 02:52:58 +05:00
Shannon Deminick 3152427ff7 Changed name of editView to editViewTEMP in order to change it back to the correct case. 2012-10-01 02:52:28 +05:00
Shannon Deminick 85e88e5640 Merge 2012-10-01 02:48:39 +05:00
Shannon Deminick ea3d2f893f Added AsDynamic extension to IDocument.
Makes DynamicDocument explicitly implement IDocument as well.
Changes all ContentById methods, etc... back to returning just 'dynamic'
Removes valueAlias from the .Field method of UmbracoHelper which didn't actually do anything
removes altValueAlias from the .Field method of the UmbracoHelper which didn't actually do anything.
2012-10-01 02:48:08 +05:00
Stephan 3cddc5e4dc merge 2012-09-30 14:04:38 -02:00
Stephan 8cd49749ec fix routing, more unit tests 2012-09-30 14:02:11 -02:00
Stephan e45bf57632 fix how we resolve "default node", now using sortOrder 2012-09-30 12:25:47 -02:00
Stephan 3e99dd0d55 fix NiceUrl and add more tests 2012-09-30 12:24:23 -02:00
Sebastiaan Janssen be2ed3762b Merge 2012-09-30 06:46:37 -02:00
Sebastiaan Janssen e3abd49276 Fix regression bug 2012-09-30 06:46:08 -02:00
Shannon Deminick d76f6c1cdb {localLink} parsing in MVC is now all working. 2012-09-29 11:35:31 +07:00
Shannon Deminick 840109dc58 updates missing code block 2012-09-29 11:19:19 +07:00
Shannon Deminick 1aebce7ad6 makes SystemDirectories and SystemFiles public.
moves ResolveUrlsFromTextString to TemplateUtilities class and obsoletes other ones.
Fixes an issue if content cache is stored in codegen folder and not in med trust.
Updates the XmlDocument (IDocumentProperty) to always return a value with parsed {localLink} and resolved Urls and cache them so the parsing only happens once.
2012-09-29 11:11:48 +07:00
Shannon Deminick 11fd6553e9 Ensures that localLinks are parsed when rendering fields and macros using UmbracoHelper.
Added additional ControllerExtensions to render views as strings.
2012-09-29 08:49:21 +07:00
Shannon Deminick 690c4a165c Creates TemplateUtilities class for parsing local links and obsoletes the old method. 2012-09-29 08:13:49 +07:00
Shannon Deminick 8fb159ddc2 Changes IThumbnailProvider to exist under Umbraco.Core.Media instead of just Umbraco.Core.
Moves many of the MVC extension methods into the Umbraco.Web.Mvc namespace and tidies up a few other
class's namespaces
2012-09-29 08:07:00 +07:00
Shannon Deminick b3ca264af1 Explicitly loads webforms handler and remaps to it, now we can share this code somehow with the RenderRouteHandler when
we want to support having a no-template render as a 404.
2012-09-29 07:36:19 +07:00
Shannon Deminick 34e71027b3 Changed Is404 on DocumentRequest to internal as only the DocumentRequestBuilder should set this, removed the Is404 being set in the
DefaultLastChanceLookup as lookups shouldn't set the 404.
Cleaned up ObjectExtensions TryConvertValue method.
Ensures that the routes are created before the CoreBootManager complete is called.
2012-09-29 07:20:23 +07:00
Stephan 926427ff68 merge 2012-09-28 11:14:04 -02:00
Stephan abe4944843 routing - handle when umbraco is not ready or has no content 2012-09-28 11:11:47 -02:00
PerPloug 5f12767f48 Flet 2012-09-28 09:27:12 -02:00
PerPloug 04e0b35c7d Method Renaming to follow standards
Marking IOHelper methods as internal
Removing unneeded umbraco setting
Missing icon and missing folder in UI project
2012-09-28 09:19:16 -02:00
Stephan d82cbfccc5 remove a ref to requestHandler, fix DefaultRoutesCache management 2012-09-28 09:04:49 -02:00
Stephan 3ed1b4c77d remove unused setting option 2012-09-28 08:14:01 -02:00
Stephan 6c4869f931 merge 2012-09-28 07:08:37 -02:00
Stephan b0e336e01f routing, fix "no content" splash, fix "no template" handling, fix redirects 2012-09-28 07:04:33 -02:00
Shannon Deminick 05bdd42567 Fixes issue with UmbracoHelper in back office when there is not Document.
Adds another overload to BeginUmbracoForm.
2012-09-28 08:08:36 +07:00
Stephan d8c2a71531 bugfix document.GetPropertyValue and object.TryConvertTo 2012-09-27 15:41:24 -02:00
Stephan a469e3dbe3 fix base/rest service - cleanup + new config file 2012-09-27 15:37:21 -02:00
PerPloug b8b951f094 Missing UmbracoSettings change in umbraco.core
IOHelper in umbraco.core
Both related to mvc views in template tree
2012-09-27 06:30:59 -02:00
PerPloug c409cfa421 Create/Ui.xml file for templates
umbracoSettings.config file
2012-09-27 06:29:41 -02:00
PerPloug 9f7814591e Adds Seperate View Editor for mvc templates
Changes the template tree to look for existing views
to override the .master
2012-09-27 06:24:04 -02:00
PerPloug 2c995f7fa7 Moves masterpage and view creation away from the template
class and into seperate helpers.
2012-09-27 06:23:09 -02:00
PerPloug 7e5db90b3b Adds IO Helper overload for the views and masterpages
Adds UmbracoSettings to toggle mvc templating support
2012-09-27 06:21:59 -02:00
Shannon Deminick f7f83bc057 Changed IPublishedContentStore and IPublishedMediaStore back to internal as we don't need to expose these yet. Instead have added
an UmbracoHelper property to the PluginController class which will expose any methods needed by devs to retreive media or content.
Have updated UmbracoHelper with loads of new helpful methods and moved the Wrap methods to HtmlHelper extensions because this is purely to
do with rendering html (have written unit tests for it too).
Updated some 'library' methods to proxy calls to UmbracoHelper so we only have to maintain one set of code.
Added a convenience property to UmbracoContext to return the current NiceUrlProvider so you don't have to go through the RoutingContext to get it.
2012-09-27 08:30:35 +07:00
Shannon Deminick 530e7ae44e removed ref to missing template file 2012-09-27 07:06:14 +07:00
Stephan 126044cd48 bring back scheduled tasks - #U4-809 2012-09-26 12:51:27 -02:00
Sebastiaan Janssen f76e90990f Include packages.config anyway, just tell it to not output in the build 2012-09-26 11:58:52 -02:00
Sebastiaan Janssen 587542ace7 The build.bat file now won't exit when there's an error so you can inspect it, if there's no errors it will just exit
Excluded missing index.cshtml file from project (was giving build error)
2012-09-26 06:48:11 -02:00
Shannon Deminick d3676b376d Removed test route 2012-09-26 13:59:24 +07:00
Shannon Deminick 53a3ad24e6 comments out test surface controllers for now 2012-09-26 13:44:23 +07:00
Shannon Deminick 05add96294 Ensures web.config includes new namespace reference 2012-09-26 13:43:47 +07:00
Shannon Deminick 9b5fd3d67b Merge 2012-09-26 13:42:44 +07:00
Shannon Deminick 5ece0b5af0 Surface controllers now auto-routing, both locally declared and plugin types (which require a [PluginController] attribute and an Area Name assigned).
BeginUmbracoForm working for both local and plugin SurfaceControllers. SurfaceController class now inherits from PluginController which exposes all things a dev would
need including making IPublishedContentStore and IPublishedMediaStore public which can be accessed simply by properties on the controller.
Updated web.config for views to include Umbraco.Web namespace for all of our helper methods.
BeginUmbracoForm now has many more overrides for which you can specify a type or a generic type (we no longer require GUIDs :)
2012-09-26 13:42:03 +07:00
Shannon Deminick 332b42aa49 Changed how surface controllers are routed: because we don't load plugins in via App_Plugins/[PackageName] like we did in v5 which meant that we can autoroute all plugin controllers with their own areas, in v4 we have to do something different.
Instead (because we still want areas), we have an attribute called PluginControllerAttribute which allows a dev to assign an area name as a string. A package developer should always ensure that all of their plugin controllers are assigned to the same
area. This also lets us get rid of the GUID id part of the plugin (hopefully we can leave it out, just need to run some tests). Since we have areas, package devs can then put their views into
their own folders and not clutter up the local devs ~/Views folder. Perhaps we use App_Plugins/[PackageName] for the views like we did in v5 but need to ask on the mail list. Otherwise it will be the standard MVC:
~/Areas/[AreaName]/Views which will still also clutter up the local devs view folder if they are using Areas.
2012-09-26 11:04:07 +07:00
Sebastiaan Janssen 97472c6ce6 Ignore file excluded the web.config file in the views folder, which is why the build failed, not because it wasn't included 2012-09-25 11:56:33 -02:00
Sebastiaan Janssen 48a3a920d2 Web.config file was not included, making the build fail 2012-09-25 11:53:27 -02:00
Shannon Deminick 7b7e3b82f1 Started adding tests for surface controller routing. They are working but not quite correctly yet. 2012-09-25 13:33:47 +07:00
Shannon Deminick 0b7f04ab37 Added all code to support auto-routing surface controllers and started implementing the code for
BeginUmbracoForm.
2012-09-25 13:09:59 +07:00
Shannon Deminick 083b18139a Adds code to RenderViewEngine to ensure the /Views folder exists and also that the razor web.config file exists there too.
I've also added this web.config file to the sln so it should output in the build by default though it will still be created automatically if
its not there.
2012-09-25 11:20:05 +07:00
Shannon Deminick 1bc3943f33 Fixes: #U4-894 - moves the int Priority out of the IThumbnailProvider class as it is only metadata, moved
this into a new generic WeightedPluginAttribute which can be used for other resolves/objects that require a weight.
2012-09-25 11:06:32 +07:00
Hendy@Blueberry 449613de3e updated check for uQuery.IGetProperty
added XPathCheckBoxList return obj for uQuery .GetProperty<T>("alias")
2012-09-24 20:54:26 -01:00
Stephan 7d8ec2678c initialize Umbraco sooner in the request pipeline 2012-09-24 12:49:36 -02:00
Stephan 12c0ce258b fixing routing + add Lookup tests 2012-09-24 12:10:25 -02:00
Stephan 42317ec207 merge 2012-09-24 11:37:55 -02:00
Stephan 343c14db48 fixing routing, 404, domains + add NiceUrl and UriUtility tests 2012-09-24 11:36:25 -02:00
Hendy@Blueberry 2fcb9d7b30 added uQuery.IGetProperty - allows GetProperty<T> extension methods to pass T hydration to a method in T 2012-09-23 10:34:39 -01:00
Sebastiaan Janssen ccbcb991b1 Text for Alias is changed to Alternative link
#U4-891 Fixed
2012-09-22 12:14:42 -02:00
sebastiaan 33f4da875a Additional fix for #U4-306 - click to the right of the node still collapsed the tree 2012-09-22 10:54:22 -02:00
sebastiaan 0549e39a00 The ClientDependency and ExamineIndexes folder are not needed in /App_Data any more
They are automatically generated in /App_Data/TEMP
2012-09-22 10:34:03 -02:00
Shannon Deminick 6fb0fc643b Merge 2012-09-21 23:54:31 +07:00
Shannon Deminick 8824579dac Made IThumbnailProvider public which fixes 4.10 loading them, plus now people can make their own :)
However, I'd like to move the Priority flag onto an attribute instead of part of the interface because it
is metadata and not functionality of the class itself. Will make a tracking issue for it.
2012-09-21 23:54:14 +07:00
Stephan 94b6a9df8d fix base/rest service - loading assemblies & caching methods 2012-09-21 10:10:03 -02:00
Stephan cb8a8b997f bugfix TypeFinder.GetAllAssemblies duplicate App_Code 2012-09-21 10:01:51 -02:00
Casey Neehouse fe99c22022 Merge 2012-09-21 01:56:19 +04:00
Casey Neehouse 0225047a52 Removes .ChildNode calls for .SelectNodes() with correct element selection. Allows comments in configuration.
Also updates some Macro Properties to work with new schema.
2012-09-21 01:53:43 +04:00
sebastiaan d89a24d96b Tree disappears if you click slightly below the root node
#U4-306 Fixed
2012-09-20 17:02:07 -02:00
sebastiaan c5535ddbc2 Improved SafeFileName method to include all valid characters as listed by RFC 3986 section 2.2 Reserved Characters (January 2005) and character data chars that could be ambiguous
Now characters like Chinese characters are allowed in the filenames, which addresses the issue below
#U4-885 Fixed
2012-09-20 16:46:55 -02:00
Stephan 3a21d48dbc merge 2012-09-20 14:38:08 -02:00
Stephan ea8ff709c2 further refactor base/rest service into Umbraco.Web 2012-09-20 14:37:23 -02:00
sebastiaan eb9937c33a Packages.config should not be included in the project as it shouldn't be in the builds 2012-09-20 10:24:56 -02:00
sebastiaan 777c7dd683 Update to 4.10.0 for the nuspec files as well 2012-09-20 09:16:03 -02:00
sebastiaan 10963fe3c4 Remove .nupkg files 2012-09-20 09:13:11 -02:00
sebastiaan 3e5d684333 Update version number to 4.10.0 2012-09-20 09:10:50 -02:00
greystate 6a9b2b260b Applied pull request: 3402 - typo on starter kit install screen 2012-09-20 09:09:55 -01:00
Morten@Thinkpad-X220 7a38d7f845 Adding TinyMCE language files for plugins and themes. There are still a few missing for the umbraco theme though. 2012-09-20 06:45:23 -02:00
Morten@Thinkpad-X220 745707dc4b Removing TinyMCE3 language files before they can be properly attached 2012-09-20 06:36:34 -02:00
sebastiaan 1f4ceaa75c Included the tinyMCE language files in the project so they'll actually be in the build
#U4-277 Fixed
2012-09-20 06:27:09 -02:00
Shannon Deminick a16f28eb26 Re-implemented GetProperty on IDocument, had removed it because I didn't see a need for it because we already have a Properties collection, however we do require it
for specific implementations where the IDocument needs to search for the specified property based on alias since it might not already know about it. This is true for the
DefaultPublishedMediaStore where a property may not exist in the Examine cache so we need to fallback to the db in that case.
2012-09-20 14:17:40 +07:00
Shannon Deminick fa36ff3662 removed erroneous Wrap methods that were hidden by other overloads based on optional parameters. 2012-09-20 13:32:08 +07:00
Shannon Deminick ae4cb00bbc Got Wrap methods on UmbracoHelper, deprecated old classes in the macroEngines project that Wrap utilizes and proxies
all calles in RazorLibraryCore for Wrap to UmbracoHelper. Fixed up the HtmlTagWrapper classes so they have immutable properties and replaced
public fields with Properties.
2012-09-20 13:16:38 +07:00
Shannon Deminick fd166389c4 Changed the MVC view class to expose the UmbracoHelper as just @Umbraco instead of @UmbracoHelper, this
follows the same naming conventions as MVC with HtmlHelper is exposed just as @Html, plus it is less to type
2012-09-20 12:47:37 +07:00
Shannon Deminick a48b996571 Got ChildrenAsTable working as extensions on DynamicDocument with supporting unit tests.
Have updated the ChildrenAsTable code for Node as well to use the same base code, this should
also fix some issues with generating a datatable correctly when a content type is changed, previously
the cache was not cleared for Alias to name mapping.
2012-09-20 12:42:43 +07:00
Shannon Deminick 6e4929b84d Fixes recent commits and aspx files not being edited in the correct place and split the aspx files + codebehinds properly so there's no confusion over
which one to edit.
2012-09-20 07:31:32 +07:00
Shannon Deminick f912d465c5 Moved BaseRestHandler out of the BaseRest namespace.
Updated PublishedMediaStore and wrote a bunch of unit tests for it which are all now passing.
2012-09-20 07:13:45 +07:00
Shannon Deminick 3e292b77ad Merge 2012-09-20 03:47:34 +07:00
Shannon Deminick dc000ea33c Update to DefaultPublishedMediaStore, changed namespace for some unit tests. 2012-09-20 03:47:24 +07:00
sebastiaan aaa8cafd0b Merge 2012-09-19 12:45:24 -02:00
sebastiaan ce0923cfc6 Uploading media with hyphens get a space added before the hyphen
New media uploader: illegal characters in the filename are not filtered
New media uploader: IE in intranet mode stores the whole path
Fixed U4-882 U4-883 U4-874
2012-09-19 12:45:11 -02:00
Casey Neehouse 7473557580 Removed umbracoApp and umbracoAppTree Foreign Keys from SqlAzure install script. 2012-09-19 15:02:02 +04:00
sebastiaan 982ba0f4b0 Corrected bug where PropertiesPane was only shown on media items 2012-09-19 07:49:51 -02:00
sebastiaan 278c1fefaa Merge 2012-09-19 06:20:09 -02:00
Matt@MBP13-PC 71b2137513 Merge 2012-09-18 13:25:56 -01:00
Matt@MBP13-PC 2952992ffe Fixed "inception" media tree bug due to recycle bin auto initializing when it shouldn't 2012-09-18 13:25:17 -01:00
sebastiaan 0dbd214b00 Merge 2012-09-18 09:16:22 -02:00
sebastiaan 90ca566e53 Little cleanup of some left-behind files 2012-09-18 09:14:38 -02:00
Stephan aa633bbbb2 merge 2012-09-18 08:55:39 -02:00
Stephan 2c204d9d9e refactor base/rest module into a handler so that it works again with the new UmbracoModule 2012-09-18 08:54:54 -02:00
Hendy@Blueberry 8307da1a87 XPath CBL / DDL prevalue descriptions for the XPath fields, and fix for CBL to load defaults 2012-09-17 21:21:33 -01:00
sebastiaan d339f74e95 Thanks to Darren Ferguson - Media items should indicate which Media Type (in Properties tab)
#U4-679 Fixed
Add "url to this file" label to property tab in media
#U4-173 Fixed
2012-09-17 10:53:22 -02:00
sebastiaan 59fe173933 Removed old and completely unused GraphicHeadlineFormat config setting
Some updates to umbracoSettings.config
Thanks to Jan Skovgaard for the help!
2012-09-17 07:47:13 -02:00
dseefeld ca55579982 Error: Delete media item with upload property - empty recycle bin fails
Fixed #U4-771
2012-09-17 04:06:53 -02:00
Darren@Darren-VAIO b5099c37c7 Standard doc type properties no longer prefixed with @ in "Insert Umbraco page field" dialogue
Fixed #U4-859
2012-09-16 10:49:19 -02:00
Macke@MacsonServer 2826fbd807 Fixes #U4-840 Changed the blog url in MetaWeblog API. Url-property of getUsersBlogs, will now contain the full url to the blog, not just the "server_name". 2012-09-16 09:41:53 -02:00
sebastiaan b5d209677e Changed scriptDisableEditor comment to reflect new js lib and it's now also working in IE
Thanks to Jan Skovgaard for noticing it was wrong!
2012-09-16 09:16:26 -02:00
sebastiaan b15d03a54d #U4-784 Fixed
Member.MakeNew duplicate LoginName exception message uses wrong data
2012-09-15 08:43:06 -02:00
sebastiaan 247aa08d57 Fixes U4-778 - Visualize XSLT is not working. 2012-09-15 08:32:25 -02:00
Shannon Deminick 394078d470 Merge 2012-09-15 12:19:53 +07:00
Shannon Deminick 91834e8f53 Migrated logic to create a DataTable from a Node or pretty much any other object in to a central place so we only have to maintain code in one place.
Now need to just test it with Node and create the DynamicNode extension methods for returning as a DataTable.
2012-09-15 12:17:42 +07:00
sebastiaan 201bc2d1ab Merge 2012-09-14 11:23:42 -02:00
sebastiaan 29ed7bf8ae Fixes U4-776 umbraco:item xslt property not rendering in template - Thanks to Michael Wulff Nielsen for the quick spot and contribution! 2012-09-14 11:19:57 -02:00
leekelleher 26f32bab8e Dashboard controls: Tidied up the UI.
Made use of ClientDependency for CSS/JS includes.
CSS tweaks for success/notice/error messages.
Removed from "Umbraco.Web.UI" project, master version now in "Umbraco.Web"; (confirmed with Seb)
(MediaDashboardFolderBrowser.ascx was missing from "Umbraco.Web" - added)
2012-09-14 11:41:30 -01:00
Shannon Deminick 1566b16f0f Migrated most of the functionality from RazorLibraryCore to UmbracoHelper and updated RazorLibraryCore to call
the methods in UmbracoHelper so we only have to maintain one set of code. Didn't port over the Wrap methods because
I need feedback on these as to what they do/are supposed to do.
Added the Media methods to UmbracoHelper using the media store stuff.
2012-09-14 09:09:23 +07:00
Shannon Deminick 0a8b1cc784 Big cleanup of DynamicDocument, removed DynamicBackingItem for this implementation as it is not required.
Removd DynamicBackingItemType since media and content are the same.
2012-09-14 07:28:44 +07:00
Matt@MBP13-PC c441887a96 Updated treePicker dialog to allow the passing in of a NodeKey via querystring 2012-09-13 18:00:25 -01:00
Matt@MBP13-PC 32d76cc143 Fixed issue with AbstractPrevalueEditor throwing WebResource 404s when implemented by a type outside of the umbraco.editorControl namespace 2012-09-13 17:58:18 -01:00
sebastiaan 4340df53fd U4-843 Number of "Last Edits" is now configurable. 2012-09-13 14:42:59 -02:00
sebastiaan f6c6f4f0c0 U4-55 Remove Linq to Umbraco from the core - Removes the menu item as well 2012-09-13 11:23:19 -02:00
Shannon Deminick 18713fe513 Fixes one test with DynamicNode 2012-09-13 13:38:51 +07:00
Shannon Deminick a1edad4e08 Fixed DynamicNodeTests with db support 2012-09-13 13:02:02 +07:00
Shannon Deminick 1c040912f6 Exposes the IDocument property as CurrentDocument on the Model for MVC pages. 2012-09-13 12:28:08 +07:00
Shannon Deminick 458f1d3b8f Fixed setting the Is404 flag 2012-09-13 12:23:58 +07:00
Shannon Deminick 9e5f2f3c9a Fixed template engine selection... oops :) Should all work now!
Fixed DefaultPublishedContentStore to correctly find a secondary root document that doesn't have a domain assigned.
2012-09-13 12:19:56 +07:00
Shannon Deminick f6022c8dda Merge 2012-09-13 11:48:16 +07:00
Shannon Deminick 0ed15db408 Fixed the NiceUrlProvider as it some refactor on a previous commit broke some stuff.
Fixed up some unit tests with NiceUrlProvider to ensure that the second node under the root get's
the correct URL assigned.
Added unit test to ensure that route caches are persisted correctly.
2012-09-13 11:45:06 +07:00
Shannon Deminick c742c6c249 Created new GlobalSettings unit tests to validate reserved paths as well as updated the umbraco module tests with an install path without
the suffixed '/'. Fixed a bug with the reserved paths which was caused by code written in 4.9 to the new code written in 4.10 and the combined
effort was not working. Added more logic to cleanup the URL before comparing too.
Cleaned up GlobalSettings to not have any reliance whatsoever on httpcontext (which of course it shouldn't and not sure why it even did before).
Obsoleted a few methods on the legacy GlobalSettings that aren't used anywhere and should be removed in the future.
Cleaned up a bit of the UmbracoModule with the URLs used.
2012-09-13 09:00:21 +07:00
Shannon Deminick b06a4d2e13 Merge 2012-09-13 06:48:16 +07:00
Shannon Deminick 89cd2772dc add note 2012-09-13 06:48:06 +07:00
Morten@Thinkpad-X220 48c69b9335 Fixes U4-781 Removed duplicate swedish language file. 2012-09-12 05:57:27 -02:00
sebastiaan e8d6f694e7 Added back missing translation trees 2012-09-12 04:22:39 -02:00
sebastiaan 253b58aafb Corrected bad merge (again) 2012-09-11 06:42:00 -02:00
sebastiaan a864fc1fe8 Fix merge problem 2012-09-11 05:29:36 -02:00
sebastiaan 8a5cd21603 Merge with default 2012-09-11 05:02:33 -02:00
Shannon Deminick f2a7b3b255 Updated the published content stores so that content doesn't inherit from media, instead there is a base
interface IPublishedDataStore.
Simplified the interface structure and removed the GetDocumentProperty method as it is not needed and i think existed
before we updated the codebase to not rely on xml.
2012-09-11 05:58:16 +07:00
Shannon Deminick d5ca5e32b4 Fixes the issue with trailing slashes and the comparison in GlobalSettings and updated unit tests
to support the fix.
2012-09-11 05:27:39 +07:00
Shannon Deminick 37969909ca Updated the DynamicDocument and node unit tests to not init a db each time, runs much faster though in the future
we might have to re-enable this in a smart way.
2012-09-11 04:43:30 +07:00
sebastiaan fe92947d72 TeamCity build fails on missing Views\Home.cshtml in Umbraco.Web.UI, removed it. 2012-09-10 12:15:03 -02:00
sebastiaan b9165a8b70 TeamCity build fails on missing App_Code\TestClass.cs in Umbraco.Web.UI, removed it. 2012-09-10 12:10:17 -02:00
Shannon Deminick 27bcea78d2 Started implementing new IPublishedMediaStore which will replace the notion of the legacy ExamineBackedMedia and
moving forward will open up many nice opportunities. This will be used for the media accessor in the new DynamicDocument.
Renamed XmlPublishedContentStore to just DefaultPublishedContentStore.
Made GetProperty an extension method for IDocument and removed from the interface as it is not needed there.
2012-09-08 13:22:45 +07:00
Shannon Deminick ce9be79ec6 Added the Examine Search methods to DynamicDocument as extension methods.
Renamed a few things.
2012-09-08 11:59:01 +07:00
Shannon Deminick d83887e314 Ported updates to DynamicDocument to allow dynamic access to RTE content and still have it
render all embedded macro content without resorting to use some other mechanism.
Fixes the .Field method of the UmbracoHelper.
2012-09-08 11:30:19 +07:00
Shannon Deminick 59fa733156 Created MacroTagParser and updated ItemRenderer to use it. Have DynamicDocument rendering RTE content
with macro content without having to use any special methods, we just use a new custom Property Editor value converter.
Now just need to port this over to DynamicNode too.
Obsoleted a method on the 'helper' class to something much more meaningful... hopefully we can do that with the rest of that class too.
2012-09-08 07:13:03 +07:00
sebastiaan 534c28046a Added tag Release-4.9.0 for changeset 09f5a69cf19e 2012-09-07 07:10:51 -02:00
sebastiaan 4056b47d32 Removed tag Release-4.9.0 2012-09-07 07:10:32 -02:00
Shannon Deminick 5e9d791523 Moved the DocumentNotFoundHandler to diff namespace, created new NoTemplateHandler and updated the engine
to route to it when no template is selected and when there are no hijacked routes.
2012-09-07 08:28:18 +07:00
Shannon Deminick 9127061194 Added support for determining rendering engine based on template chosen. 2012-09-07 07:57:25 +07:00
Shannon Deminick 9563526108 re-reverted the global settings stripping trailing slashes as it is needed for the new
Routing pipeline.
2012-09-07 06:26:34 +07:00
Shannon Deminick 61d7dba2c0 Merge with 4.9.0 2012-09-07 06:24:51 +07:00
Shannon Deminick 8081d1d97b Merge with 4.9.0 2012-09-06 12:20:20 +07:00
Shannon Deminick 36c6dbb6be updated a doc 2012-09-05 09:36:30 +07:00
Shannon Deminick 56b7f8d98b Got .Field method for MVC working and have macro's rendering inside of RTE in MVC.
Added internal setting for global settings to return an MVC area string based on the umbraco path.
Added a ton of extension methods from v5 that are used in much of the MVC engines.
Added UmbracoHelper methods for MVC rendering including Field so that we can render the correct RTE
field markup when the RTE contains a macro, will add extension methods for the @CurrentPage dynamic object to
do the same to make it consistent.
2012-09-05 09:35:24 +07:00
Shannon Deminick bba5e6a59a Fixed issue with new UmbracoModule trying to strip the legacy umbPage query string stuff too early (still need to ask Niels about what this does)
Fixed issue with page update with Document ctor to try catch the Parent property. Removed a bunch of erroneous tracing and replaced with LogHelper.
2012-09-05 08:01:53 +07:00
Shannon Deminick 4dc181b4de Merge with 4.9.0 2012-09-05 07:25:31 +07:00
Shannon Deminick 792860a7bb updated a TODO 2012-09-05 07:22:39 +07:00
Shannon Deminick c3747d70ce Added ObjectExtensionsTests, Added functionality for MVC to render any macro types (i.e. razor and xslt, etc..)
Adds UmbracoHelper as a property to the RenderViewPage for MVC. Tested rendering Xslt and Razor macros with and
without parameters and works well.
Next we need to get the RTE rendering with macros embedded in MVC.
2012-09-03 07:54:09 +07:00
Shannon Deminick 2fc0fe574b Fixed XmlDocument GetProperty to check for user properties 'invariantly'.
Added a method on content to remove the file persistence queue just before it's written based on the module, this should hopefully speed things up and fix some potential issues.
Added an overloaded method on library for UpdateDocumentCache which should save on a few dozen sql calls when publishing a node since we already have
the Document object reference yet we were looking it up again for no reason.
2012-09-02 07:35:57 +07:00
Shannon Deminick a293f53438 Fixes type finder to ensure editorControls are found 2012-09-01 08:52:14 +07:00
Shannon Deminick 85b7574f43 Fixed unit test 2012-09-01 08:30:44 +07:00
Shannon Deminick c961eb368c Fixed up NiceUrl caching inconsistencies 2012-09-01 08:27:16 +07:00
Shannon Deminick 529c52844d Started writing NiceUrlProvider unit tests as there are a bunch of issues with it. Have fixed one of them.
Updated unit test hierarchy of classes so that if one doesn't require a db it can opt out and thus it runs much much faster.
2012-09-01 08:11:40 +07:00
Shannon Deminick 6949178f4b removed formHandlers.config... pretty sure we removed this functionality about a zillion versions ago.
Removed old Nant build folder and files.
removed the umbVersion query string check as this was used for the old preview functionality and isn't used anymore (plus it could never work the way its implemented).
2012-09-01 07:03:56 +07:00
Shannon Deminick 30ec9406de Merge with 4.9.0 2012-09-01 06:20:36 +07:00
Shannon Deminick 04f49d42cf Added unit tests for LookupByPageId ILookup 2012-08-31 07:43:09 +07:00
Shannon Deminick f0148ae833 Added more backwards compatibility to default.aspx 2012-08-31 07:27:17 +07:00
Shannon Deminick 4ced9cf8b2 updated more backwards compatibility with default.aspx 2012-08-31 07:22:41 +07:00
Shannon Deminick d0ab7e505d Updated unit tests for the module to inherit from proper base classes.
Updated default.aspx to support more backwards compatible features that had been removed, there
was a lot of breaking changes there!
2012-08-31 07:19:54 +07:00
Shannon Deminick b511ae3a1a Created new LookupByIdQuery ILookup which is now the first thing that is looked up. Have cleaned up
all of the default.aspx stuff so that no routing logic takes place there, all routing logic now takes
place entirely in the module.
2012-08-30 08:26:01 +07:00
sebastiaan 85d7d5e7cf Fixes U4-708 Sort order for new nodes is set wrong when the max sortorder != number of nodes 2012-08-29 13:48:34 -02:00
Shannon Deminick 05ebc8d2f9 Changed the Template prop of documentrequest to be a new TemplateLookup object since we are going
to need to support MVC and the old Template object is for webforms. I've added a lot of TODO's here
because we'll need to enable the lookups properly in each ILookup and also set the rendering engine (IsMvc)
in the ILookups too. This hasn't been enabled, yet, just a bunch of TODO's written.
2012-08-29 08:54:29 +07:00
Shannon Deminick b86d513aff Updated the new module to handle when no template is found (blank page) instead of the handlers (webforms or mvc) handling this. 2012-08-29 08:17:31 +07:00
Shannon Deminick c251c9f0d3 Changed the Is404 property on the doc request to be set by the last chance lookup, not by the module
because in the future if people override the last chance lookup, they might not want it to be 404, it will
be up to them.
2012-08-29 08:10:10 +07:00
Shannon Deminick 7be4480254 added HasValue unit test, removed the default.aspx file from the Web project, it now only exists in the UI project but
the codebehind still exist in the web for backwards compatibility. Updated the logging so that the LogHelper
can now write to a TraceContext specified if debugging which is handy if we want to write to the normal trace.
2012-08-29 07:47:16 +07:00
Shannon Deminick 3cd1592abc Added better support for Skip for DynamicDocument and DynamicNode and added unit tests. 2012-08-28 09:33:34 +07:00
Shannon Deminick bc3a5122dd Fixes DynamicNode issue not implementing IEnumerable<DynamicNode>
Adds a few unit tests for DynamicDocument/DynamicNode and fixes both to properly support the 'Take' method
as this wasn't really working. Not sure how or why it was working previously. Have also allowed for extension
methods to be executed against either of these objects that accept IQueryable which was not supported before.
2012-08-28 09:20:30 +07:00
Shannon Deminick 4d2b145369 Merge 2012-08-28 06:51:11 +07:00
Shannon Deminick 32350fd35a adds some docs 2012-08-28 06:51:01 +07:00
jholland@HQLT-JHolland.SCRIBEHQ.local a922272c67 Included swfobject.swf
Fixes: U4-624
2012-08-27 19:38:32 +04:00
jholland@HQLT-JHolland.SCRIBEHQ.local 3c7b5d7522 Widened content name field in backoffice
Fixes: U4-369
2012-08-27 23:33:06 +04:00
azzlack 33c07a2390 Updated AbstractDataEditor and AbstractDataEditorControl code comments. 2012-08-27 16:19:13 -02:00
"azzlack" d2210e9985 Updated AbstractDataEditor and AbstractDataEditorControl code comments. 2012-08-27 16:08:17 -02:00
Ove@EyeCatch-MPC 48e8e12877 Reverted some changes to AbstractDataEditorControl in 7260 to retain backwards compatibility. 2012-08-27 14:59:39 -02:00
sebastiaan 2b248e621c Merge in Azzlack/AbstractDataEditorFix 2012-08-27 11:14:06 -02:00
sebastiaan edfe6ed547 Merge uQuery dictionary fix from Azzlack/uQueryDictionaryFix 2012-08-27 10:48:13 -02:00
sebastiaan 6cffa06bd6 Merge 2012-08-27 08:08:26 -02:00
sebastiaan d08946c822 Merge 2012-08-27 08:07:50 -02:00
sebastiaan 6892c1afb8 Merge fixes getnodeidbypathlevel regression
http://ucomponents.codeplex.com/workitem/14727
2012-08-27 08:06:54 -02:00
sebastiaan 7cecb01ffd Merge fixes getnodeidbypathlevel regression
http://ucomponents.codeplex.com/workitem/14727
2012-08-27 08:06:30 -02:00
Matt@MBP13-PC 38d3d6b575 Updated ImageMediaFactory to support png transparency
Updated UmbracoFile to remove '.' from gif extension check
2012-08-27 08:01:51 -01:00
Shannon Deminick 528b06f692 Got the RenderViewPage rendering with the new DynamicDocument for the @CurrentPage property 2012-08-25 07:14:23 +07:00
Shannon Deminick 92602e3480 Added unit tests for legacy DynamicNode which now just runs tests on the abstract class so we share tests between
DynamicDocument and DynamicNode.
Fixes: #U4-691
Fixes: #U4-690
2012-08-25 07:07:00 +07:00
Casey Neehouse f18e59575f Changed versionDate to be set from application as possibly related to u4-387 2012-08-24 21:58:53 +04:00
Shannon Deminick 64c9d97e53 Got extension methods working on DynamicDocument/DynamicDocumentList and added unit tests
for them.
2012-08-24 23:44:47 +07:00
Shannon Deminick 71fd352ea5 Merge with 4.9.0 2012-08-24 22:41:27 +07:00
Shannon Deminick fbd20fd4b1 Removes 'OLD' root folder 2012-08-24 22:41:00 +07:00
Shannon Deminick b0f77a38f0 Merge with 4.9.0 2012-08-24 22:38:03 +07:00
leekelleher bf5c3bf5ae Fixes U4-688 - 4.8.1 can't upgrade using SQLCE
(Also preparation for resolving U4-677 - SQLCE Medium Trust)
2012-08-24 13:56:39 -01:00
leekelleher e9e598d32c Corrected typo (macro/xsltExtensions) 2012-08-24 13:14:52 -01:00
PerPloug b2eeb6a70d Script rename, fixes a couple of IE bugs, much more stable now, much better in
IE now, so with a bit of more thorough use, it could be included by default for
IE
2012-08-24 07:01:54 -02:00
PerPloug 9e4cf35370 Small script name change to reflect custom codearea script 2012-08-24 07:00:04 -02:00
leekelleher ebd87e0eaa Implemented U4-86 - Move EXSLT references from being predefined in core to xsltExtensions.config 2012-08-23 17:55:45 -01:00
Shannon Deminick d369567f3f Fixes .proj merge issue 2012-08-23 23:13:55 +06:00
Shannon Deminick ba0b0ea52d Merge with 4.9.0 2012-08-23 22:33:52 +06:00
Shannon Deminick f36a88384d Migrated UmbracoSettings, GlobalSettings, XmlHelper, IOHelper and supporting classes to Umbraco.Core.
This fixes the need for Umbraco.Core to reference business logic since business logic needs to reference
Umbraco.Core (Umbraco.Core should never reference any other project except for interfaces, it is the 'Core'
of the new codebase.
2012-08-23 22:28:22 +06:00
Shannon Deminick 7fb89da4db Merge with 4.9.0 2012-08-23 22:05:07 +06:00
leekelleher 19f7ba1ef4 MNTP: Applied CSS fix to the header style. Bug raised on uComponents.
http://ucomponents.codeplex.com/workitem/14746
2012-08-23 14:19:00 -01:00
leekelleher 23532b0ec8 Nested a Web.config transform file 2012-08-23 11:01:31 -01:00
leekelleher 47042ed3d3 Implemented U4-193 - Feature Request: Add meta tag to enable use of Chrome Frame in IE 2012-08-23 10:49:50 -01:00
leekelleher 0c57e0e6eb Updated my web.config transforms for Medium Trust support 2012-08-23 10:49:19 -01:00
Hartvig@UMBRACOTESLA ace18acd7e Missing web.config.templates and a missing stylesheet for the codemirror 2012-08-22 19:01:14 -02:00
Casey Neehouse b91fa1a8f2 Fixes Issue U4-387 - HasPendingChanges method was added and the comparison was
converted from rounded seconds into milliseconds.  So effectively time was set
from 1.5 seconds lapse to .5 seconds lapse. Change to 2 seconds lapse.

May still occur on slow db connections or rather large document types.
//original code commented in the Tree:
Math.Round(new TimeSpan(dd.UpdateDate.Ticks - dd.VersionDate.Ticks).TotalSeconds, 0) > 1
2012-08-22 18:46:55 +04:00
PerPloug 7a84761810 Fixes build errror because method GetPropertyTypes() has been replaced with
GetAll() - this is a breaking change who the F* changed that?
2012-08-22 12:02:28 -02:00
PerPloug 18200aa997 Flet 2012-08-22 12:00:04 -02:00
PerPloug bd0ebeb092 Dublicate files in Umbraco.Web.UI 2012-08-22 11:59:42 -02:00
PerPloug 358610655b Changes to javascript and css editors 2012-08-22 11:58:32 -02:00
PerPloug fa3f79c0e4 Changes to Pythin (cshtml) xslt and template editors 2012-08-22 11:55:57 -02:00
PerPloug d25fae730d Custom umbraco code area wrapper changes around codemirror 2 2012-08-22 11:55:19 -02:00
PerPloug 5b150c74ac Codemirror 2 core files 2012-08-22 11:54:40 -02:00
PerPloug 83fcdcfd86 CodeArea Control to support Codemirror 2 options 2012-08-22 11:53:57 -02:00
hartvig bd058d649a Fixes U4-673 2012-08-22 11:05:25 -02:00
hartvig ec638b9c3e Fixes U4-672 2012-08-22 10:20:59 -02:00
Matt@MBP13-PC 7b4bf6e502 Fixed issue with file uploader not working in IE
Fixed issue with folder browser response getting cached
2012-08-22 07:03:50 -01:00
Shannon Deminick d7f8214d24 Got extension methods working for DynamicDocument. Exposes some new APIs publicly because they need to work with type finding and med trust, plus we need to expose these for MVC 2012-08-22 08:33:19 +06:00
Shannon Deminick 22c0350a4a Have deprecated more of the dynamic class in the macroEngines project to proxy to the
classes in the Umbraco.Core project.
2012-08-22 07:47:21 +06:00
Shannon Deminick 3222d39808 Moved all classes for legacy DynamicNode into seperate files so we can easily identify what is there and
obsolete them properly.
2012-08-22 07:08:05 +06:00
Shannon Deminick 33c339a724 Moved all classes for legacy DynamicNode into seperate files so we can easily identify what is there and
obsolete them properly.
2012-08-22 07:07:52 +06:00
Shannon Deminick e9c793cede Fixed difficult merge 2012-08-22 05:57:34 +06:00
Shannon Deminick 1cbd355a2a Merge with 4.9.0 2012-08-22 05:38:45 +06:00
Shannon Deminick bee73cce12 Changed IApplicationEvents to IApplicationEventHandler.
Removed all reflection calls to BindingFlags.NonPublic which was mostly used by DynamicNode, this will
not work in medium trust.
2012-08-22 05:21:02 +06:00
Matt@MBP13-PC f5d258b42d Added thumbnail size selector to folder browser 2012-08-21 08:59:10 -01:00
Matt@MBP13-PC c1278674c3 Added throbber to library to show progress whilst loading media items 2012-08-21 08:17:07 -01:00
Matt@MBP13-PC 605e66c159 Fixed issue with Media factories saving relative file path rather than URL
Added styling to file uploader to show errored and canceled uploads including tooltip message
2012-08-21 07:53:07 -01:00
Matt@MBP13-PC b86bbb0e82 Tweaked some file uploader styles 2012-08-21 07:06:07 -01:00
Matt@MBP13-PC 930dd74edb Merge 2012-08-21 06:54:52 -01:00
Matt@MBP13-PC d30b5b0b2c Updatedt TinyMCEWebControl.cs to use IFileSystem 2012-08-21 06:42:01 -01:00
leekelleher 8e785cc215 Resolved U4-385 Hard Coded word "Packages".
The tree alias was called "packager" instead of "packages".
(Will update the GitHub Localization project too!)
2012-08-20 21:16:27 -01:00
Matt@MBP13-PC efe0970245 Updated UmbracoMetaWeblogAPI.cs to use IFileSystem 2012-08-20 13:55:51 -01:00
Matt@MBP13-PC 15264d36f0 Removed unused method from TinyMCEWebControl 2012-08-20 12:37:30 -01:00
Matt@MBP13-PC 298e06974e Updated mediaService to use IFileSystem 2012-08-20 12:36:56 -01:00
Matt@MBP13-PC 91acf40b3b Updatedt tinyMCEImageHelper to use IFileSystem when creating scaled images 2012-08-20 11:56:16 -01:00
Matt@MBP13-PC 085f4a4fcf Updated Document code to use IFileSystem when copying
Added some helper extention methods for IFileSystem
2012-08-20 11:42:18 -01:00
Matt@MBP13-PC 3e2510cbda Added code to auto seek stream to begining when saving via IFileSystem just in case 2012-08-20 10:51:14 -01:00
Matt@MBP13-PC 2775d9bedc Removed AbstractFileSystem in favour of extension methods
Updated UmbracoFile to use IFileSystem
Updated UmbracoMediaFactories to use IFileSystem
2012-08-20 10:46:32 -01:00
Matt@MBP13-PC 7afbc8e7bf Merge 2012-08-20 09:43:19 -01:00
Matt@MBP13-PC 3a2ed918de Added dynamic wrapper support to IFileSystem to allow context specific implementations from which to hang extension methods upon (ie IMediaFileSystem) 2012-08-20 09:42:32 -01:00
Matt@MBP13-PC 847b3523a8 Made folder browser filtering client side 2012-08-20 09:41:28 -01:00
Shannon Deminick 72ac3532d2 Updated DynamicDocument to be much more readable and allows for inheriting the structure so we can potentially use it
in DynamicNode (to be inherited from)
2012-08-20 11:22:45 +06:00
Shannon Deminick e24e3af955 Added DynamicDocument tests for getting a converted value for a custom PropertyEditorValueConverter, updated
DynamicDocument with performance enhancements, should perform much quicker for multiple requests for the same property now.
2012-08-20 09:11:14 +06:00
Casey Neehouse 3180b5c5b6 Additional RenderTemplate modification to reset context in error situations. 2012-08-19 11:25:44 +04:00
Casey Neehouse 480f73dba7 Corrections to RenderTemlate(pageId) method to reset context and remove
altTemplate from the rendering page.
2012-08-19 09:26:13 +04:00
Shannon Deminick 56a13c5e0c Created new IPropertyEditorValueConverter for use with DynamicDocument so we don't have to rely on
any more xml configuration sections to created and add value 'mappers' / converters. This saves on tons
of code and makes it really easy for devs to handle their own conversions for use with dynamic node.
2012-08-18 11:39:18 +06:00
Shannon Deminick 7175860ae0 Added tests for dynamic node to select children based on the child doc type names including pluralized names and added
support for checking with case insensitivity. Example. CurrentPage.NewsItems where NewsItem is a child doc type alias.
Found one reason why the old dynamic node has performance issues and have added a note, just need to do more reseearch to
make sure my findings are correct.
Changed over all of the new DynamicNode classes to be DynamicDocument instead.
2012-08-18 11:03:30 +06:00
Shannon Deminick 9177257952 Fixed/Cleaned up new dynamic node, added more support for member properties such as propertyId and added much better
support for camel case vs pascal case names. Also added support for returning the strongly typed value for reflected properties.
Also added support for handling "@" prefixed property names when using GetProperty("@Id") or similar.
Added unit tests for all of the above and other dynamic node methods.
2012-08-17 14:02:29 +06:00
Shannon Deminick 3da387591d Deprecated many of the classes for Dynamics in the macro engines project and proxied these calls
to the superceded classes.
2012-08-17 06:22:51 +06:00
Shannon Deminick 5213d6de5c renamed IContentStore to IPublishedContentStore. Migrating DynamicNode to Umbraco.Core and cleaning up it's supported codebase.
Starting writing a few unit tests for the new DynamicNode codebase. Will of course leave the original DynamicNode stuff in its
current place for backwards compatibility but will deprecate many of the classes which will call the new ones.
2012-08-17 04:27:47 +06:00
Matt@MBP13-PC bd5182792e Added double click to edit support 2012-08-16 10:31:00 -01:00
Matt@MBP13-PC b057b6d68a Implemented media sorting 2012-08-16 10:03:37 -01:00
Matt@MBP13-PC 0bc1234a4e Fixes issue with missing master pages
Re-added missing build script
2012-08-16 07:06:46 -01:00
Casey Neehouse 8b76f2a893 Added hostname to title on login.aspx for support purposes. 2012-08-16 02:27:08 +04:00
Casey Neehouse 943e53f655 Adding config template. 2012-08-16 01:15:54 +04:00
Shannon Deminick 9846d6dc4d Merge with 4.9.0 2012-08-15 23:21:12 +06:00
Shannon Deminick 4e9f9b77f4 Created CultureDictionaryFactoryResolver for use in the new MVC views which returns a ICultureDictionary.
This allows us in the future to use any type of data source for the dictionary. Have obsoleted the old
ICultureDictionary in the macro engines project (where it doesn't belong anyways). The new one doesn't expose
the 'Language' property to the front-end because this is a business logic class which means designers can just delete
a whole language from the db by calling 'Delete' on the object !
2012-08-15 23:20:37 +06:00
Shannon Deminick 91e9392992 Re-removed umbraco version header after bad merge and removed from new routing module.
Started addding new ICultureDictionary since this cannot belong in the macros project.
2012-08-15 21:21:31 +06:00
hartvig 6093e4ff5e Adds CDT property to ContentType class 2012-08-15 09:07:28 -02:00
Shannon Deminick 2f4a18087d Fixes issue with trailing slashes and reserved urls 2012-08-15 01:23:57 +06:00
Shannon Deminick f52ae8c46b Adds unit tests for LookupByNiceUrlAndTemplate and fixes issues for when paths contain .aspx 2012-08-15 01:01:21 +06:00
Shannon Deminick ce53f400a8 Re-instated the build script... this got deleted during a bad merge!
Fixed the UI proj file with the correct attributes for the FileSystemProviders.config
2012-08-15 00:22:42 +06:00
Shannon Deminick b9b24990b6 Merge with 4.9.0 2012-08-15 00:08:38 +06:00
Shannon Deminick b596b3584e Added lookup by id tests. 2012-08-14 23:56:23 +06:00
Shannon Deminick 05f8778e40 Adds another unit test for the RenderRouteHandler 2012-08-14 23:42:44 +06:00
Shannon Deminick ed4de4465f Added RenderRouteHandlerTests 2012-08-14 23:35:34 +06:00
Matt@MBP13-PC 766a834f53 Updated the Image thumbnail provider to use IFileSystem 2012-08-14 12:24:51 -01:00
Matt@MBP13-PC 546b53f9b0 Merge 2012-08-14 09:12:36 -01:00
Matt@MBP13-PC e2274b7892 Hooked up IFileSystem to the file uploader / IFile 2012-08-14 09:11:49 -01:00
hartvig c11bc9559c Implements U4-165 2012-08-14 07:45:47 -02:00
Shannon Deminick d95b688a7f Adds new IUmbracoEvents: #U4-164 2012-08-14 12:03:34 +06:00
leekelleher d329123cda U4-163 Picker Relations - reincluded data-type; previous fixes for U4-162 resolved issues. 2012-08-13 23:02:17 -01:00
leekelleher aceb5b0203 U4-162 Relation Types - Resolves MySQL issues; re-enabled Tree attribute.
Changed umbraco.DataLayer project to use .NET 4.0, (was previously using 3.5), reason being that we could use Guid.Parse.
Also resolves workitem:30434 - Error when copying node and keeping relation between original and copy.
2012-08-13 22:45:01 -01:00
Matt@MBP13-PC 524244d1ec Added FileSystemProviders config section
Added FileSystemProviderManager class for fetching a file system provider by alias (this should probably be moved into the Umbraco context in 4.10)
2012-08-13 13:26:06 -01:00
Matt@MBP13-PC ad291265f3 Added PhysicalFileSystem constructor overload to work out the rootPath / rootUrl from a virtualRoot path (Can only work with a valid HttpContext) 2012-08-13 10:23:45 -01:00
Matt@MBP13-PC d2ac9158c6 Added IFileSystem
Fixed issue with last merge
2012-08-13 10:04:31 -01:00
Matt@MBP13-PC f6e59e0264 Merge with 4.8.1 (2nd) 2012-08-13 06:38:43 -01:00
Matt@MBP13-PC 8afa6298e0 Merge with 4.8.1 (2nd) 2012-08-13 06:24:52 -01:00
shannon@ShandemVaio f6436d2eee Added unit tests for LookupByAlias which are now all passing. 2012-08-10 23:46:09 +06:00
shannon@ShandemVaio 813fcf5903 Fixed up minor issues with content store changes, web site is now rendering with new IDocument engine. 2012-08-10 13:55:22 +06:00
shannon@ShandemVaio c522ad6e30 Created an ContentStoreResolver so we can specify a custom ContentStore which means we can return a custom
IDocument. This now means we've opened up the possibility of an abstracted routing lookup system to map to a Document
stored anywhere. By default this is obviously Xml but could theoretically be anything, still internal until more review
of the API is done.
2012-08-10 13:38:02 +06:00
shannon@ShandemVaio a858712bcc Change namespace from Umbraco.Web.Model to Umbraco.Web.Models 2012-08-10 13:19:25 +06:00
shannon@ShandemVaio e131011667 Rename namespace from Umbraco.Core.Resolving to Umbraco.Core.ObjectResolution 2012-08-10 13:18:13 +06:00
shannon@ShandemVaio 3415554142 Moves types into matching files. 2012-08-10 13:11:37 +06:00
shannon@ShandemVaio 61c4a9e68d Created IDocument and IDocumentProperty to one day replace INode since it doesn't contain enough information
and is poorly formatted, this now allows us to properly abstract an IDocument using the new IContentStore which now
returns IDocument instead of XmlNode so we now have an abstraction away from Xml for routing.
2012-08-10 13:08:47 +06:00
shannon@ShandemVaio 7280dbc66e Finished LookupByNiceUrl unit tests, all passing. 2012-08-09 11:22:34 +06:00
shannon@ShandemVaio 67e921f862 Added check to UriUtility to check for default.aspx since this path will show up for pre-IIS7 websites, added
unit tests for UriUtility, updated UmbracoModule to use the UmbracoUrl to pass to the document request.
Added more unit tests for LookupByNiceUrl.
2012-08-09 11:08:24 +06:00
shannon@ShandemVaio e75aebc4fd Fixed up an issue with the ContentStore, added more unit tests to prove the fix is correct, added more unit tests
for the LookupByNiceUrl IDocumentLookup which all pass.
2012-08-09 07:41:13 +06:00
shannon@ShandemVaio 2e5db72a09 Updated DocumentRequest so that it doesn't actually do the searching, it acts more like a model.
The DocumentSearcher now performs the searching and sets the properties on the DocumentRequest, this
simplifies the dependencies between the contexts. Updated the LookupByNiceUrlTests unit test, now all
initialization is working and the test runs which will be the basis for testing all of the IDocumentLookups.
2012-08-09 04:15:35 +06:00
shannon@ShandemVaio 739de3ef78 Started writing tests for all DocumentLookups as these all require many tests including tests for
routes when using IIS 7 and pre-IIS 7 platforms.
2012-08-08 23:55:55 +06:00
shannon@ShandemVaio 626b9ceefa Updated Web.UI project to support MVC and VS MVC dialogs.
Updated RenderViewPage to include UmbracoContext and DocumentRequest.
2012-08-08 23:37:54 +06:00
shannon@ShandemVaio 4111298b00 Got routing working properly with MVC and our HttpModule 2012-08-08 23:10:34 +06:00
Matt@MBP13-PC cd56882845 Media grid now refreshes after uploads have completed 2012-08-08 12:09:22 -01:00
Matt@MBP13-PC 37ddb9223f Added friendly name support to DMU webservice to allow uploaded files to set the media items friendly name 2012-08-08 11:54:52 -01:00
Matt@MBP13-PC 44a15900c7 Removed upload method from FolderBrowserService as re-using the DMU web service instead 2012-08-08 09:26:25 -01:00
Matt@MBP13-PC ccd56f5594 Hooked up support for overwriting
Made DMU web service check for logged in user if no credentials are passed in
2012-08-08 09:08:09 -01:00
Matt@MBP13-PC a989ea77ff Switched DMU web service to support XML and JSON so can be used by media dashboard aswell
Added dmu.ashx file in old plugin folder to add backwards compatability
2012-08-08 08:37:07 -01:00
shannon@ShandemVaio 9e611ba8f4 Updated new GlobalSettings version 2012-08-07 21:42:11 +06:00
shannon@ShandemVaio 6f8b016728 Merge with 4.9.0 2012-08-07 21:41:24 +06:00
shannon@ShandemVaio d92d309c61 Added initial MVC supporting files and updated some unit tests. 2012-08-07 21:40:34 +06:00
Matt@MBP13-PC 872ef1fadc Added Multi-file delete support to media grid
Added file name change support to multi-file uploader
2012-08-07 09:30:11 -01:00
Matt@MBP13-PC 9b8d40ee2d Fixed broken noNodes page 2012-08-07 07:53:19 -01:00
shannon@ShandemVaio d9eb8b426c Added TODO notes for NiceUrlProvider to fix an issue for Stephan. 2012-08-07 04:55:27 +06:00
shannon@ShandemVaio ef0d7821eb Fixes default url cache to use concurrentdictionary instead of custom locks as this was causing errors.
Updated the references between context objects since a DocumentRequest should only be set when rendering
a front-end doc, not in the back office.
Fixes the LookupByNiceUrl to work with non directory paths.
Fixes the UmbracoContext.ClientUrl to work properly.
2012-08-07 03:54:47 +06:00
shannon@ShandemVaio b68bcba85e Updated UmbracoModule to support the TransferRequest just like umbraMVCo does using query strings. Added more
unit tests for UmbracoModule, refactored the Umbraco.Web.Routing.Domains to not have static methods and created an
interface for it so that we can unit test it. Changed DocumentRequest stuff to internal. Finally got unit test working for the module
2012-08-07 02:33:08 +06:00
shannon@ShandemVaio fbf94bbf01 Fixed module with client side perf check, added unit test 2012-08-06 23:04:08 +06:00
shannon@ShandemVaio 19205f1435 Improves perf of UmbracoModule rendering, adds unit test for UmbracoModule, fixes StateHelper with HttpContext.Current,
Fixes Action with empty JsSource, Fixes GlobalSettings to be unit testable, adds medium trust config
section to my own transform.
2012-08-06 22:40:06 +06:00
Matt@MBP13-PC 1e271455e8 Added multi select / drag to re-order support 2012-08-06 10:57:41 -01:00
Matt@MBP13-PC 1ad7abcd69 Incremented global version number 2012-08-06 07:47:53 -01:00
Matt@MBP13-PC 7a93c108fb Merge with 4.8.1 (2nd) 2012-08-06 07:20:46 -01:00
sebastiaan c8ac04228e Workitem: 30933 - Missing language packs breaks TinyMCE (4.8) --> Language packs re-included 2012-08-04 17:32:21 -02:00
shannon@ShandemVaio 11a6b2a31f Changed ThumbnailProviderManager to ThumbnailProvidersResolver and initializes it in WebBootManager 2012-08-04 06:20:06 +06:00
shannon@ShandemVaio 58dec4774d Merge with 4.9.0 2012-08-04 06:12:02 +06:00
shannon@ShandemVaio 7235141f02 missing readme file content 2012-08-04 06:10:12 +06:00
shannon@ShandemVaio 32bef227b7 Added App_Code assembly loading to new type finder, had to recompile log4net to support medium trust.
Updated TypeFinder and assembly info to support medium trust.
2012-08-04 06:07:29 +06:00
sebastiaan 082378815f Fixes issue 30965 - Pipe character in URL causes YSOD 2012-08-02 16:39:15 -02:00
sebastiaan f8bdb42a63 Fixes issue 30905 - Checkbox "Include unpublished child pages" for Dutch Language doesn't work 2012-08-02 16:34:05 -02:00
Matt@MBP13-PC 86be51f7ce Added missing files 2012-08-02 09:31:35 -01:00
Michael Wulff Nielsen 5e720ec965 Fixed GetNodeIdByPathLevel regression from uComponents 2012-08-02 07:27:31 -02:00
Michael Wulff Nielsen 7a274bf429 Fixed GetNodeIdByPathLevel regression from uComponents 2012-08-02 07:26:21 -02:00
shannon@ShandemVaio a539fd2554 Fixes DataTypesResolver namespace 2012-08-01 23:53:19 +06:00
shannon@ShandemVaio 8a192a0065 Renamed TypeFinder2 to Umbraco.Core.TypeFinder. Obsoleted old TypeFinder and cleaned up non-used methods
in the new TypeFinder. Updated some unit tests and removed benchmark tests since we already have the benchmarks.
2012-08-01 23:50:33 +06:00
shannon@ShandemVaio 923f4f517f Created ActionsResolver for creating IActions and updated Action class to use this now. Still needs
a bit of cleanup, see TODO notes in Action.cs
2012-08-01 23:30:37 +06:00
shannon@ShandemVaio d644b44d80 Created PackageActionsResolver object to deal with IPackageAction plugins. 2012-08-01 23:03:26 +06:00
shannon@ShandemVaio 2115146fdb Removed old MacroControlFactory - marked as internal FTW ! moved it to new MacroFieldEditorsResolver
using the new framework. Also moved PersistableMacroProperty to new assembly (it was also marked as internal).
Updated unit tests to work with Resolution and resetting resolvers.
2012-08-01 22:46:13 +06:00
shannon@ShandemVaio 646e96ab15 Changed PluginResolverType to PluginManager. Reinstated Resolution and ResolverBase<T> since
this gives us more control over all Resolvers and streamlines them. Created IBootManager, CoreBootManager and WebBootManager
to handle the application initialization including the creation of Resolvers. This means that if people are using the dlls outside
of the web app, they can run the boot strappers to initialize everything.
2012-08-01 22:06:15 +06:00
Matt@MBP13-PC 4049a77332 Made ThumbnailProviders internal for the time being. We'll make them public in 4.10 as this has a new / consistant way of loading plugins. 2012-08-01 08:37:18 -01:00
Matt@MBP13-PC cabe37014b Moved IThumbnailProvider interface to root of Umbraco.Core assembly 2012-08-01 08:13:45 -01:00
Matt@MBP13-PC 20fada8fd4 Converted ThumbnailProviderManager to singleton and made internal 2012-08-01 08:11:48 -01:00
shannon@ShandemVaio dff3905e85 Converted over ThumbnailProviderManager to ThumbnailProvidersResolver using the new apis. 2012-08-01 11:24:39 +06:00
shannon@ShandemVaio c2ee1e63bb Added unit tests for ManyObjectResolverBase for the different lifetime scope of instantiated objects. 2012-08-01 10:48:19 +06:00
shannon@ShandemVaio d4806895a9 Had to remove the Resolution freezing idea because we are lazily instantiating the singleton instances, otherwise
we have to instantiate them all on startup which means that all type searching happens on startup and not lazily which
is bad for performance. I don't think its a big deal that we're not freezing these objects, MVC doesn't freeze its singletons
and nobody seems to have a problem with it, people will just know not to modify these items after startup.
2012-08-01 10:15:39 +06:00
shannon@ShandemVaio bee357ffdc Obsoletes umbraco.cms.businesslogic.datatype.controls.Factory with new Umbraco.Core.DataTypesResolver 2012-08-01 10:05:39 +06:00
shannon@ShandemVaio a0a99e8f12 Obsoletes umbraco.presentation.cache with new Umbraco.Core.CacheRefreshersResolver
Have removed ResolverBase as we cannot rely on manually setting the current singleton object since applications outside of the standard umbraco web application
might be using these singletons and would expect they already be setup. Have changed all current resolvers to manage their
own singleton instances and sealed them.
2012-08-01 09:49:10 +06:00
shannon@ShandemVaio ddc2619511 Merge with 4.9.0 2012-08-01 06:31:28 +06:00
Matt@MBP13-PC 69b3645e9c Added Edit / Download context menu support for media library 2012-07-31 13:31:31 -01:00
Matt@MBP13-PC 4e1e7fe657 Added context menu to media grid
Restructured folderBrowser js class to be less clutered
2012-07-31 12:56:51 -01:00
Matt@MBP13-PC 2481a8df98 Updated fileUploader to use face uploader progress bar when uploading using iFrames. 2012-07-31 08:15:42 -01:00
shannon@ShandemVaio 76c99d3f47 Changed TypeFinder2 to be a static object as there's no reason to have it as an instance.
Still need to integrate the app_code stuff into the new one and then merge the old/new
2012-07-31 03:24:33 +06:00
shannon@ShandemVaio 2fd8d17be9 Changed Action over to use PluginTypeResolver to find IActions and added unit test for it. 2012-07-31 03:14:24 +06:00
shannon@ShandemVaio 5b8057f063 Updated cache refresher factory to use PluginTypeResolver and added unit tests to show that it
resolves the objects, fixes up the GetAll() call since I'm not sure if that actually ever worked.
2012-07-31 03:08:46 +06:00
shannon@ShandemVaio c9a4b708aa Fixes TreeDefinitionCollection to lazily load/find the trees 2012-07-31 02:45:18 +06:00
shannon@ShandemVaio 2537925350 Fixed up unit tests, enables logging for unit tests 2012-07-31 02:34:57 +06:00
shannon@ShandemVaio 5a3534bc52 Upgraded macr to use PluginTypeResolver to resolve XsltExtensions and added unit tests
to support finding these types.
2012-07-31 02:16:29 +06:00
shannon@ShandemVaio 5da0445c32 Updated TreeDefinitionCollection to use PluginTypeResolver and fixed its code to be thread safe.
Updated restExtensions to use PluginTypeResolver and added unit test for resolving these types.
Updated TypeFinder2 with a slight perf increase.
2012-07-31 01:56:03 +06:00
shannon@ShandemVaio 352d817fc1 Updates DynamicNode to use PluginTypeResolver, fixees DynamicNode RazorDataTypeModelTypes resolution
to be thread safe. Removes unused classes (we can put them back if we need them later)
2012-07-31 01:06:10 +06:00
shannon@ShandemVaio e55e688dc7 Added unit test for ContentStore, added object extensions and supporting classes from v5,
added RhinoMocks to the test project and httpcontext factory from v5 unit tests to be used
in our v4 ones.
2012-07-31 00:02:27 +06:00
shannon@ShandemVaio ec22d985ef Updated all lookups to use new logging system. Updated lookups resolvers to use ManyObjectResolverBase
and are just adding the known resolvers on app startup and commented out the other resolver stuff for now.
Fixed up xpath statement for resolving the first document, site now renders :)
2012-07-30 22:52:59 +06:00
Matt@MBP13-PC 3b6508e534 Merge 2012-07-30 10:23:01 -01:00
Matt@MBP13-PC 60ec172d37 Tweak to file uploader so that if the upload is complete, it just removes the UI item 2012-07-30 10:22:35 -01:00
shannon@ShandemVaio 95451e99a7 Reinstating persisting of xml cache file in new module. 2012-07-29 00:04:11 +06:00
shannon@ShandemVaio 1aa70c4bb8 Reinstated temporary new settings in the UmbracoModule and have changed UmbracoModule to reference
the new Umbraco.Core.Configuration settings instead of the legacy ones.
2012-07-28 23:53:07 +06:00
shannon@ShandemVaio 750f5b18d3 Changed the UmbracoModule to use new logging system and updated the log4net config (not release config) to
enable Debug calls.
2012-07-28 23:40:48 +06:00
shannon@ShandemVaio b7cea05f18 Added unit test for custom log file appender, integrated a few more classes from v5 for tracing,
added initial trace logging to application startup which works. Changed the application startup handler
to use new logging, now the system won't bork if the sql db isn't initialized.
2012-07-28 23:08:02 +06:00
azzlack b226be4939 Split AbstractDataEditorControl to separate class file.
Cleaned up code in AbstractDataEditor and AbstractDataEditorControl.
Made AbstractDataEditorControl inherit from INamingContainer to help with control id issues.
Made the ID and DataTypeName fields of AbstractDataEditor abstract so they must be implemented.
2012-07-27 21:34:58 -02:00
azzlack 16127a378a Fixed uQuery GetDictionaryItem method so it doesnt throw exception if the requested item does not exist, and returns fallback string instead. 2012-07-27 21:04:23 -02:00
shannon@ShandemVaio b09422ed5e Added Log4Net and supporting classes from v5 in order to start integration of new diagnostic logging system. 2012-07-28 01:28:39 +06:00
shannon@ShandemVaio b186d5f8e4 Migrated UmbracoSettings and GlobalSettings along with other supporting classes to Umbraco.Core.
Everything is still marked as internal until such time we can clean everything up.
2012-07-28 00:13:06 +06:00
sgay c4d578442b merge 2012-07-27 14:08:00 -02:00
sgay 83f76ed4a4 cosmetic & doc 2012-07-27 14:06:41 -02:00
sgay 74dd444506 merge 2012-07-27 04:48:53 -02:00
shannon@ShandemVaio 573c5a3387 Updated MacroControlFactory to use PluginTypeResolver and added unit test to ensure it finds the types. 2012-07-27 12:45:56 +06:00
sgay 872fb9d8f3 fix previous commit 2012-07-27 04:39:43 -02:00
shannon@ShandemVaio da0217d330 Updated PackageAction to use PluginTypeResolver and added unit test to ensure they are found. 2012-07-27 12:29:41 +06:00
shannon@ShandemVaio 507b6ab773 Updated MediaFactory to use PluginTypeResolver and added a unit test to ensure they are being found. 2012-07-27 12:23:22 +06:00
shannon@ShandemVaio 960dd52750 Created MacroEngineFactory tests, updated DataTypeFactory tests. 2012-07-27 12:14:27 +06:00
shannon@ShandemVaio 5576f65ef0 Updated DataType factory to use PluginTypeResolver and made the dictionary thread safe.
Updated MacroEngineFactory to use PluginTypeResolver and made it thread safe. Have also
updated it to only create one instance of each IMacroEngine per application which should
increase performance a teeny bit, plus that's how it should be.
2012-07-27 11:54:29 +06:00
shannon@ShandemVaio 1823cce4f6 Changed over Action to use PluginTypeResolver to find and instantiate IActionHandlers and included a unit test. 2012-07-27 10:53:40 +06:00
shannon@ShandemVaio 09a68f9376 Updated ApplicationTreeRegistrar to use PluginTypeResolver, created unit tests for resolving trees/applications 2012-07-27 10:37:12 +06:00
shannon@ShandemVaio 58fbe9f4ab Added new TypeFinder methods for resolving types with attributes. Updated the PluginResolver to resolve IApplication 2012-07-27 06:24:57 +06:00
shannon@ShandemVaio 92f983a569 Removed Freezing event as we won't need it 2012-07-27 06:02:41 +06:00
shannon@ShandemVaio 8082abc27a Added MultipleResolverBase 2012-07-27 05:52:01 +06:00
shannon@ShandemVaio 373fdd324b Fixes up ResolverBase and it's static lock object which isn't actually required because
our singleton is a getter/setter and field access is thread safe. Updated SingleResolverBase
to ensure that TResolved is a class so the null check works properly.
2012-07-27 05:25:26 +06:00
shannon@ShandemVaio dbe43a0918 Updated the PluginTypeResolver to have a generic way of instantiating the plugin types it has
already found. Have added some notes to some classes that need to be fixed up. Removed the PluginTypeResolver
from the ApplicationContext since it is a utility and isn't exposing application objects.
2012-07-27 01:01:34 +06:00
shannon@ShandemVaio a6b9aca45a Changed PluginResolver to PluginTypeResolver, created new base method to do the resolution and caching,
Updated ApplicationStartupHandler to use it and to not register on the static method, the real method is now
used and is called on app startup (much cleaner). Added tests for PluginTypeResolver. Added events to
UmbracoApplication and virtual methods for developers to override.
2012-07-27 00:40:00 +06:00
shannon@ShandemVaio 1731ad45f5 Had to manually merge some stuff and fix up some class names/locations. I think some files
and changes had not been committed properly.
Fixed up some resolver classes to ensure the generic type is a class so == null works properly.
Changed to internal until we decide to expose.
2012-07-26 23:05:51 +06:00
shannon@ShandemVaio 32e8a1a5dc Merge 2012-07-26 22:53:58 +06:00
shannon@ShandemVaio 466d871ede Fixes Umbraco.Web reference in editorControls project 2012-07-26 22:34:56 +06:00
shannon@ShandemVaio 25037ed9c8 Fixes Umbraco.Web reference in editorControls project 2012-07-26 22:31:41 +06:00
sgay 53f6577b32 write xml doc 2012-07-26 14:21:47 -02:00
shannon@ShandemVaio a78b5f50dd Merge with 4.9.0 2012-07-26 22:19:52 +06:00
shannon@ShandemVaio 15c5b5de57 Moved type helper methods from TypeFinder2 to TypeHelper. Created SystemUtilities for detecting
app trust levels. Updated all calls to TypeFinder to TypeFinder2 and updated tests.
2012-07-26 22:19:08 +06:00
shannon@ShandemVaio 62d6db935d Integrating v5 TypeFinder. Imported a few classes from v5 regarding utility classes and partial trust
unit test helper classes. Changed calls from old TypeFinder to new TypeFinder2. Created benchmark unit
tests to test speed differences between them.
Fixes: 30946 - IOHelper with HttpContext issue
Fixes: 30945 - AppCodeFileExtensions issue with UmbracoSettings
2012-07-26 21:12:54 +06:00
sgay fec2e0eb6e rename routing 'resolvers' to 'lookups' 2012-07-26 12:56:41 -02:00
leekelleher 0eefbdc610 uQuery: Random never takes last element (applied from uComponents changeset 018bd63444b6) 2012-07-26 12:12:38 -01:00
Matt@MBP13-PC fe87f6b89f Added js file uploader code
Can now drag and drop files in, and trigger upload sequence.
2012-07-26 12:11:42 -01:00
sgay a08c698c77 merge 2012-07-26 07:54:36 -02:00
sgay 6b4fff176a refactor resolution of components 2012-07-26 07:52:13 -02:00
Sebastiaan Janssen 514326adfe Merge with 4.8.0 2012-07-25 07:35:15 -02:00
Matt@MBP13-PC ef0f8b5282 Created ThumbnailProviders for folder browser to allow custom thumbnail generation based on file ext 2012-07-24 10:06:07 -01:00
Matt@MBP13-PC 135bfc6d94 Move FolderBrowser control to Umbraco.Web project 2012-07-24 06:19:30 -01:00
shannon@ShandemVaio 5fcd8b1d52 Fixed file names of ReadLock and UpradeableReadLock. Fixes up UpgradeableReadLock to ensure
that it it is upgraded it releases its writelock on dispose. Fixes up RouteLookups to have
correct locking. Fixes up library to resolve the NiceUrlResolver using the UmbracoContext.Current
singleton acessor.
2012-07-23 23:03:00 +06:00
Matt@MBP13-PC 82ca2609ec Made a start on the folder browser control
Added base2 js library
2012-07-23 14:29:52 -01:00
Matt@MBP13-PC fdcc81003d Added knockout js library 2012-07-23 10:28:53 -01:00
Matt@MBP13-PC c51267136c Upgraded tags datatype to use jQuery tags input plugin gor a nicer UI (still works the same under the hood) 2012-07-23 10:05:29 -01:00
Matt@MBP13-PC 9f60e49a32 Added missing project reference 2012-07-23 06:59:26 -01:00
slace 74b8b4f147 merging two PRs into the 4.9.0 branch 2012-07-22 13:28:56 -10:00
sgay 3546b3e954 refactor routing 2012-07-22 14:01:18 -02:00
Stephan 533cc91a68 merge 2012-07-20 19:09:30 -02:00
sgay 5fbf4379cc refactor routing 2012-07-20 18:54:59 -02:00
shannon@ShandemVaio d9faea49ec Changed the ILookup resolution, now that DocumentRequest object contains everything to do the lookups
we don't have to create each ILookup per request, these can exist one  per application.
2012-07-21 00:59:27 +06:00
shannon@ShandemVaio 36e3857643 Ensures the legacy UmbracoContext is created. 2012-07-21 00:47:17 +06:00
shannon@ShandemVaio fa469416a2 added note 2012-07-21 00:44:58 +06:00
shannon@ShandemVaio c60abf747c Updated the default.aspx and page classes to match what Stephen had in his fork.
Have updated the web.config to use the new HttpModule but the XPath statement that is generated
for the LookupByPath doesn't seem to be matching my root node. But everything else is actually working!
2012-07-21 00:42:11 +06:00
shannon@ShandemVaio be51bfa67f Changed RoutingEnvironment to RoutingContet. Cleaned up how the context reference each other, now
this starts making a bunch of sense. Have empty ctor's on all ILookups since their methods get passed a
 DocumentRequest object which has access to all of the context's and properties that they will ever need.
2012-07-21 00:20:50 +06:00
shannon@ShandemVaio 8f278bcaa5 Added singleton for managing ILookups collection, allows for adding/removing/inserting at runtime/startup 2012-07-20 23:42:55 +06:00
shannon@ShandemVaio 6c872e8a65 Implements singly registered RoutesCache object and re-interfaces IRoutesCache which can now be
set at runtime. Exposes UmbracoContext via DocumentRequest which simplifies some things. Removes
dependency on UmbracoContext from DefaultRoutesCache, now InPreviewMode is checked before passing
processing to the IRoutesCache provider. Changed NiceUrls to NiceUrlResolver.
2012-07-20 23:10:43 +06:00
shannon@ShandemVaio 1b9e226f61 Moves app initialization into new UmbracoApplication (global.asax) 2012-07-20 22:02:28 +06:00
shannon@ShandemVaio 25b06a88ab Began integration of Stephen's new routing logic. The sln compiles and things have been refactored
from the initial concept. The module is not active as it currently will not work because of
contructor dependencies and classes marked as internal, will liase with Stephen regarding this.
2012-07-20 01:04:35 +06:00
shannon@ShandemVaio f2c084feda Merge with 4.9.0 2012-07-19 22:52:34 +06:00
shannon@ShandemVaio f83ae489db Fixes remaining circular dependencies and updates the build script to not have
to manually build these projects seperately :)
fixes: #U4-77
2012-07-19 22:48:09 +06:00
shannon@ShandemVaio 00c18fe764 Fixes first circular dependency with webservices (#U4-77) 2012-07-19 22:38:33 +06:00
shannon@ShandemVaio ce90e114df Update to use IISExpress #U4-75 with Aarons fixes 2012-07-19 22:15:15 +06:00
shannon@ShandemVaio c205197683 Fixes up build script to build Umbraco.Web.UI project 2012-07-19 22:01:36 +06:00
shannon@ShandemVaio b13c16ddc2 Moved remaining classes/files into "umbraco.presentation" folder 2012-07-19 21:49:42 +06:00
shannon@ShandemVaio 8c9e19c0b7 Ensures language files are included in solution 2012-07-19 21:45:55 +06:00
shannon@ShandemVaio 14dd4fcd68 Moved files in Umbraco.Web to "umbraco.presentation" folder to keep old 'legacy' stuff in one place
so its easier to move forward with the new namespaces/code.
2012-07-19 21:38:56 +06:00
shannon@ShandemVaio d82bb9bff1 Merge with 4.10.0 2012-07-19 21:18:51 +06:00
shannon@ShandemVaio 4b819c081e Merge with 4.9.0 2012-07-19 21:18:05 +06:00
shannon@ShandemVaio c91ef375ba Merge with 4.8.0 2012-07-19 21:17:25 +06:00
shannon@ShandemVaio 82d8e2854a updates ignore file so that it doesn't keep wanting to update the web.config 2012-07-19 02:25:59 +06:00
shannon@ShandemVaio 7e5f4c20bf Updates the circular reference projects post builds to build to Umbraco.Web.UI
(now we can actually look at fixing these references! :)
2012-07-19 02:25:13 +06:00
shannon@ShandemVaio 6e459a3afb Fixes namespace issues when changing default namesapce to Umbraco.Web as the autogen
classes namespaces were changed.
Removed post build and custom targets from Umbraco.Web
2012-07-19 02:19:32 +06:00
shannon@ShandemVaio 2e8ab316fe re-removing the presentation stuff that was merged back in. 2012-07-19 01:32:59 +06:00
shannon@ShandemVaio c4760e0593 manually merged in tinymce language changes. 2012-07-19 01:23:53 +06:00
shannon@ShandemVaio 0f8797096d Merged with 4.9.0 2012-07-19 01:22:22 +06:00
shannon@ShandemVaio 9a1935e6ea Fixes small merge issue 2012-07-19 01:06:39 +06:00
shannon@ShandemVaio 25bd7b8ad7 Merge with 4.8.0 2012-07-19 01:02:16 +06:00
shannon@ShandemVaio 7ca29b87f3 Removed all client side files as they now exist in Umbraco.Web.UI 2012-07-19 00:52:58 +06:00
shannon@ShandemVaio 9679d0f6df Renamed umbraco.presentation to Umbraco.Web and changed the folder it resides in.
Started removal of files/folder from Umbraco.Web that belong in Umbraco.Web.UI.
2012-07-18 23:54:20 +06:00
shannon@ShandemVaio 62f4db0b76 added Umbraco.Web.UI containing only web rendering files 2012-07-18 04:35:30 +06:00
shannon@ShandemVaio 8046a778bd Fixes the UmbracoRequest, UmbracoResponse, UmbracoServerUtility to use the Base classes
not the wrapper classes since this is incorrect, now they are at least abstracted so they
don't rely on the real HttpContext but these should be obsoleted and not used but thats
a different story
2012-07-18 02:59:00 +06:00
shannon@ShandemVaio 23b2899101 Imports many of the useful extension methods from v5 that are also used in umbraMVCo to begin the
MVC integration.
Imported the unit tests associated with each of these imported classes.
2012-07-17 03:51:34 +06:00
shannon@ShandemVaio 6c8d72576c Creating 4.10.0 branch 2012-07-17 03:29:25 +06:00
shannon@ShandemVaio 10f2d9b3ed Updated assembly info for Umbraco.Web proj 2012-07-17 03:28:15 +06:00
shannon@ShandemVaio dfe512ead8 Got ApplicationTreeTest working in new NUnit test project. 2012-07-17 03:23:06 +06:00
shannon@ShandemVaio ddbde6e15f Got ApplicationTests working with new unit test project.
Had to fix the ApplicationTree and Application classes to lazily call the Cache method
(which is no renamed to EnsureCache) so that we could set the config location in the unit tests.
This should also improve performance a teeny bit and allow for better error handling if required.
2012-07-17 03:14:22 +06:00
shannon@ShandemVaio 96cc9a1f35 Missing file updates 2012-07-17 01:33:14 +06:00
shannon@ShandemVaio 21203b8070 Renamed umbraco.Test to Umbraco.LegacyTests
Updated InternalsVisibleTo declarations.
Updated the ApplicationTest test to use a new base class as a test to install a local sqlce database
for testing against.
Added Umbraco.Core project.
Added Umbraco.Web project.
Created new sln folder Legacy
2012-07-17 01:32:46 +06:00
1534 changed files with 160999 additions and 93037 deletions
+23 -7
View File
@@ -2,7 +2,6 @@
syntax: glob
*.obj
*.exe
*.pdb
*.user
*.aps
@@ -27,12 +26,18 @@ umbraco\presentation\usercontrols\*
umbraco\presentation\scripts\*
umbraco\presentation\fonts\*
umbraco\presentation\css\*
glob:*App_Code\*
glob:*App_Data\*
glob:*media\*
glob:*masterpages\*
glob:*macroScripts\*
glob:*xslt\*
src\Umbraco.Web.UI\css\*
src\Umbraco.Web.UI\App_Code\*
src\Umbraco.Web.UI\App_Data\*
src\Umbraco.Tests\App_Data\*
src\Umbraco.Web.UI\media\*
src\Umbraco.Web.UI\masterpages\*
src\Umbraco.Web.UI\macroScripts\*
src\Umbraco.Web.UI\xslt\*
src\Umbraco.Web.UI\images\*
src\Umbraco.Web.UI\scripts\*
src\Umbraco.Web.UI\Web.*.config.transformed
umbraco\presentation\umbraco\plugins\uComponents\uComponentsInstaller.ascx
umbraco\presentation\packages\uComponents\MultiNodePicker\CustomTreeService.asmx
@@ -41,7 +46,18 @@ _BuildOutput/*
build/UmbracoCms.AllBinaries.zip
build/UmbracoCms.WebPI.zip
build/UmbracoCms.zip
build/*.nupkg
src/Umbraco.Tests/config/applications.config
src/Umbraco.Tests/config/trees.config
src/Umbraco.Web.UI/web.config
*.orig
src/Umbraco.Tests/config/404handlers.config
src/Umbraco.Web.UI/Views/*.cshtml
src/Umbraco.Web.UI/Views/*.vbhtml
src/Umbraco.Tests/config/umbracoSettings.config
src/Umbraco.Web.UI/App_Plugins/*
src/Umbraco.Web.UI/Views/*
src\Umbraco.Web.UI\[W]eb.config
src/packages/
build/*.zip
+18
View File
@@ -10,3 +10,21 @@ d03fcffb8834a9583a56813bb44b6abbd9f042cc Release-4.6.0
096f20bb0575d6199f20fcb3147b63554e765a74 Release-4.8.0
8f8a203857886b373148af29edd57460a42940be Release-4.8.1
de73e687ddf6086ed52b6554676c1632865d07f2 Release-4.9.0
8d7d8609e2e4b971da99cd97f72132ce85ce3333 Release-4.9.1
f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0
20e4dff821d8ac2527a5353618fa1a23ea1d8b34 Release-4.11.0
7f827760cb49d749616859f528d19dde64807947 Release-4.11.1
7f827760cb49d749616859f528d19dde64807947 Release-4.11.1
6eb5f2fb5a88aa29ea544499df9160a1b31b5638 Release-4.11.1
73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2
73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2
0000000000000000000000000000000000000000 4.11.2
73711b806a4044dbf0d7d7c095ddfdda23b09932 Release-4.11.2
77db220b89e166b3c0736ed321ecfd6416cddbcd Release-4.11.2.1
54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2
baa44b79cf90a60631e38e11f771c200b08a4583 Release-4.11.3
e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1
e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1
0000000000000000000000000000000000000000 Release-4.11.3.1
e02f5aebb87e3f07d27376647756caa9762931d8 Release-4.11.4
14338b0ab1738fbd8987677ecdb9a73d79fc229d release-4.11.6
-3
View File
@@ -1,3 +0,0 @@
NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec
NuGet.exe pack NuSpecs\UmbracoCms.nuspec
REM pause
+25 -2
View File
@@ -1,2 +1,25 @@
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj"
REM pause
@ECHO OFF
set version=4.11.7
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%version%
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\macroScripts\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\xslt\dummy.txt
NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
if ERRORLEVEL 1 goto :showerror
goto :EOF
:showerror
pause
+13 -4
View File
@@ -24,6 +24,9 @@
<PropertyGroup Condition="'$(BUILD_NUMBER)'!=''">
<DECIMAL_BUILD_NUMBER>.$(BUILD_NUMBER)</DECIMAL_BUILD_NUMBER>
</PropertyGroup>
<PropertyGroup Condition="'$(BUILD_RELEASE)'!=''">
<DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)</DECIMAL_BUILD_NUMBER>
</PropertyGroup>
<PropertyGroup>
<BuildConfiguration>Release</BuildConfiguration>
@@ -46,10 +49,9 @@
</PropertyGroup>
<ItemGroup>
<SystemFolders Include="$(WebAppFolder)App_Code" />
<SystemFolders Include="$(WebAppFolder)App_Plugins" />
<SystemFolders Include="$(WebAppFolder)App_Code" />
<SystemFolders Include="$(WebAppFolder)App_Data" />
<SystemFolders Include="$(WebAppFolder)App_Data\ClientDependency" />
<SystemFolders Include="$(WebAppFolder)App_Data\ExamineIndexes" />
<SystemFolders Include="$(WebAppFolder)media" />
<SystemFolders Include="$(WebAppFolder)masterpages" />
<SystemFolders Include="$(WebAppFolder)scripts" />
@@ -161,7 +163,7 @@
<Message Text="Finished offsetting timestamps" Importance="high" />
</Target>
<Target Name="CompileProjects">
<Target Name="CompileProjects" DependsOnTargets="SetVersionNumber">
<Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
<!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
@@ -233,6 +235,13 @@
<Message Text="Finished compiling projects" Importance="high" />
</Target>
<Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
<!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
<FileUpdate Files="..\src\Umbraco.Core\Configuration\GlobalSettings.cs"
Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?(-([a-zA-Z]+))?"
ReplacementText="$(BUILD_RELEASE)"/>
</Target>
<Target Name="AfterBuild">
<Message Text="Hi" />
</Target>
-370
View File
@@ -1,370 +0,0 @@
<?xml version="1.0" ?>
<project name="umbraco" default="test" basedir=".">
<description>Build the umbraco 4.6 alpha Application for asp.net 3.5</description>
<property name="nant.settings.currentframework" value="net-2.0" />
<!-- filenames and directories, generally won't change -->
<property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
<property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.6 for asp.net 3.5" />
<property name="root.dir" value="${directory::get-current-directory()}" />
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
<property name="build.dir" value="${root.dir}\build" />
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
<property name="build.version" value="4.6 Alpha"/>
<property name="docs.dir" value="${root.dir}\docs" />
<property name="win.dir" value="c:\WINDOWS" />
<property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
<!-- YUI -->
<property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
<target name="build" depends="init">
<!-- set everything to writable-->
<attrib normal="true" readonly="false">
<fileset basedir="${root.dir}">
<include name="**/*" />
</fileset>
</attrib>
<!-- Remove those damn DLR dlls that might be left behind by careless devs...-->
<!-- They will get added again after build is completed, no worries no dependencies during build-->
<delete>
<fileset>
<include name="${source.dir}\bin\IronPython.dll" />
<include name="${source.dir}\bin\IronPython.Modules.dll" />
<include name="${source.dir}\bin\IronRuby.dll" />
<include name="${source.dir}\bin\IronRuby.Libraries.dll" />
<include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
<include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
<include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
<include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
<include name="${source.dir}\bin\Microsoft.Scripting.dll" />
<include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
</fileset>
</delete>
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
<arg value="${root.dir}\umbraco.sln" />
<arg value="/v:n" />
<arg value="/p:WarningLevel=0" />
<arg value="/p:ToolsVersion=3.5" />
</exec>
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
</target>
<!-- Directories and files -->
<target name="directories" depends="build">
<!-- setup docs files -->
<mkdir dir="${docs.dir}" />
<copy todir="${docs.dir}">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
</fileset>
</copy>
<!-- asp.net 2.0 SP1 DLR dlls -->
<delete>
<fileset>
<include name="${build.dir}\bin\Microsoft.Scripting.*" />
<include name="${build.dir}\bin\Microsoft.Dynamic.*" />
<include name="${build.dir}\bin\IronPython.*" />
<include name="${build.dir}\bin\IronRuby.*" />
</fileset>
</delete>
<copy todir="${build.dir}\bin">
<fileset basedir="${dlls.dir}\DLR 2.0 SP1">
<include name="*.dll" />
<exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
</fileset>
</copy>
<!--standard web.config-->
<copy file="${root.dir}\aspnet35.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
<!--standard /config files-->
<copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
<!-- new 4.1 files -->
<copy file="${root.dir}\config templates\config\ClientDependency.config" tofile="${build.dir}\config\ClientDependency.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\ExamineSettings.config" tofile="${build.dir}\config\ExamineSettings.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\ExamineIndex.config" tofile="${build.dir}\config\ExamineIndex.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\scripting.config" tofile="${build.dir}\config\scripting.config" failonerror="false" overwrite="true"/>
<!--standard /data/packages files-->
<copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
<!-- Standard access.xml file-->
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\data\access.xml" failonerror="false" overwrite="true"/>
<!-- Standard create UI.xml-->
<copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
<!-- Standard empty cache file -->
<copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\data\umbraco.config" failonerror="false" overwrite="true"/>
<!-- Baseline Language file for translation tool -->
<copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
<!-- LINQ2UMB dll-->
<copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\Debug - Fixed Version\umbraco.Linq.Core.dll" tofile="${build.dir}\bin\umbraco.Linq.Core.dll" failonerror="false" overwrite="true"/>
<delete dir="${build.dir}\webservices" />
<delete dir="${build.dir}\umbracoBase" />
<delete dir="${build.dir}\Web References" />
<delete dir="${build.dir}\obj" />
<delete dir="${build.dir}\properties" />
<delete dir="${build.dir}\css" />
<delete dir="${build.dir}\masterpages" />
<delete dir="${build.dir}\scripts" />
<delete dir="${build.dir}\python" />
<delete dir="${build.dir}\xslt" />
<delete dir="${build.dir}\usercontrols" />
<delete>
<fileset>
<include name="${build.dir}/**/*.build" />
<include name="${build.dir}/**/*.csproj" />
<include name="${build.dir}/**/*.vspscc" />
<include name="${build.dir}/**/*.scc" />
<include name="${build.dir}/**/*.sln" />
<include name="${build.dir}/**/*.compiled" />
<include name="${build.dir}/**/*.resx" />
<include name="${build.dir}/**/*.user" />
<include name="${build.dir}/**/*.pdb" />
<include name="${build.dir}/PrecompiledApp.config" />
<include name="${build.dir}/web.config.template" />
<include name="${build.dir}/*.xslt" />
<include name="${build.dir}/web.STANDARD.config" />
<include name="${build.dir}/site.py" />
</fileset>
</delete>
<!-- standard folders -->
<mkdir dir="${build.dir}\App_Code" />
<mkdir dir="${build.dir}\App_Data" />
<mkdir dir="${build.dir}\App_Data\ClientDependency" />
<mkdir dir="${build.dir}\App_Data\ExamineIndexes" />
<mkdir dir="${build.dir}\media" />
<mkdir dir="${build.dir}\masterpages" />
<mkdir dir="${build.dir}\scripts" />
<mkdir dir="${build.dir}\css" />
<mkdir dir="${build.dir}\python" />
<mkdir dir="${build.dir}\xslt" />
<mkdir dir="${build.dir}\usercontrols" />
</target>
<!-- Minify -->
<target name="minify" description="minify JS files" depends="directories">
<fileset basedir="${build.dir}" id="jsFileSet">
<include name="umbraco/css/*.css"/>
<include name="umbraco/js/**/*.js"/>
<include name="umbraco_client/**/*.js"/>
<include name="umbraco_client/**/*.css"/>
</fileset>
<property name="js_files" value=""/>
<foreach item="File" property="file">
<in>
<items refid="jsFileSet"/>
</in>
<do>
<exec program="java" workingdir="${YUICompressor.dir}" failonerror="false">
<arg value="-jar" />
<arg value="yuicompressor.jar" />
<arg value="-o" />
<arg value="${file}.min" />
<arg value="${file}" />
</exec>
<move file="${file}.min" tofile="${file}" overwrite="true" failonerror="false"/>
</do>
</foreach>
</target>
<!-- Documentation -->
<target name="documentation" depends="directories">
<!-- Transformations -->
<property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
<property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
<property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
<!-- Create a doc dir and move vs comment files to it-->
<mkdir dir="${docs.dir}" />
<copy todir="${docs.dir}">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
</fileset>
</copy>
<!-- Create or Cleanup Working Directory -->
<mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
<delete>
<fileset basedir="${sandcastle.workingdir}">
<include name="**\*" />
</fileset>
</delete>
<copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
<filterchain>
<replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
<replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
</filterchain>
</copy>
<!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
<exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
<arg value="&quot;${build.dir}\bin\businesslogic.dll&quot; " />
<arg value="&quot;${build.dir}\bin\cms.dll&quot; " />
<arg value="&quot;${build.dir}\bin\controls.dll&quot; " />
<arg value="&quot;${build.dir}\bin\interfaces.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.datalayer.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.editorcontrols.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.providers.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.webservices.dll&quot; " />
<arg value="/out:reflection.org" />
</exec>
<!-- Regroup overloads -->
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
<arg value="reflection.org" />
<arg value="/xsl:&quot;${sandcastle.addfriendlyfilenames.xsl}&quot;" />
<arg value="/out:reflection.xml" />
</exec>
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
<arg value="reflection.org" />
<arg value="/xsl:&quot;${sandcastle.reflectiontomanifest.xsl}&quot;" />
<arg value="/out:manifest.xml" />
</exec>
<exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
<arg value="/config:Sandcastle.config" />
<arg value="manifest.xml" />
</exec>
</target>
<!-- do the full release with docs, minify and nightly file distribution -->
<target name="release" depends="zip,minify">
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
<mkdir dir="${public.dir}\${build.version}" />
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
</target>
<!-- do the full release with docs, minify and nightly file distribution -->
<target name="zip" depends="directories">
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
<zip zipfile="${release.filename}" includeemptydirs="true" >
<fileset basedir="${root.dir}">
<include name="build/*" />
<include name="build/**/*" />
</fileset>
</zip>
</target>
<!-- do a nightly build without the minification and docs -->
<target name="nightly" depends="zip">
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
<mkdir dir="${public.dir}\${build.version}" />
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
</target>
<!-- will produce the a clean /build folder and nothing else-->
<target name="test" depends="directories">
</target>
<target name="webPIRelease" depends="release,webPiFile">
<copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\webPi_sha.txt" />
<copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
</target>
<!-- do the webdeploy release for web PI-->
<target name="webPiFile" depends="directories">
<property name="webpi.dir" value="${root.dir}\deploy" />
<delete dir="${webpi.dir}\umbraco" />
<mkdir dir="${webpi.dir}" />
<mkdir dir="${webpi.dir}\umbraco" />
<copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
<fileset basedir="${root.dir}">
<include name="build/*" />
<include name="build/**/*" />
</fileset>
</copy>
<copy file="d:\webpiAssets\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
<copy file="d:\webpiAssets\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
<copy file="d:\webpiAssets\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
<property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
<zip zipfile="${webpi.filename}" includeemptydirs="true" >
<fileset basedir="${webpi.dir}">
<include name="*" />
<include name="**/*" />
</fileset>
</zip>
<exec program="${win.dir}\hashMyFiles.exe">
<arg value="/file &quot;${webpi.filename}&quot;" />
<arg value="/stext &quot;${root.dir}\webPi_sha.txt&quot;" />
</exec>
</target>
<target name="init" description="init tasks for the build">
<!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
<delete>
<fileset>
<include name="${build.dir}\umbraco\plugins\*" />
<exclude name="${build.dir}\umbraco\plugins\tinymce3" />
</fileset>
</delete>
<delete dir="${build.dir}" />
<mkdir dir="${build.dir}" />
</target>
</project>
-229
View File
@@ -1,229 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections >
<section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
<!-- ASPNETAJAX -->
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
</sectionGroup>
</sectionGroup>
</sectionGroup>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false"/>
<section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false"/>
<section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false"/>
</configSections>
<urlrewritingnet configSource="config\UrlRewriting.config" />
<microsoft.scripting configSource="config\scripting.config" />
<clientDependency configSource="config\ClientDependency.config" />
<Examine configSource="config\ExamineSettings.config" />
<ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
<appSettings>
<add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=DATABASE;user id=USER;password=PASS" />
<add key="umbracoConfigurationStatus" value="" />
<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
<add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
<add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
<add key="umbracoStorageDirectory" value="~/App_Data" />
<add key="umbracoPath" value="~/umbraco" />
<add key="umbracoEnableStat" value="false" />
<add key="umbracoHideTopLevelNodeFromPath" value="true" />
<add key="umbracoEditXhtmlMode" value="true" />
<add key="umbracoUseDirectoryUrls" value="false" />
<add key="umbracoDebugMode" value="true" />
<add key="umbracoTimeOutInMinutes" value="20" />
<add key="umbracoVersionCheckPeriod" value="7" />
<add key="umbracoDisableXsltExtensions" value="true" />
<add key="umbracoDefaultUILanguage" value="en" />
<add key="umbracoProfileUrl" value="profiler" />
<add key="umbracoUseSSL" value="false" />
<add key="umbracoUseMediumTrust" value="false" />
<add key="umbracoContentXMLUseLocalTemp" value="false" />
</appSettings>
<system.net>
<mailSettings>
<smtp>
<network host="127.0.0.1" userName="username" password="password" />
</smtp>
</mailSettings>
</system.net>
<!-- REMOVE FOR BETA -->
<!-- added by NH to test foreign membership providers-->
<connectionStrings>
<remove name="LocalSqlServer" />
<!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
</connectionStrings>
<system.web>
<!-- <trust level="Medium" originUrl=".*" /> -->
<customErrors mode="Off" />
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
<globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
<xhtmlConformance mode="Strict" />
<pages enableEventValidation="false">
<!-- ASPNETAJAX -->
<controls>
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</controls>
</pages>
<httpModules>
<!-- URL REWRTIER -->
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
<!-- UMBRACO -->
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
<!-- ASPNETAJAX -->
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<!-- CLIENT DEPENDENCY -->
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
</httpModules>
<httpHandlers>
<remove verb="*" path="*.asmx"/>
<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
<!-- UMBRACO CHANNELS -->
<add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
<add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
<!-- CLIENT DEPENDENCY -->
<add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
<!-- SPELL CHECKER -->
<add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
</httpHandlers>
<compilation defaultLanguage="c#" debug="false" batch="false">
<assemblies>
<!-- ASPNETAJAX -->
<add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
<add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</assemblies>
</compilation>
<authentication mode="Forms">
<forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
</authentication>
<authorization>
<allow users="?" />
</authorization>
<!-- Membership Provider -->
<membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
<providers>
<clear />
<add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
<add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
</providers>
</membership>
<!-- added by NH to support membership providers in access layer -->
<roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
<providers>
<clear />
<add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
</providers>
</roleManager>
<!-- Sitemap provider-->
<siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
<providers>
<clear />
<add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
</providers>
</siteMap>
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
<modules>
<remove name="ScriptModule" />
<remove name="UrlRewriteModule" />
<remove name="umbracoRequestModule" />
<remove name="viewstateMoverModule" />
<remove name="umbracoBaseRequestModule" />
<remove name="ClientDependencyModule" />
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
</modules>
<handlers accessPolicy="Read, Write, Script, Execute">
<remove name="WebServiceHandlerFactory-Integrated" />
<remove name="ScriptHandlerFactory" />
<remove name="ScriptHandlerFactoryAppServices" />
<remove name="ScriptResource" />
<remove name="Channels" />
<remove name="Channels_Word" />
<remove name="ClientDependency" />
<remove name="SpellChecker" />
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
<add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
<add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
<add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
</handlers>
</system.webServer>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
<providerOption name="CompilerVersion" value="v3.5" />
<providerOption name="WarnAsError" value="false" />
</compiler>
</compilers>
</system.codedom>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<build>
<version>4.0 Beta 2</version>
<assembly>@assembly@</assembly>
<date>@date@</date>
</build>
-495
View File
@@ -1,495 +0,0 @@
<?xml version="1.0" ?>
<project name="umbraco" default="test" basedir=".">
<description>Build the umbraco 4.5 Application</description>
<!-- global properties, generally won't change -->
<!--
<property name="nant.settings.currentframework" value="net-2.0" />
-->
<property name="nant.settings.currentframework" value="net-4.0" />,
<property name="build.version" value="4.8.0"/>
<property name="build.configuration" value="Debug"/>
<!-- filenames and directories, generally won't change -->
<property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
<property name="public.dir" value="C:\inetpub\wwwroot\_Live Sites\nightly.umbraco.org\umbraco 4.7.2" />
<property name="root.dir" value="${directory::get-current-directory()}" />
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
<property name="build.dir" value="${root.dir}\build" />
<property name="build.symbolFiles.dir" value="${root.dir}\SymbolFiles" />
<property name="build.macroEnginesIron.dir" value="${root.dir}\umbraco.macroEngines.Iron_build" />
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
<property name="WebPiAssets.dir" value="${root.dir}\config templates\WebPi" />
<property name="docs.dir" value="${root.dir}\docs" />
<property name="win.dir" value="c:\WINDOWS" />
<property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
<!-- Sandcastle Directories -->
<property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
<property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
<property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
<!-- Sandcastle -->
<property name="sandcastle.mrefbuilder" value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
<property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
<property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
<!-- YUI -->
<property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
<!-- Build source -->
<target name="build" depends="init">
<!-- set everything to writable-->
<attrib normal="true" readonly="false">
<fileset basedir="${root.dir}">
<include name="**/*" />
</fileset>
</attrib>
<delete>
<fileset>
<include name="${source.dir}\bin\IronPython.dll" />
<include name="${source.dir}\bin\IronPython.Modules.dll" />
<include name="${source.dir}\bin\IronRuby.dll" />
<include name="${source.dir}\bin\IronRuby.Libraries.dll" />
<include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
<include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
<include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
<include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
<include name="${source.dir}\bin\Microsoft.Scripting.dll" />
<include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
</fileset>
</delete>
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
<arg value="${root.dir}\umbraco.MacroEngines.Juno\umbraco.MacroEngines.csproj" />
<arg value="/v:n" />
<arg value="/p:WarningLevel=0" />
<arg value="/p:ToolsVersion=4.0" />
<arg value="/p:Configuration=${build.configuration}" />
</exec>
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.dll" tofile="${source.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
<copy todir="${source.dir}\bin" overwrite="true">
<fileset basedir="${dlls.dir}\WebPages">
<include name="*.dll" />
</fileset>
</copy>
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
<arg value="${root.dir}\umbraco.sln" />
<arg value="/v:n" />
<arg value="/p:WarningLevel=0" />
<arg value="/p:ToolsVersion=4.0" />
<arg value="/p:Configuration=${build.configuration}" />
</exec>
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
<call target="buildMacroEnginesIron" />
<call target="buildSymbolFiles" />
</target>
<target name="buildMacroEnginesIron">
<mkdir dir="${build.macroEnginesIron.dir}" />
<mkdir dir="${build.macroEnginesIron.dir}\bin" />
<copy todir="${build.macroEnginesIron.dir}\bin" overwrite="true">
<fileset basedir="${dlls.dir}\DLR 4.0">
<include name="*.dll" />
<exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
</fileset>
</copy>
<copy file="${root.dir}\umbraco.MacroEngines.Iron\bin\${build.configuration}\umbraco.MacroEngines.Iron.dll" tofile="${build.macroEnginesIron.dir}\bin\umbraco.MacroEngines.Iron.dll" failonerror="false" overwrite="true"/>
</target>
<target name="buildSymbolFiles">
<!-- setup symbol files -->
<mkdir dir="${build.symbolFiles.dir}" />
<copy todir="${build.symbolFiles.dir}" flatten="true">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
<include name="*.pdb" />
</fileset>
</copy>
<copy todir="${build.symbolFiles.dir}" flatten="true">
<fileset basedir="${root.dir}" >
<include name="**/*.pdb" />
<include name="**/bin/*.xml" />
</fileset>
</copy>
<copy todir="${build.symbolFiles.dir}" flatten="true">
<fileset basedir="${docs.dir}">
<include name="*.xml" />
</fileset>
</copy>
</target>
<!-- Directories and files -->
<target name="directories" depends="build">
<!-- setup docs files -->
<mkdir dir="${docs.dir}" />
<copy todir="${docs.dir}">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
</fileset>
</copy>
<!-- DLR FILES -->
<delete>
<fileset>
<include name="${build.dir}\bin\Microsoft.Scripting.*" />
<include name="${build.dir}\bin\Microsoft.Dynamic.*" />
<include name="${build.dir}\bin\IronPython.*" />
<include name="${build.dir}\bin\IronRuby.*" />
</fileset>
</delete>
<!--
<copy todir="${build.dir}\bin" overwrite="true">
<fileset basedir="${dlls.dir}\DLR 4.0">
<include name="*.dll" />
<exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
</fileset>
</copy>
-->
<!--standard web.config-->
<copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
<!--standard /config files-->
<copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
<!-- new 4.5 files -->
<copy file="${root.dir}\config templates\config\ClientDependency.config" tofile="${build.dir}\config\ClientDependency.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\ExamineSettings.config" tofile="${build.dir}\config\ExamineSettings.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\ExamineIndex.config" tofile="${build.dir}\config\ExamineIndex.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\scripting.config" tofile="${build.dir}\config\scripting.config" failonerror="false" overwrite="true"/>
<!-- Macro engines files + razor Files -->
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.dll" tofile="${build.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.pdb" tofile="${build.dir}\bin\umbraco.MacroEngines.pdb" failonerror="false" overwrite="true"/>
<copy todir="${build.dir}\bin" overwrite="true">
<fileset basedir="${dlls.dir}\WebPages">
<include name="*.dll" />
</fileset>
</copy>
<!--
<copy file="${root.dir}\foreign dlls\System.Web.Razor.dll" tofile="${build.dir}\bin\System.Web.Razor.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\foreign dlls\RazorEngine.Core.dll" tofile="${build.dir}\bin\RazorEngine.Core.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\foreign dlls\RazorEngine.Templates.dll" tofile="${build.dir}\bin\RazorEngine.Templates.dll" failonerror="false" overwrite="true"/>
-->
<!--standard /data/packages files-->
<mkdir dir="${build.dir}\App_Data" />
<copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\app_data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\app_data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
<!-- Standard access.xml file-->
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\app_data\access.config" failonerror="false" overwrite="true"/>
<!-- Standard create UI.xml-->
<copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
<!-- Standard empty cache file -->
<copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\app_data\umbraco.config" failonerror="false" overwrite="true"/>
<!-- Baseline Language file for translation tool -->
<copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
<!-- LINQ2UMB dll-->
<copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\${build.configuration}\umbraco.Linq.Core.dll" tofile="${build.dir}\bin\umbraco.Linq.Core.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\${build.configuration}\umbraco.Linq.Core.pdb" tofile="${build.dir}\bin\umbraco.Linq.Core.pdb" failonerror="false" overwrite="true"/>
<delete dir="${build.dir}\webservices" />
<delete dir="${build.dir}\umbracoBase" />
<delete dir="${build.dir}\Web References" />
<delete dir="${build.dir}\obj" />
<delete dir="${build.dir}\properties" />
<delete dir="${build.dir}\css" />
<delete dir="${build.dir}\masterpages" />
<delete dir="${build.dir}\scripts" />
<delete dir="${build.dir}\python" />
<delete dir="${build.dir}\macroScripts" />
<delete dir="${build.dir}\xslt" />
<delete dir="${build.dir}\usercontrols" />
<delete>
<fileset>
<include name="${build.dir}/**/*.build" />
<include name="${build.dir}/**/*.csproj" />
<include name="${build.dir}/**/*.vspscc" />
<include name="${build.dir}/**/*.scc" />
<include name="${build.dir}/**/*.sln" />
<include name="${build.dir}/**/*.compiled" />
<include name="${build.dir}/**/*.resx" />
<include name="${build.dir}/**/*.user" />
<include name="${build.dir}/**/*.bak" />
<include name="${build.dir}/**/*.orig" />
<include name="${build.dir}/PrecompiledApp.config" />
<include name="${build.dir}/web.config.template" />
<include name="${build.dir}/*.xslt" />
<include name="${build.dir}/web.*.config" />
<include name="${build.dir}/site.py" />
<include name="${build.dir}/bin/umbraco.MacroEngines.Legacy.*" />
</fileset>
</delete>
<if test="${build.configuration=='Release'}">
<delete>
<fileset>
<include name="${build.dir}/**/*.pdb" />
<include name="${build.dir}/bin/*.xml" />
</fileset>
</delete>
</if>
<!-- standard folders -->
<mkdir dir="${build.dir}\App_Code" />
<mkdir dir="${build.dir}\App_Data\ClientDependency" />
<mkdir dir="${build.dir}\App_Data\ExamineIndexes" />
<mkdir dir="${build.dir}\media" />
<mkdir dir="${build.dir}\masterpages" />
<mkdir dir="${build.dir}\scripts" />
<mkdir dir="${build.dir}\css" />
<mkdir dir="${build.dir}\macroScripts" />
<mkdir dir="${build.dir}\xslt" />
<mkdir dir="${build.dir}\usercontrols" />
</target>
<!-- Documentation -->
<target name="documentation" depends="directories">
<!-- Transformations -->
<property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
<property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
<property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
<!-- Create a doc dir and move vs comment files to it-->
<mkdir dir="${docs.dir}" />
<copy todir="${docs.dir}">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
</fileset>
</copy>
<!-- Create or Cleanup Working Directory -->
<mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
<delete>
<fileset basedir="${sandcastle.workingdir}">
<include name="**\*" />
</fileset>
</delete>
<copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
<filterchain>
<replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
<replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
</filterchain>
</copy>
<!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
<exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
<arg value="&quot;${build.dir}\bin\businesslogic.dll&quot; " />
<arg value="&quot;${build.dir}\bin\cms.dll&quot; " />
<arg value="&quot;${build.dir}\bin\controls.dll&quot; " />
<arg value="&quot;${build.dir}\bin\interfaces.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.datalayer.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.editorcontrols.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.providers.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.webservices.dll&quot; " />
<arg value="/out:reflection.org" />
</exec>
<!-- Regroup overloads -->
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
<arg value="reflection.org" />
<arg value="/xsl:&quot;${sandcastle.addfriendlyfilenames.xsl}&quot;" />
<arg value="/out:reflection.xml" />
</exec>
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
<arg value="reflection.org" />
<arg value="/xsl:&quot;${sandcastle.reflectiontomanifest.xsl}&quot;" />
<arg value="/out:manifest.xml" />
</exec>
<exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
<arg value="/config:Sandcastle.config" />
<arg value="manifest.xml" />
</exec>
</target>
<!-- do the full release with docs, minify and nightly file distribution -->
<target name="release" depends="zip">
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
<mkdir dir="${public.dir}\${build.version}" />
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
</target>
<!-- do the full release with docs, minify and nightly file distribution -->
<target name="zip" depends="directories">
<property name="assembly.name" value="${build.number}"/>
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
<zip zipfile="${release.filename}" includeemptydirs="true" >
<fileset basedir="${root.dir}">
<include name="build/*" />
<include name="build/**/*" />
</fileset>
</zip>
<zip zipfile="${root.dir}\SymbolFiles.zip" includeemptydirs="true" >
<fileset basedir="${root.dir}">
<include name="SymbolFiles/*" />
<include name="SymbolFiles/**/*" />
</fileset>
</zip>
<zip zipfile="${root.dir}\Umbraco.MacroEngines.Iron.zip" includeemptydirs="true" >
<fileset basedir="${root.dir}">
<include name="umbraco.macroEngines.Iron_build/*" />
<include name="umbraco.macroEngines.Iron_build/**/*" />
</fileset>
</zip>
</target>
<!-- do a nightly build without the minification and docs -->
<target name="nightly" depends="zip">
<property name="assembly.name" value="${build.number}"/>
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
<mkdir dir="${public.dir}\${build.version}" />
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
<copy file="${root.dir}\Umbraco.MacroEngines.Iron.zip" tofile="${public.dir}\${build.version}\Umbraco.MacroEngines.Iron.zip" />
<copy file="${root.dir}\SymbolFiles.zip" tofile="${public.dir}\${build.version}\SymbolFiles.zip" />
</target>
<!-- will produce the a clean /build folder and nothing else-->
<target name="test" depends="directories">
</target>
<target name="webPIRelease" depends="webPiFile">
<copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy_sha.txt" />
<copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
</target>
<!-- do the webdeploy release for web PI-->
<target name="webPiFile" depends="directories">
<property name="webpi.dir" value="${root.dir}\deploy" />
<delete dir="${webpi.dir}\umbraco" />
<mkdir dir="${webpi.dir}" />
<mkdir dir="${webpi.dir}\umbraco" />
<copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
<fileset basedir="${root.dir}\build">
<include name="*" />
<include name="**/*" />
</fileset>
</copy>
<copy todir="${webpi.dir}\umbraco\bin" includeemptydirs="true" >
<fileset basedir="${dlls.dir}\SQLCE4">
<include name="*" />
<include name="**/*" />
</fileset>
</copy>
<copy file="${root.dir}\components\SQLCE4Umbraco\bin\${build.configuration}\SQLCE4Umbraco.dll" tofile="${webpi.dir}\umbraco\bin\SQLCE4Umbraco.dll" failonerror="false" overwrite="true"/>
<copy file="${WebPiAssets.dir}\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
<copy file="${WebPiAssets.dir}\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
<copy file="${WebPiAssets.dir}\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
<property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
<zip zipfile="${webpi.filename}" includeemptydirs="true" >
<fileset basedir="${webpi.dir}">
<include name="*" />
<include name="**/*" />
</fileset>
</zip>
<exec program="${win.dir}\hashMyFiles.exe">
<arg value="/file &quot;${webpi.filename}&quot;" />
<arg value="/stext &quot;${root.dir}\webPi_sha.txt&quot;" />
</exec>
</target>
<target name="init" description="init tasks for the build">
<!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
<delete>
<fileset>
<include name="${build.dir}\umbraco\plugins\*" />
<exclude name="${build.dir}\umbraco\plugins\tinymce3" />
</fileset>
</delete>
<delete dir="${build.dir}" />
<mkdir dir="${build.dir}" />
</target>
</project>
-149
View File
@@ -1,149 +0,0 @@
<?xml version="1.0" ?>
<project name="umbraco" default="test" basedir=".">
<description>Build the umbraco 4.6 Application for asp.net 3.5</description>
<property name="nant.settings.currentframework" value="net-2.0" />
<!-- filenames and directories, generally won't change -->
<property name="public.dir" value="C:\Users\per\Documents\Projects\NugetServer\GalleryServer\src\Gallery.Server\App_Data\packages" />
<property name="root.dir" value="${directory::get-current-directory()}" />
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
<property name="build.dir" value="${root.dir}\build" />
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
<property name="nuget.dir" value="${root.dir}\nuget" />
<property name="nuget.app" value="C:\Program Files (x86)\nuget\nuget.exe" />
<property name="nuget.spec" value="${public.dir}\..\umbraco.nuspec" />
<property name="build.version" value="4.6.Beta"/>
<property name="win.dir" value="C:\windows" />
<target name="build" depends="init">
<!-- set everything to writable-->
<attrib normal="true" readonly="false">
<fileset basedir="${root.dir}">
<include name="**/*" />
</fileset>
</attrib>
<!-- Remove those damn DLR dlls that might be left behind by careless devs...-->
<!-- They will get added again after build is completed, no worries no dependencies during build-->
<delete>
<fileset>
<include name="${source.dir}\bin\IronPython.dll" />
<include name="${source.dir}\bin\IronPython.Modules.dll" />
<include name="${source.dir}\bin\IronRuby.dll" />
<include name="${source.dir}\bin\IronRuby.Libraries.dll" />
<include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
<include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
<include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
<include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
<include name="${source.dir}\bin\Microsoft.Scripting.dll" />
<include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
</fileset>
</delete>
<!-- build for 2.0 -->
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
<arg value="${root.dir}\umbraco.sln" />
<arg value="/v:n" />
<arg value="/p:WarningLevel=0" />
<arg value="/p:ToolsVersion=3.5" />
</exec>
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}\Net20&quot;"/>
<!-- build for 4.0 -->
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
<arg value="${root.dir}\umbraco.sln" />
<arg value="/v:n" />
<arg value="/p:WarningLevel=0" />
<arg value="/p:ToolsVersion=4.0" />
</exec>
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}\Net40&quot;"/>
</target>
<!-- Directories and files -->
<target name="directories" depends="build">
<!-- asp.net 2.0 SP1 DLR dlls -->
<delete>
<fileset>
<include name="${build.dir}\**\*" />
<exclude name="${build.dir}\**\businesslogic.dll" />
<exclude name="${build.dir}\**\cms.dll" />
<exclude name="${build.dir}\**\controls.dll" />
<exclude name="${build.dir}\**\Examine.dll" />
<exclude name="${build.dir}\**\interfaces.dll" />
<exclude name="${build.dir}\**\Microsoft.ApplicationBlocks.Data.dll" />
<exclude name="${build.dir}\**\umbraco.DataLayer.dll" />
<exclude name="${build.dir}\**\umbraco.dll" />
<exclude name="${build.dir}\**\umbraco.editorcontrols.dll" />
<exclude name="${build.dir}\**\umbraco.linq.core.dll" />
<exclude name="${build.dir}\**\umbraco.macrorenderings.dll" />
<exclude name="${build.dir}\**\umbraco.providers.dll" />
<exclude name="${build.dir}\**\UmbracoExamine.dll" />
</fileset>
</delete>
<copy todir="${nuget.dir}\lib\Net20">
<fileset basedir="${build.dir}\Net20\bin">
<include name="*.dll" />
</fileset>
</copy>
<copy todir="${nuget.dir}\lib\Net40">
<fileset basedir="${build.dir}\Net40\bin">
<include name="*.dll" />
</fileset>
</copy>
<copy file="${nuget.spec}" tofile="${nuget.dir}\umbraco.nuspec" failonerror="false" overwrite="true"/>
<xmlpoke
file="${nuget.dir}\umbraco.nuspec"
xpath="/package/metadata/version"
value="${build.version}" />
</target>
<!-- will produce the a clean /build folder and nothing else-->
<target name="nuget" depends="directories">
<exec program="${nuget.app}" commandline="pack &quot;${nuget.dir}\umbraco.nuspec&quot; /o &quot;${public.dir}&quot;"/>
</target>
<target name="test">
<exec program="${nuget.app}" commandline="pack &quot;${nuget.dir}\umbraco.nuspec&quot; /o &quot;${public.dir}&quot;"/>
</target>
<target name="init" description="init tasks for the build">
<!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
<delete>
<fileset>
<include name="${build.dir}\umbraco\plugins\*" />
<exclude name="${build.dir}\umbraco\plugins\tinymce3" />
</fileset>
</delete>
<delete dir="${build.dir}" />
<mkdir dir="${build.dir}" />
<delete dir="${nuget.dir}" />
<mkdir dir="${nuget.dir}" />
<mkdir dir="${nuget.dir}\lib\Net20" />
<mkdir dir="${nuget.dir}\lib\Net40" />
</target>
</project>
-310
View File
@@ -1,310 +0,0 @@
<?xml version="1.0" ?>
<project name="umbraco" default="test" basedir=".">
<description>Build the umbraco 3.1.x Application</description>
<!-- global properties, generally won't change -->
<property name="nant.settings.currentframework" value="net-2.0" />
<!-- filenames and directories, generally won't change -->
<property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
<property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.1" />
<property name="root.dir" value="${directory::get-current-directory()}" />
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
<property name="build.dir" value="${root.dir}\build" />
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
<property name="build.version" value="4.1"/>
<property name="docs.dir" value="${root.dir}\docs" />
<property name="win.dir" value="c:\WINDOWS" />
<property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
<!-- Sandcastle Directories -->
<property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
<property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
<property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
<!-- Sandcastle -->
<property name="sandcastle.mrefbuilder" value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
<property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
<property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
<!-- YUI -->
<property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
<!-- Build source -->
<target name="build" depends="init">
<attrib normal="true" readonly="false">
<fileset basedir="${root.dir}">
<include name="**/*" />
</fileset>
</attrib>
<exec program="${win.dir}\microsoft.net\framework\v3.5\msbuild.exe">
<arg value="${root.dir}\umbraco.sln" />
</exec>
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
</target>
<!-- Directories and files -->
<target name="directories" depends="build">
<!-- setup docs files -->
<mkdir dir="${docs.dir}" />
<copy todir="${docs.dir}">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
</fileset>
</copy>
<!--standard web.config-->
<copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
<!--standard /config files-->
<copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
<!--standard /data/packages files-->
<copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
<!-- Standard access.xml file-->
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\data\access.xml" failonerror="false" overwrite="true"/>
<!-- Standard create UI.xml-->
<copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
<!-- Standard empty cache file -->
<copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\data\umbraco.config" failonerror="false" overwrite="true"/>
<!-- Baseline Language file for translation tool -->
<copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
<!-- standard folders -->
<mkdir dir="${build.dir}\App_Code" />
<mkdir dir="${build.dir}\App_Data" />
<mkdir dir="${build.dir}\media" />
<mkdir dir="${build.dir}\masterpages" />
<mkdir dir="${build.dir}\scripts" />
<mkdir dir="${build.dir}\css" />
<mkdir dir="${build.dir}\python" />
<mkdir dir="${build.dir}\xslt" />
<mkdir dir="${build.dir}\usercontrols" />
<delete dir="${build.dir}\webservices" />
<delete dir="${build.dir}\umbracoBase" />
<delete dir="${build.dir}\Web References" />
<delete dir="${build.dir}\obj" />
<delete dir="${build.dir}\properties" />
<delete>
<fileset>
<include name="${build.dir}/**/*.build" />
<include name="${build.dir}/**/*.csproj" />
<include name="${build.dir}/**/*.vspscc" />
<include name="${build.dir}/**/*.scc" />
<include name="${build.dir}/**/*.sln" />
<include name="${build.dir}/**/*.compiled" />
<include name="${build.dir}/**/*.resx" />
<include name="${build.dir}/PrecompiledApp.config" />
<include name="${build.dir}/web.config.template" />
</fileset>
</delete>
</target>
<!-- Minify -->
<target name="minify" description="minify JS files" depends="directories">
<fileset basedir="${build.dir}" id="jsFileSet">
<include name="umbraco/css/*.css"/>
<include name="umbraco/js/**/*.js"/>
<include name="umbraco_client/**/*.js"/>
<include name="umbraco_client/**/*.css"/>
</fileset>
<property name="js_files" value=""/>
<foreach item="File" property="file">
<in>
<items refid="jsFileSet"/>
</in>
<do>
<exec program="java" workingdir="${YUICompressor.dir}" failonerror="false">
<arg value="-jar" />
<arg value="yuicompressor.jar" />
<arg value="-o" />
<arg value="${file}.min" />
<arg value="${file}" />
</exec>
<move file="${file}.min" tofile="${file}" overwrite="true" failonerror="false"/>
</do>
</foreach>
</target>
<!-- Documentation -->
<target name="documentation" depends="directories">
<!-- Transformations -->
<property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
<property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
<property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
<!-- Create a doc dir and move vs comment files to it-->
<mkdir dir="${docs.dir}" />
<copy todir="${docs.dir}">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
</fileset>
</copy>
<!-- Create or Cleanup Working Directory -->
<mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
<delete>
<fileset basedir="${sandcastle.workingdir}">
<include name="**\*" />
</fileset>
</delete>
<copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
<filterchain>
<replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
<replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
</filterchain>
</copy>
<!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
<exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
<arg value="&quot;${build.dir}\bin\businesslogic.dll&quot; " />
<arg value="&quot;${build.dir}\bin\cms.dll&quot; " />
<arg value="&quot;${build.dir}\bin\controls.dll&quot; " />
<arg value="&quot;${build.dir}\bin\interfaces.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.datalayer.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.editorcontrols.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.providers.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.webservices.dll&quot; " />
<arg value="/out:reflection.org" />
</exec>
<!-- Regroup overloads -->
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
<arg value="reflection.org" />
<arg value="/xsl:&quot;${sandcastle.addfriendlyfilenames.xsl}&quot;" />
<arg value="/out:reflection.xml" />
</exec>
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
<arg value="reflection.org" />
<arg value="/xsl:&quot;${sandcastle.reflectiontomanifest.xsl}&quot;" />
<arg value="/out:manifest.xml" />
</exec>
<exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
<arg value="/config:Sandcastle.config" />
<arg value="manifest.xml" />
</exec>
</target>
<!-- do the full release with docs, minify and nightly file distribution -->
<target name="release" depends="zip,minify">
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
<mkdir dir="${public.dir}\${build.version}" />
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
</target>
<!-- do the full release with docs, minify and nightly file distribution -->
<target name="zip" depends="directories">
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
<zip zipfile="${release.filename}" includeemptydirs="true" >
<fileset basedir="${root.dir}">
<include name="build/*" />
<include name="build/**/*" />
</fileset>
</zip>
</target>
<!-- do a nightly build without the minification and docs -->
<target name="nightly" depends="zip">
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
<mkdir dir="${public.dir}\${build.version}" />
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
</target>
<!-- will produce the a clean /build folder and nothing else-->
<target name="test" depends="directories">
</target>
<target name="webPIRelease" depends="release,webPiFile">
<copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\webPi_sha.txt" />
<copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
</target>
<!-- do the webdeploy release for web PI-->
<target name="webPiFile" depends="directories">
<property name="webpi.dir" value="${root.dir}\deploy" />
<delete dir="${webpi.dir}\umbraco" />
<mkdir dir="${webpi.dir}" />
<mkdir dir="${webpi.dir}\umbraco" />
<copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
<fileset basedir="${root.dir}">
<include name="build/*" />
<include name="build/**/*" />
</fileset>
</copy>
<copy file="d:\webpiAssets\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
<copy file="d:\webpiAssets\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
<copy file="d:\webpiAssets\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
<property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
<zip zipfile="${webpi.filename}" includeemptydirs="true" >
<fileset basedir="${webpi.dir}">
<include name="*" />
<include name="**/*" />
</fileset>
</zip>
<exec program="${win.dir}\hashMyFiles.exe">
<arg value="/file &quot;${webpi.filename}&quot;" />
<arg value="/stext &quot;${root.dir}\webPi_sha.txt&quot;" />
</exec>
</target>
<target name="init" description="init tasks for the build">
<delete dir="${build.dir}" />
<mkdir dir="${build.dir}" />
</target>
</project>
-248
View File
@@ -1,248 +0,0 @@
<?xml version="1.0" ?>
<project name="umbraco" default="compile" basedir=".">
<description>Build the umbraco 3.1.x Application</description>
<!-- global properties, generally won't change -->
<property name="nant.settings.currentframework" value="net-2.0" />
<!-- filenames and directories, generally won't change -->
<property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
<property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.0" />
<property name="root.dir" value="${directory::get-current-directory()}" />
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
<property name="build.dir" value="${root.dir}\build" />
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
<property name="build.major" value="4"/>
<property name="build.minor" value="0"/>
<property name="build.build" value="0"/>
<property name="build.revision" value="0"/>
<property name="docs.dir" value="${root.dir}\docs" />
<property name="win.dir" value="c:\WINDOWS" />
<property name="cc.dir" value="C:\Program Files\CruiseControl.NET\server" />
<property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
<!-- Sandcastle Directories -->
<property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
<property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
<property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
<!-- Sandcastle Executables -->
<property name="sandcastle.mrefbuilder" value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
<property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
<property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
<!-- Transformations -->
<property name="sandcastle.ApplyVSDocModel.xsl" value="${sandcastle.dir}\ProductionTransforms\ApplyVSDocModel.xsl" />
<property name="sandcastle.addguidfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddGuidFilenames.xsl" />
<property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
<property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
<property name="sandcastle.reflectiontochmproject.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToChmProject.xsl" />
<property name="sandcastle.reflectiontochmcontents.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToChmContents.xsl" />
<property name="sandcastle.reflectiontochmindex.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToChmIndex.xsl" />
<property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
<target name="compile" depends="init">
<attrib normal="true" readonly="false">
<fileset basedir="${root.dir}">
<include name="**/*" />
</fileset>
</attrib>
<exec program="${win.dir}\microsoft.net\framework\v3.5\msbuild.exe">
<arg value="${root.dir}\umbraco.sln" />
</exec>
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
<!-- Moves stuff around and zips the distribution-->
<call target="zip"/>
<!-- Handles documentation
<call target="docs" />
-->
</target>
<target name="clean" description="remove generated files">
</target>
<target name="docs" description="generates documents">
<!-- Create a doc dir and move vs comment files to it-->
<mkdir dir="${docs.dir}" />
<copy todir="${docs.dir}">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
</fileset>
</copy>
<!-- Create or Cleanup Working Directory -->
<mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
<delete>
<fileset basedir="${sandcastle.workingdir}">
<include name="**\*" />
</fileset>
</delete>
<copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
<filterchain>
<replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
<replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
</filterchain>
</copy>
<!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
<exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
<arg value="&quot;${build.dir}\bin\businesslogic.dll&quot; " />
<arg value="&quot;${build.dir}\bin\cms.dll&quot; " />
<arg value="&quot;${build.dir}\bin\controls.dll&quot; " />
<arg value="&quot;${build.dir}\bin\interfaces.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.datalayer.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.editorcontrols.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.providers.dll&quot; " />
<arg value="&quot;${build.dir}\bin\umbraco.webservices.dll&quot; " />
<arg value="/out:reflection.org" />
</exec>
<!-- Regroup overloads -->
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
<arg value="reflection.org" />
<arg value="/xsl:&quot;${sandcastle.addfriendlyfilenames.xsl}&quot;" />
<arg value="/out:reflection.xml" />
</exec>
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
<arg value="reflection.org" />
<arg value="/xsl:&quot;${sandcastle.reflectiontomanifest.xsl}&quot;" />
<arg value="/out:manifest.xml" />
</exec>
<exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
<arg value="/config:Sandcastle.config" />
<arg value="manifest.xml" />
</exec>
</target>
<target name="zip" description="zip the release">
<mkdir dir="${docs.dir}" />
<copy todir="${docs.dir}">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
</fileset>
</copy>
<!--standard web.config-->
<copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
<!--standard /config files-->
<copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
<!--standard /data/packages files-->
<copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
<!-- Standard access.xml file-->
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\data\access.xml" failonerror="false" overwrite="true"/>
<!-- Standard create UI.xml-->
<copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
<!-- Standard empty cache file -->
<copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\data\umbraco.config" failonerror="false" overwrite="true"/>
<!-- Baseline Language file for translation tool -->
<copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
<!--
<delete dir="${build.dir}\umbraco\webservices\api" />
<mkdir dir="${build.dir}\umbraco\webservices\api" />
<copy todir="${build.dir}\umbraco\webservices\api">
<fileset basedir="${root.dir}\components\umbraco.webservices}">
<include name="*.asmx" />
</fileset>
</copy>
-->
<!-- standard folders -->
<mkdir dir="${build.dir}\App_Code" />
<mkdir dir="${build.dir}\media" />
<mkdir dir="${build.dir}\masterpages" />
<mkdir dir="${build.dir}\scripts" />
<mkdir dir="${build.dir}\css" />
<mkdir dir="${build.dir}\python" />
<mkdir dir="${build.dir}\xslt" />
<mkdir dir="${build.dir}\usercontrols" />
<delete dir="${build.dir}\webservices" />
<delete dir="${build.dir}\umbracoBase" />
<delete dir="${build.dir}\Web References" />
<delete dir="${build.dir}\obj" />
<delete dir="${build.dir}\properties" />
<delete>
<fileset>
<include name="${build.dir}/**/*.build" />
<include name="${build.dir}/**/*.csproj" />
<include name="${build.dir}/**/*.vspscc" />
<include name="${build.dir}/**/*.scc" />
<include name="${build.dir}/**/*.sln" />
<include name="${build.dir}/**/*.compiled" />
<include name="${build.dir}/**/*.resx" />
<include name="${build.dir}/PrecompiledApp.config" />
<include name="${build.dir}/web.config.template" />
</fileset>
</delete>
<property name="dist.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
<zip zipfile="${web.dir}\nightly\umbraco40.zip" includeemptydirs="true" >
<fileset basedir="${root.dir}">
<include name="build/*" />
<include name="build/**/*" />
</fileset>
</zip>
<copy file="${web.dir}\nightly\umbraco40.zip" tofile="${public.dir}\${dist.name}_${datetime::get-ticks(datetime::now())}.zip" />
<copy file="${root.dir}\build.xml" tofile="${web.dir}\nightly\build.xml">
<filterchain>
<replacetokens>
<token key="assembly" value="${dist.name}" />
<token key="date" value="${datetime::now()}" />
</replacetokens>
</filterchain>
</copy>
</target>
<target name="init" description="init tasks for the build">
<delete dir="${build.dir}" />
<mkdir dir="${build.dir}" />
</target>
</project>
+2 -1
View File
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>UmbracoCms.Core</id>
<version>4.9.0</version>
<version>$version$</version>
<title>Umbraco Cms Core Binaries</title>
<authors>Morten Christensen</authors>
<owners>Umbraco HQ</owners>
@@ -26,6 +26,7 @@
<file src="..\_BuildOutput\WebApp\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
<file src="..\_BuildOutput\WebApp\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Infrastructure.dll" target="lib\Microsoft.Web.Infrastructure.dll" />
+5 -2
View File
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>UmbracoCms</id>
<version>4.9.0</version>
<version>$version$</version>
<title>Umbraco Cms</title>
<authors>Morten Christensen</authors>
<owners>Umbraco HQ</owners>
@@ -15,7 +15,7 @@
<language>en-US</language>
<tags>umbraco</tags>
<dependencies>
<dependency id="UmbracoCms.Core" version="4.9.0" />
<dependency id="UmbracoCms.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
@@ -27,16 +27,19 @@
<file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />
<file src="..\_BuildOutput\WebApp\usercontrols\**" target="Content\usercontrols" />
<file src="..\_BuildOutput\WebApp\xslt\**" target="Content\xslt" />
<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" />
<file src="..\_BuildOutput\WebApp\default.aspx" target="Content\default.aspx" />
<file src="..\_BuildOutput\WebApp\Web.config" target="Content\Web.config" />
<file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
<file src="..\_BuildOutput\WebApp\App_Code\**" target="UmbracoFiles\App_Code" />
<file src="..\_BuildOutput\WebApp\App_Data\**" target="UmbracoFiles\App_Data" />
<file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
<file src="..\_BuildOutput\WebApp\config\**" target="UmbracoFiles\config" />
<file src="..\_BuildOutput\WebApp\install\**" target="UmbracoFiles\install" />
<file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
<file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
<file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
<file src="..\_BuildOutput\WebApp\Global.asax" target="UmbracoFiles\Global.asax" />
<file src="tools\install.ps1" target="tools\install.ps1" />
<file src="tools\Readme.txt" target="tools\Readme.txt" />
</files>
+128
View File
@@ -0,0 +1,128 @@
@ECHO OFF
:choice
set /P c=WARNING! Are you sure you want to continue, this will remove all package files, view files, sqlce database, etc... Press 'Y' to auto-remove all files/folders, 'N' to cancel or 'C' to prompt for each folder removal?
if /I "%c%" EQU "C" goto :prompt
if /I "%c%" EQU "Y" goto :auto
if /I "%c%" EQU "N" goto :exit
goto :choice
:prompt
echo Current folder: %CD%
echo Removing sqlce database
del ..\src\Umbraco.Web.UI\App_Data\Umbraco.sdf
echo Resetting installedPackages.config
echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
echo Removing plugin cache files
del ..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*
echo Removing cache files and examine index
del ..\src\Umbraco.Web.UI\App_Data\TEMP\*.*
echo Removing log files
del ..\src\Umbraco.Web.UI\App_Data\Logs\*.*
echo Removing packages
del ..\src\Umbraco.Web.UI\App_Data\packages\*.*
echo Removing previews
del ..\src\Umbraco.Web.UI\App_Data\preview\*.*
echo Removing app code files (typically added by starterkits)
del ..\src\Umbraco.Web.UI\App_Code\*.*
echo Removing xslt files
del ..\src\Umbraco.Web.UI\xslt\*.*
echo Removing user control files
del ..\src\Umbraco.Web.UI\UserControls\*.*
echo Removing masterpage files
del ..\src\Umbraco.Web.UI\masterpages\*.*
echo Removing view files
del ..\src\Umbraco.Web.UI\Views\*.*
echo Removing razor files
del ..\src\Umbraco.Web.UI\macroScripts\*.*
echo Removing media files
del ..\src\Umbraco.Web.UI\media\*.*
echo Removing script files
del ..\src\Umbraco.Web.UI\scripts\*.*
echo Removing css files
del ..\src\Umbraco.Web.UI\css\*.*
echo "Umbraco install reverted to clean install"
pause
exit
:auto
echo Current folder: %CD%
echo Removing sqlce database
del ..\src\Umbraco.Web.UI\App_Data\Umbraco.sdf
echo Resetting installedPackages.config
echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
echo Removing plugin cache files
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*) DO DEL %%A
echo Removing cache files and examine index
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\*.*) DO DEL %%A
echo Removing log files
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\Logs\*.*) DO DEL %%A
echo Removing packages
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\packages\*.*) DO DEL %%A
echo Removing previews
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\preview\*.*) DO DEL %%A
echo Removing app code files (typically added by starterkits)
FOR %%A IN (..\src\Umbraco.Web.UI\App_Code\*.*) DO DEL %%A
echo Removing xslt files
FOR %%A IN (..\src\Umbraco.Web.UI\xslt\*.*) DO DEL %%A
echo Removing masterpage files
FOR %%A IN (..\src\Umbraco.Web.UI\masterpages\*.*) DO DEL %%A
echo Removing user control files
FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
echo Removing view files
FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
echo Removing razor files
FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
echo Removing media files
FOR %%A IN (..\src\Umbraco.Web.UI\media\*.*) DO DEL %%A
echo Removing script files
FOR %%A IN (..\src\Umbraco.Web.UI\scripts\*.*) DO DEL %%A
echo Removing css files
FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A
echo "Umbraco install reverted to clean install"
pause
exit
:exit
exit
Binary file not shown.
-24
View File
@@ -1,24 +0,0 @@
Hi! Thanks for grabbing the Umbraco sourcecode.
===========================================
NOTE - DEFAULT BRANCH EMPTY - December 2010
===========================================
- With the help of CodePlex we have migrated much of our previous changesets (as of Dec 13th 2010) from TFS to Mercurial.
- However, not everything could be migrated to our new branching workflow. So for each nominal group of 4.x changes, we've created named branches. For upcoming 5.x changesets, we'll adhere to our new workflow which we'll describe on the Wiki for contributors.
- FOR THE MOMENT, the 'default' branch is empty - pending the addition of the 5.0 changesets
- To switch to the codebase on which you want to work, 'hg update' to the named branch (e.g. "4.6.0") or tag (e.g. "Release-4.5.2") and browse or work from that point.
Thanks to Matt Hawley at CodePlex for his help in our migration!
Cheers,
The Umbraco Team
http://umbraco.org
http://our.umbraco.org
http://umbraco.codeplex.com
-82
View File
@@ -1,82 +0,0 @@
{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f36\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}
{\f39\froman\fcharset238\fprq2 Times New Roman CE;}{\f40\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f42\froman\fcharset161\fprq2 Times New Roman Greek;}{\f43\froman\fcharset162\fprq2 Times New Roman Tur;}
{\f44\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f45\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f46\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f47\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
{\f399\fswiss\fcharset238\fprq2 Tahoma CE;}{\f400\fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f402\fswiss\fcharset161\fprq2 Tahoma Greek;}{\f403\fswiss\fcharset162\fprq2 Tahoma Tur;}{\f404\fswiss\fcharset177\fprq2 Tahoma (Hebrew);}
{\f405\fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f406\fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f407\fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f408\fswiss\fcharset222\fprq2 Tahoma (Thai);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;
\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;
\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive
\ssemihidden Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\f36\fs16\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 \ssemihidden \styrsid668380 Balloon Text;}}{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\listtable{\list\listtemplateid130696116{\listlevel\levelnfc0\levelnfcn0\leveljc0
\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
{\leveltext\'02\'01.;}{\levelnumbers\'01;}\fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\fi-360\li2160
\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc0\levelnfcn0\leveljc0
\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
{\leveltext\'02\'05.;}{\levelnumbers\'01;}\fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\fi-360\li5040
\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc0\levelnfcn0\leveljc0
\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid723138990}}{\*\listoverridetable{\listoverride\listid723138990\listoverridecount0\ls1}}
{\*\pgptbl {\pgp\ipgp2\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp4\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid288726\rsid668380\rsid1077358\rsid1250157\rsid1778664
\rsid2232581\rsid3018318\rsid3766585\rsid4417501\rsid4531485\rsid4807452\rsid5341002\rsid7018004\rsid7880391\rsid10749719\rsid12150908\rsid12939982\rsid13596669\rsid15149892\rsid15551579\rsid16128754\rsid16674677}{\*\generator Microsoft Word 11.0.6359;}
{\info{\title Shared Source License for Software included in Workspaces}{\author suev}{\operator Martin Maly}{\creatim\yr2005\mo3\dy22\hr10\min45}{\revtim\yr2005\mo3\dy22\hr15\min54}{\printim\yr2002\mo9\dy20\hr15\min39}{\version3}{\edmins1}{\nofpages1}
{\nofwords672}{\nofchars3837}{\*\company Microsoft}{\nofcharsws4501}{\vern24703}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984
\dghshow1\dgvshow1\jexpand\viewkind5\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
\asianbrkrule\nojkernpunct\rsidroot15149892 \fet0\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3
\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain
\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\fs28\insrsid1250157\charrsid1250157 Shared Source License for }{\b\fs28\insrsid16674677 IronPython}{
\b\fs28\insrsid1250157
\par }{\b\fs28\insrsid5341002
\par }{\b\insrsid5341002\charrsid5341002 This license governs use of the accompanying software}{\b\insrsid5341002 (\'93Software\'94)}{\b\insrsid5341002\charrsid5341002 , and your use of the }{\b\insrsid5341002 S}{\b\insrsid5341002\charrsid5341002
oftware constitutes acceptance of this license.
\par }{\insrsid1250157\charrsid5341002
\par }{\b\insrsid1250157\charrsid1250157 You }{\b\insrsid5341002 may}{\b\insrsid1250157\charrsid1250157 use }{\b\insrsid5341002 the}{\b\insrsid1250157\charrsid1250157 Software for any }{\b\insrsid1250157 commercial or }{\b\insrsid1250157\charrsid1250157
noncommercial purpose, including distributing derivative}{\b\insrsid4417501 work}{\b\insrsid1250157\charrsid1250157 s}{\b\insrsid1250157 .
\par }{\insrsid1250157
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1250157 {\insrsid1250157\charrsid1250157 In return, we simply require that you agree:
\par {\listtext\pard\plain\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 1.\tab}}\pard \ql \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid1250157 {\insrsid1250157\charrsid1250157
Not to remove any copyright}{\insrsid5341002 or other}{\insrsid1250157\charrsid1250157 notices from the Software.
\par {\listtext\pard\plain\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 2.\tab}That if you distribute the Software in source code form you do so only under this }{\insrsid5341002 l}{\insrsid1250157\charrsid1250157
icense (i.e. you must include a complete copy of this }{\insrsid5341002 l}{\insrsid1250157\charrsid1250157 icense with your distribution), and if you distribute the Software solely in object form you only do so under a license that complies with this }{
\insrsid5341002 l}{\insrsid1250157\charrsid1250157 icense.
\par {\listtext\pard\plain\b\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 3.\tab}}{\b\insrsid1250157\charrsid1250157
That the Software comes "as is", with no warranties. None whatsoever. This means no express, implied or statutory warranty, including without limitation, warranties of merchantability or fitness for a particular purpose or any warranty of }{
\b\insrsid5341002 title or }{\b\insrsid1250157\charrsid1250157 non}{\b\insrsid5341002 -}{\b\insrsid1250157\charrsid1250157 infringement. Also, you must pass this disclaimer on whenever you distribute the Software}{\b\insrsid5341002 or derivative works}{
\b\insrsid1250157\charrsid1250157 .}{\insrsid1250157\charrsid1250157
\par {\listtext\pard\plain\b\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 4.\tab}}{\b\insrsid1250157\charrsid1250157 That neither Microsoft nor }{\b\insrsid1250157 any contributor to the Software}{\b\insrsid1250157\charrsid1250157
will be liable for any of those types of damages known as}{\b\insrsid5341002 }{\b\insrsid1250157\charrsid1250157 indirect, special, consequential, or incidental related to the Software or this }{\b\insrsid5341002 l}{\b\insrsid1250157\charrsid1250157
icense, to the maximum extent the law permits, no matter what legal theory it\rquote s based on. Also, you must pass this limitation of liability on whenever you distribute the Software}{\b\insrsid5341002 or derivative works}{
\b\insrsid1250157\charrsid1250157 .}{\insrsid1250157\charrsid1250157
\par {\listtext\pard\plain\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 5.\tab}That if you sue anyone over patents that you think may apply to the Software for a person's use of the Software, your license to the Software ends automatically.
\par {\listtext\pard\plain\insrsid1250157 \hich\af0\dbch\af0\loch\f0 6.\tab}}{\insrsid1250157 That the patent rights, if any, }{\insrsid288726 granted in this license}{\insrsid1250157\charrsid1250157 only apply to the Software, not to any derivative}{
\insrsid4417501 work}{\insrsid1250157\charrsid1250157 s you make.}{\insrsid3018318
\par {\listtext\pard\plain\insrsid3018318\charrsid3018318 \hich\af0\dbch\af0\loch\f0 7.\tab}}{\insrsid3018318\charrsid3018318 That if you are an agency of the U.S. Government, (i) Software provided pursuant to a solicitation issued on or after Dece
mber 1, 1995, is provided with the commercial license rights set forth in this license, and (ii) Software provided pursuant to a solicitation issued prior to December 1, 1995, is provided with \'93Restricted Rights\'94
as set forth in FAR, 48 C.F.R. 52.227-14 (June 1987) or DFAR, 48 C.F.R. 252.227-7013 (Oct 1988), as applicable.}{\insrsid1250157
\par {\listtext\pard\plain\insrsid1250157 \hich\af0\dbch\af0\loch\f0 8.\tab}That your rights under this License end automatically if you breach it in any way.
\par {\listtext\pard\plain\insrsid5341002 \hich\af0\dbch\af0\loch\f0 9.\tab}}{\insrsid5341002 That all rights not expressly granted to you in this license are reserved.
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1778664 {\insrsid1778664
\par }{\insrsid12150908 Read below}{\insrsid1778664 for answers to frequently asked questions about this license.
\par }{\insrsid12150908
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid12150908 {\b\insrsid12150908\charrsid12150908 Q: Is this license OSI compliant?
\par }{\insrsid12150908
A: This license has not been submitted to OSI, but it allows developers to take full advantage of a dynamic language on the CLR and to have the freedom to distribute their works for the benefit of the community at large. The license is half of a
page long and very straight forward. We believe it stands up to what developers demand of an "open" license.
\par
\par }{\b\insrsid12150908\charrsid12150908 Q: What copyright rights does the license grant me?
\par }{\insrsid12150908 A: The license grants you a copyright license to make unlimited copies of the Software in sour
ce or object code form, as well as to create Derivative Works (as that term is defined under US copyright law). This means that in addition to making unlimited copies of the Software, you have a copyright license to modify the Software and to use all or p
art of the Software to create a Derivative Work.
\par
\par }{\b\insrsid12150908\charrsid12150908 Q: What patent rights does the license grant me?
\par }{\insrsid12150908 A: This license grants you a patent license to use and distribute the Software under any Microsoft patent claims that read on the Software itself. In other wo
rds, if you create a modified version of the Software, you still retain the patent license to use and distribute the original portions of the Software under the specific Microsoft patent claims that read on the Software, but you do not have a patent licen
s
e as to the new functionality you may have added by modifying the Software. This result is typical of many common open source licenses, including the Common Public License (CPL) and the Mozilla Public License (MPL). In addition, this license grants no rig
h
ts to any Microsoft patents that read on other components or files not included in the Software. This means that no patent license is granted to use or distribute any other software or technology that may be needed to use the Software or was created from
t
he Software (for example, any compiled output of the Software, the combination of the Software with other hardware or other software, or any additional enabling technologies that may be necessary to make or use the Software or any final product that inclu
des the Software).}{\insrsid12150908
\par }{\insrsid12150908\charrsid1250157
\par }}
+30 -6
View File
@@ -1,9 +1,33 @@
!! Umbraco - the simple, flexible and friendly ASP.NET CMS
Umbraco - the simple, flexible and friendly ASP.NET CMS
=======================================================
For the first time on the Microsoft platform a free user and developer friendly cms that makes it quick and easy to create websites - or a breeze to build complex web applications. umbraco got award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 57.000 active websites including Heinz.com, Peugeot.com, NAIAS.com and Microsofts documentinteropinitiative.org website you can be sure that the technology is proven, stable and scales.
[url:More info at http://umbraco.org|http://umbraco.org]
!! Forums
We have a forum running on [url:http://our.umbraco.org]. The discussions area on CodePlex will be for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [url:http://our.umbraco.org].
More info at http://umbraco.com
!! Submitting Issues
Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [url:online guide|http://our.umbraco.org/wiki/how-tos/submitting-bug-reports].
Exploring the repository
========================
Most contributors will work on their own fork and should pick the branch in which they need their fix. For more information see:
http://our.umbraco.org/contribute/guidelines-for-core-contribution
Exploring the source
====================
The Umbraco source code is never required for you to start building sites. If you are not using the source code for debugging purposes or to contribute to the source then please download the binaries listed at http://umbraco.codeplex.com
With that said, the Umbraco solution can be opened in Visual Studio 2010 with SP1 installed or Visual Studio 2012.
Contributing
============
Umbraco is Open Source which means you can contribute to make it great!
Read all about it at http://our.umbraco.org/contribute
Forums
======
We have a forum running on http://our.umbraco.org for friendly community support.
Documentation
=============
Our documentation section provides help on installing and using Umbraco including API reference documentation: http://our.umbraco.org/documentation
Submitting Issues
=================
Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our online guide at http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
</configuration>
Binary file not shown.
+152
View File
@@ -0,0 +1,152 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
<!-- Enable the restore command to run before builds -->
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
<!-- Property that enables building a package from a project -->
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
<!-- Determines if package restore consent is required to restore packages -->
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
<!-- Download NuGet.exe if it does not already exist -->
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageSources)' == '' ">
<!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
<!--
<PackageSource Include="https://nuget.org/api/v2/" />
<PackageSource Include="https://my-nuget-source/nuget/" />
-->
<PackageSource Include="https://nuget.org/api/v2/" />
<PackageSource Include="http://www.myget.org/F/umbracocore/" />
</ItemGroup>
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
<!-- Windows specific commands -->
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
<PackagesConfig>packages.config</PackagesConfig>
</PropertyGroup>
<PropertyGroup>
<!-- NuGet command -->
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
<!-- Commands -->
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
<!-- We need to ensure packages are restored prior to assembly resolve -->
<ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
RestorePackages;
$(ResolveReferencesDependsOn);
</ResolveReferencesDependsOn>
<!-- Make the build depend on restore packages -->
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
$(BuildDependsOn);
BuildPackage;
</BuildDependsOn>
</PropertyGroup>
<Target Name="CheckPrerequisites">
<!-- Raise an error if we're unable to locate nuget.exe -->
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
<SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
<!--
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
This effectively acts as a lock that makes sure that the download operation will only happen once and all
parallel builds will have to wait for it to complete.
-->
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
</Target>
<Target Name="_DownloadNuGet">
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
</Target>
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(RestoreCommand)"
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
<Exec Command="$(RestoreCommand)"
LogStandardErrorAsError="true"
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
</Target>
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(BuildCommand)"
Condition=" '$(OS)' != 'Windows_NT' " />
<Exec Command="$(BuildCommand)"
LogStandardErrorAsError="true"
Condition=" '$(OS)' == 'Windows_NT' " />
</Target>
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<OutputFilename ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Reference Include="System.Core" />
<Using Namespace="System" />
<Using Namespace="System.IO" />
<Using Namespace="System.Net" />
<Using Namespace="Microsoft.Build.Framework" />
<Using Namespace="Microsoft.Build.Utilities" />
<Code Type="Fragment" Language="cs">
<![CDATA[
try {
OutputFilename = Path.GetFullPath(OutputFilename);
Log.LogMessage("Downloading latest version of NuGet.exe...");
WebClient webClient = new WebClient();
webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
return true;
}
catch (Exception ex) {
Log.LogErrorFromException(ex);
return false;
}
]]>
</Code>
</Task>
</UsingTask>
<UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<EnvKey ParameterType="System.String" Required="true" />
<EnvValue ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Using Namespace="System" />
<Code Type="Fragment" Language="cs">
<![CDATA[
try {
Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
}
catch {
}
]]>
</Code>
</Task>
</UsingTask>
</Project>
-38
View File
@@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<TestSettings name="INDIGO64 Tests" id="338122db-6049-471e-b696-cbaf25469edc" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
<Description>This is a default test run configuration for a local test run.</Description>
<Execution>
<Hosts type="ASP.NET" skipUnhostableTests="false">
<AspNet name="ASP.NET" executionType="Iis" urlToTest="http://sandbox1.umbraco.local">
<DevelopmentServer pathToWebSite="C:\Development\CodePlex\Umbraco\branches\4.1.0\umbraco\presentation" webApplicationRoot="/" />
</AspNet>
</Hosts>
<TestTypeSpecific>
<UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
<AssemblyResolution>
<TestDirectory useLoadContext="true" />
</AssemblyResolution>
</UnitTestRunConfig>
<WebTestRunConfiguration testTypeId="4e7599fa-5ecb-43e9-a887-cd63cf72d207">
<Browser name="Internet Explorer 7.0">
<Headers>
<Header name="User-Agent" value="Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)" />
<Header name="Accept" value="*/*" />
<Header name="Accept-Language" value="{{$IEAcceptLanguage}}" />
<Header name="Accept-Encoding" value="GZIP" />
</Headers>
</Browser>
</WebTestRunConfiguration>
</TestTypeSpecific>
<AgentRule name="LocalMachineDefaultRole">
<DataCollectors>
<DataCollector uri="datacollector://microsoft/TraceDebugger/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TraceDebuggerDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="IntelliTrace">
</DataCollector>
<DataCollector uri="datacollector://microsoft/HttpProxy/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.HttpProxyCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="ASP.NET Client Proxy for IntelliTrace and Test Impact">
</DataCollector>
<DataCollector uri="datacollector://microsoft/AspNetProfiler/1.0" assemblyQualifiedName="Microsoft.VisualStudio.PerformanceTools.DataCollection.AspNetProfileDataCollector, Microsoft.VisualStudio.PerformanceTools.DataCollection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="ASP.NET Profiler">
</DataCollector>
</DataCollectors>
</AgentRule>
</Execution>
</TestSettings>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -1,83 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--Created with Liquid XML Studio - FREE Community Edition 7.0.5.906 (http://www.liquid-technologies.com)-->
<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="DocumentTypes">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="DocumentType">
<xs:annotation>
<xs:documentation>Repesents an Umbraco Document Type and its known properties</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:complexContent mixed="false">
<xs:extension base="BaseStructure">
<xs:sequence>
<xs:element name="Description" type="xs:string" />
<xs:element name="Properties">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="Property">
<xs:complexType>
<xs:complexContent mixed="false">
<xs:extension base="BaseStructure">
<xs:sequence>
<xs:element name="Mandatory" type="xs:boolean" />
<xs:element name="RegularExpression" type="xs:string" />
<xs:element name="Type" type="xs:string" />
<xs:element name="ControlId" type="xs:string" />
<xs:element name="Description" type="xs:string" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Associations">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="Association" type="xs:string" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="ParentId" type="xs:int" use="required" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="DataContextName" use="required">
<xs:annotation>
<xs:documentation>Name prefix for the DataContext that will be generated</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:string" />
</xs:simpleType>
</xs:attribute>
<xs:attribute name="Serialization" use="required">
<xs:annotation>
<xs:documentation>Serialization mode of the generated classes</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="None" />
<xs:enumeration value="Unidirectional" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="PluralizeCollections" type="xs:boolean" use="required" />
</xs:complexType>
</xs:element>
<xs:complexType name="BaseStructure">
<xs:annotation>
<xs:documentation>Pairing of ID and Name</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Id" type="xs:int" />
<xs:element name="Name" type="xs:string" />
<xs:element name="Alias" type="xs:string" />
</xs:sequence>
</xs:complexType>
</xs:schema>
@@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:complexType name="nodeType">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="data">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="alias" type="xs:string" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" maxOccurs="unbounded" name="node" type="nodeType" />
</xs:sequence>
<xs:attribute name="id" type="xs:int" use="required" />
<xs:attribute name="version" type="xs:string" use="required" />
<xs:attribute name="parentID" type="xs:int" use="required" />
<xs:attribute name="level" type="xs:int" use="required" />
<xs:attribute name="writerID" type="xs:int" use="required" />
<xs:attribute name="creatorID" type="xs:int" use="required" />
<xs:attribute name="nodeType" type="xs:int" use="required" />
<xs:attribute name="template" type="xs:int" use="required" />
<xs:attribute name="sortOrder" type="xs:int" use="required" />
<xs:attribute name="createDate" type="xs:dateTime" use="required" />
<xs:attribute name="updateDate" type="xs:dateTime" use="required" />
<xs:attribute name="nodeName" type="xs:string" use="required" />
<xs:attribute name="urlName" type="xs:string" use="required" />
<xs:attribute name="writerName" type="xs:string" use="required" />
<xs:attribute name="creatorName" type="xs:string" use="required" />
<xs:attribute name="nodeTypeAlias" type="xs:string" use="required" />
<xs:attribute name="path" type="xs:string" use="required" />
</xs:complexType>
<xs:element name="root">
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="node" type="nodeType" />
</xs:sequence>
<xs:attribute name="id" type="xs:int" use="required" />
</xs:complexType>
</xs:element>
</xs:schema>
@@ -1,83 +0,0 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{324A7FA9-8F19-4D4D-B96A-6F673C82BC92}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>umbraco.LinqCore.Mockable.Tests</RootNamespace>
<AssemblyName>umbraco.LinqCore.Mockable.Tests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug - Fixed Version|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug - Fixed Version\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Rhino.Mocks, Version=3.5.0.1337, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\dep\Reference Assemblies\Mocking\Rhino.Mocks.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Runtime.Serialization">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="DataContextMockTest.cs" />
<Compile Include="MyUmbraco.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\umbraco.Linq.Core.csproj">
<Project>{31CAEC36-0C3D-4D69-B092-84866811EA07}</Project>
<Name>umbraco.Linq.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
@@ -1,84 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Rhino.Mocks;
using umbraco.Linq.Core;
using umbraco.Test;
namespace umbraco.LinqCore.Mockable.Tests
{
/// <summary>
/// Summary description for DataContextMockTest
/// </summary>
[TestClass]
public class DataContextMockTest
{
public DataContextMockTest()
{
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod]
public void DataContextMockTest_MockProvider()
{
var dataProvider = MockRepository.GenerateMock<UmbracoDataProvider>();
using (var ctx = new MyUmbracoDataContext(dataProvider))
{
}
}
[TestMethod, ExpectedException(typeof(NotImplementedException))]
public void DataContextMockTest_MockProviderThrowsException()
{
var dataProvider = MockRepository.GenerateMock<UmbracoDataProvider>();
dataProvider.Stub(d => d.LoadTree<CwsHome>()).Throw(new NotImplementedException());
using (var ctx = new MyUmbracoDataContext(dataProvider))
{
var homes = ctx.CwsHomes;
}
}
}
}
File diff suppressed because it is too large Load Diff
@@ -1,9 +0,0 @@
using System.Reflection;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Core")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Core")]
@@ -1,118 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TypeMock.ArrangeActAssert;
using umbraco.Test;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Summary description for AncestorTest
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class AncestorTest
{
public AncestorTest()
{
//
// TODO: Add constructor logic here
//
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod, Isolated]
public void AncestorTest_NoWhereCondition_Exists()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var textPage = ctx.CWSTextpages.First();
var hp = textPage.AncestorOrDefault<CWSHome>();
Assert.IsNotNull(hp);
}
}
[TestMethod, Isolated]
public void AncestorTest_NoWhereCondition_NotExists()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var textPage = ctx.CWSTextpages.First();
var a = textPage.AncestorOrDefault<CWSPhoto>();
Assert.IsNull(a);
}
}
[TestMethod, Isolated]
public void AncestorTest_Where_Exists()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var photo = ctx.CWSPhotos.First(p => p.Name.Contains("Umbraco"));
var gallery = photo.AncestorOrDefault<CWSGallery>(g => g.Name.Contains("Codegarden"));
Assert.IsNotNull(gallery);
}
}
[TestMethod, Isolated]
public void AncestorTest_Where_NotExists()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var photo = ctx.CWSPhotos.First(p => p.Name.Contains("Umbraco"));
var gallery = photo.AncestorOrDefault<CWSGallery>(g => g.Name.Contains("Bookhouses"));
Assert.IsNull(gallery);
}
}
}
}
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<add key="umbracoPath" value="umbraco.config"/>
</appSettings>
</configuration>
@@ -1,136 +0,0 @@
==========================================================================
Visual Studio Team System: Overview of Authoring and Running Tests
==========================================================================
This overview describes the features for authoring and running tests in
Visual Studio Team System and Visual Studio Team Edition for Software Testers.
Opening Tests
-------------
To open a test, open a test project or a test metadata file (a file with
extension .vsmdi) that contains the definition of the test. You can find
test projects and metadata files in Solution Explorer.
Viewing Tests
-------------
To see which tests are available to you, open the Test View window. Or,
if you have installed Team Edition for Software Testers, you can also open
the Test List Editor window to view tests.
To open the Test View window, click the Test menu, point to Windows, and
then click Test View. To open the Test List Editor window (if you have
installed Team Edition for Software Testers), click Test, point to Windows,
and then click Test List Editor.
Running Tests
-------------
You can run tests from the Test View window and the Test List Editor window.
See Viewing Tests to learn how to open these windows. To run one or more
tests displayed in the Test View window, first select the tests in that
window; to select multiple tests, hold either the Shift or CTRL key while
clicking tests. Then click the Run Tests button in the Test View window
toolbar.
If you have installed Visual Studio Team Edition for Software Testers, you can
also use the Test List Editor window to run tests. To run tests in Test List Editor,
select the check box next to each test that you want to run. Then click the
Run Tests button in the Test List Editor window toolbar.
Viewing Test Results
--------------------
When you run a test or a series of tests, the results of the test run will be
shown in the Test Results window. Each individual test in the run is shown on
a separate line so that you can see its status. The window contains an
embedded status bar in the top half of the window that provides you with
summary details of the complete test run.
To see more detailed results for a particular test result, double-click it in
the Test Results window. This opens a window that provides more information
about the particular test result, such as any specific error messages returned
by the test.
Changing the way that tests are run
-----------------------------------
Each time you run one or more tests, a collection of settings is used to
determine how those tests are run. These settings are contained in a “test
run configuration” file.
Here is a partial list of the changes you can make with a test run
configuration file:
- Change the naming scheme for each test run.
- Change the test controller that the tests are run on so that you can run
tests remotely.
- Gather code coverage data for the code being tested so that you can see
which lines of code are covered by your tests.
- Enable and disable test deployment.
- Specify additional files to deploy before tests are run.
- Select a different host, ASP.NET, for running ASP.NET unit tests.
- Select a different host, the smart device test host, for running smart device unit tests.
- Set various properties for the test agents that run your tests.
- Run custom scripts at the start and end of each test run so that you can
set up the test environment exactly as required each time tests are run.
- Set time limits for tests and test runs.
- Set the browser mix and the number of times to repeat Web tests in the
test run.
By default, a test run configuration file is created whenever you create a
new test project. You make changes to this file by double-clicking it in
Solution Explorer and then changing its settings. (Test run configuration
files have the extension .testrunconfig.)
A solution can contain multiple test run configuration files. Only one of
those files, known as the “Active” test run configuration file, is used to
determine the settings that are currently used for test runs. You select
the active test run configuration by clicking Select Active Test Run
Configuration on the Test menu.
-------------------------------------------------------------------------------
Test Types
----------
Using Visual Studio Team Edition for Software Testers, you can create a number
of different test types:
Unit test: Use a unit test to create a programmatic test in C++, Visual C# or
Visual Basic that exercises source code. A unit test calls the methods of a
class, passing suitable parameters, and verifies that the returned value is
what you expect.
There are three specialized variants of unit tests:
- Data-driven unit tests are created when you configure a unit test to be
called repeatedly for each row of a data source. The data from each row
is used by the unit test as input data.
- ASP.NET unit tests are unit tests that exercise code in an ASP.NET Web
application.
- Smart device unit tests are unit tests that are deployed to a smart device
or emulator and then executed by the smart device test host.
Web Test: Web tests consist of an ordered series of HTTP requests that you
record in a browser session using Microsoft Internet Explorer. You can have
the test report specific details about the pages or sites it requests, such
as whether a particular page contains a specified string.
Load Test: You use a load test to encapsulate non-manual tests, such as
unit, Web, and generic tests, and then run them simultaneously by using
virtual users. Running these tests under load generates test results,
including performance and other counters, in tables and in graphs.
Generic test: A generic test is an existing program wrapped to function as a
test in Visual Studio. The following are examples of tests or programs that
you can turn into generic tests:
- An existing test that uses process exit codes to communicate whether the
test passed or failed. 0 indicates passing and any other value indicates
a failure.
- A general program to obtain specific functionality during a test scenario.
- A test or program that uses a special XML file (called a “summary results
file”), to communicate detailed results.
Manual test: The manual test type is used when the test tasks are to be
completed by a test engineer as opposed to an automated script.
Ordered test: Use an ordered test to execute a set of tests in an order you
specify.
-------------------------------------------------------------------------------
@@ -1,93 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TypeMock.ArrangeActAssert;
using umbraco.Test;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Summary description for CacheTest
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class CacheTest
{
public CacheTest()
{
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod, Isolated]
public void CacheTest_ForcedRefresh()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var hps = ctx.CWSHomes;
ctx.CWSHomes.ReloadCache();
var reloadedHps = ctx.CWSHomes;
Assert.AreNotSame(reloadedHps, hps, "Force reload should result in a different object");
}
}
[TestMethod, Isolated]
public void CacheTest_RequeryLoadFromCache()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var hps = ctx.CWSHomes;
var requeriedHps = ctx.CWSHomes;
Assert.AreSame(requeriedHps, hps, "Requeried objects should result in the same collection");
}
}
}
}
@@ -1,102 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TypeMock.ArrangeActAssert;
using umbraco.Test;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Summary description for ChildTest
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class ChildTest
{
public ChildTest()
{
//
// TODO: Add constructor logic here
//
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod, Isolated]
public void ChildTest_ChildExist()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var pages = ctx.CWSHomes.First().CWSTextpages;
Assert.AreNotEqual(0, pages.Count());
}
}
[TestMethod, Isolated]
public void ChildTest_ChildToParent()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var page = ctx.CWSHomes.First().CWSTextpages.First();
Assert.AreEqual(ctx.CWSHomes.First().Id, page.Parent<CWSHome>().Id);
}
}
[TestMethod, Isolated]
public void ChildTest_AllChildren()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var hp = ctx.CWSHomes.First();
Assert.IsTrue(hp.Children.Count() > 0);
Assert.IsInstanceOfType(hp.Children.First(), typeof(CWSTextpage));
Assert.IsInstanceOfType(hp.Children.Skip(1).First(), typeof(CWSGalleryList));
}
}
}
}
@@ -1,130 +0,0 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A80528D0-E68C-4A94-9489-C712216665B0}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>umbraco.Linq.Core.Tests</RootNamespace>
<AssemblyName>umbraco.Linq.Core.Tests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug - Fixed Version|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug - Fixed Version\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Runtime.Serialization">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="TypeMock, Version=5.3.0.0, Culture=neutral, PublicKeyToken=3dae460033b8d8e2, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\dep\Reference Assemblies\Mocking\TypeMock.dll</HintPath>
</Reference>
<Reference Include="Typemock.ArrangeActAssert, Version=5.3.0.0, Culture=neutral, PublicKeyToken=3dae460033b8d8e2, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\dep\Reference Assemblies\Mocking\Typemock.ArrangeActAssert.Dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="AncestorTest.cs" />
<Compile Include="CacheTest.cs" />
<Compile Include="ChildTest.cs" />
<Compile Include="CwsReplicationTest.cs" />
<Compile Include="DataContextTest.cs" />
<Compile Include="Extensions.cs" />
<Compile Include="InheritanceTest.cs" />
<Compile Include="MockHelpers.cs" />
<Compile Include="MyUmbraco.Abstractions.cs" />
<Compile Include="MyUmbraco.designer.cs" />
<Compile Include="OrderingTest.cs" />
<Compile Include="ParentTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SelectTest.cs" />
<Compile Include="WhereTest.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="AuthoringTests.txt" />
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\dep\Test Helpers\umbraco.config">
<Link>umbraco.config</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\umbraco\businesslogic\umbraco.businesslogic.csproj">
<Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
<Name>umbraco.businesslogic</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\umbraco\datalayer\umbraco.datalayer.csproj">
<Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
<Name>umbraco.datalayer</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\umbraco\presentation\umbraco.presentation.csproj">
<Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
<Name>umbraco.presentation</Name>
</ProjectReference>
<ProjectReference Include="..\Core\umbraco.Linq.Core.csproj">
<Project>{31CAEC36-0C3D-4D69-B092-84866811EA07}</Project>
<Name>umbraco.Linq.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
@@ -1,85 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TypeMock.ArrangeActAssert;
using umbraco.Test;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Tests to replicate the functionality of the CWS2 xslt's
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class CwsReplicationTest
{
public CwsReplicationTest()
{
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod, Isolated]
public void CwsReplicationTest_ListGalleries()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var galleryList = ctx.CWSGalleryLists.First(); //this would really be a Where(g => g.Id == umbracoContext.Current.PageId.Value) but since I'm not really on a page...
var galleries = from g in galleryList.CWSGalleries
where g.CWSPhotos.Count() >= 1
orderby g.Name
select new
{
g.Name,
Url = umbraco.library.NiceUrl(g.Id),
Thumbnail = (string.IsNullOrEmpty(g.GalleryThumbnail) ? "/Assets/Placeholders/gallery_placeholder.gif" : g.GalleryThumbnail),
PhotoCount = g.CWSPhotos.Count(),
};
Assert.AreEqual(3, galleries.Count());
}
}
}
}
@@ -1,145 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TypeMock.ArrangeActAssert;
using umbraco.Linq.Core.Node;
using umbraco.Test;
using System.IO;
using System.Web;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Summary description for DataContextTest
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class DataContextTest
{
public DataContextTest()
{
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod, ExpectedException(typeof(ArgumentNullException))]
public void DataContextTest_FileNameRequired()
{
var nodeProvider = new NodeDataProvider(string.Empty);
}
[TestMethod, ExpectedException(typeof(FileNotFoundException))]
public void DataContextTest_FileMustExist()
{
var nodeProvider = new NodeDataProvider(@"C:\fakeFile.config");
}
[TestMethod]
public void DataContextTest_ConstructFromExistingProvider()
{
var nodeProvider = new NodeDataProvider(Path.Combine(Environment.CurrentDirectory, "umbraco.config"));
MyUmbracoDataContext ctx = new MyUmbracoDataContext(nodeProvider);
}
[TestMethod]
public void DataContextTest_EnsureSchemaValidation()
{
var nodeProvider = new NodeDataProvider(Path.Combine(Environment.CurrentDirectory, "umbraco.config"), true);
MyUmbracoDataContext ctx = new MyUmbracoDataContext(nodeProvider);
var hp = ctx.CWSHomes.First();
Assert.IsNotNull(hp);
}
[TestMethod, Isolated]
public void DataContextTest_DefaultConstructorIsNodeProvider()
{
MockHelpers.SetupFakeHttpContext();
var ctx = new MyUmbracoDataContext();
Assert.IsInstanceOfType(ctx.DataProvider, typeof(NodeDataProvider));
}
[TestMethod, Isolated]
public void DataContextTest_NodeCached()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var hp = ctx.CWSHomes.First();
var hp2 = ctx.CWSHomes.First();
Assert.AreSame(hp, hp2);
}
}
[TestMethod, Isolated]
public void DataContextTest_FullCache()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var one = ctx.CWSHomes;
var two = ctx.CWSHomes;
Assert.AreSame(one, two);
}
}
[TestMethod, Isolated]
public void DataContextTest_OfNodeTypes()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var tree = ctx.CWSHomes;
Assert.IsInstanceOfType(tree, typeof(NodeTree<CWSHome>));
Assert.IsInstanceOfType(tree.First().CWSTextpages, typeof(NodeAssociationTree<CWSTextpage>));
}
}
}
}
@@ -1,42 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using TypeMock.ArrangeActAssert;
namespace umbraco.Linq.Core.Tests
{
public static class Extensions
{
public static ActionRepeater<TReturn> WillReturnRepeat<TReturn>(this IPublicNonVoidMethodHandler<TReturn> ret, TReturn value, int numberOfReturns)
{
for (var i = 0; i < numberOfReturns; i++)
ret.WillReturn(value);
return new ActionRepeater<TReturn>(ret);
}
public static ActionRepeater<TReturn> CallOriginalRepeat<TReturn>(this IPublicNonVoidMethodHandler<TReturn> ret, int numberOfReturns)
{
for (var i = 0; i < numberOfReturns; i++)
ret.CallOriginal();
return new ActionRepeater<TReturn>(ret);
}
}
public class ActionRepeater<TReturn>
{
private IPublicNonVoidMethodHandler<TReturn> _actionRepeater;
public ActionRepeater(IPublicNonVoidMethodHandler<TReturn> actionRepeater)
{
_actionRepeater = actionRepeater;
}
public IPublicNonVoidMethodHandler<TReturn> AndThen()
{
return _actionRepeater;
}
}
}
@@ -1,80 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TypeMock.ArrangeActAssert;
using umbraco.Test;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Summary description for InheritanceTest
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class InheritanceTest
{
public InheritanceTest()
{
//
// TODO: Add constructor logic here
//
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod]
public void InheritanceTest_ImplementsBaseClass()
{
var tmp = new TextPageThreeCol();
Assert.AreEqual(typeof(CWSTextpageTwoCol), tmp.GetType().BaseType);
}
[TestMethod, Isolated]
public void InheritanceTest_PropertyFromBase()
{
var fake = Isolate.Fake.Instance<TextPageThreeCol>();
Assert.AreEqual(typeof(CWSTextpageTwoCol), fake.GetType().GetProperties().Single(p => p.Name == "Headertext").DeclaringType);
}
}
}
@@ -1,19 +0,0 @@
using System;
using System.Web;
using TypeMock.ArrangeActAssert;
using System.IO;
namespace umbraco.Linq.Core.Tests
{
internal class MockHelpers
{
public static void SetupFakeHttpContext()
{
HttpContext fakeHttpContext = Isolate.Fake.Instance<HttpContext>(Members.MustSpecifyReturnValues);
HttpServerUtility fakeServer = Isolate.Fake.Instance<HttpServerUtility>();
Isolate.WhenCalled(() => HttpContext.Current).WillReturn(fakeHttpContext);
Isolate.WhenCalled(() => fakeHttpContext.Server).WillReturn(fakeServer);
Isolate.WhenCalled(() => fakeServer.MapPath(string.Empty)).WillReturn(Path.Combine(Environment.CurrentDirectory, "umbraco.config"));
}
}
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -1,81 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TypeMock.ArrangeActAssert;
using umbraco.Test;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Summary description for OrderingTest
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class OrderingTest
{
public OrderingTest()
{
//
// TODO: Add constructor logic here
//
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod, Isolated]
public void OrderingTest_Date()
{
MockHelpers.SetupFakeHttpContext();
using (var orderedContext = new MyUmbracoDataContext())
{
var asc = orderedContext.CWSTextpages.OrderBy(p => p.CreateDate);
var desc = orderedContext.CWSTextpages.OrderByDescending(p => p.CreateDate);
Assert.AreEqual(asc.Count(), desc.Count());
Assert.AreNotEqual(asc.First().Id, desc.First().Id);
Assert.AreEqual(asc.First().Id, desc.Last().Id);
}
}
}
}
@@ -1,109 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TypeMock.ArrangeActAssert;
using umbraco.Test;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Summary description for ParentTest
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class ParentTest
{
public ParentTest()
{
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod, Isolated]
public void ParentTest_ParentIdExists()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var p = ctx.CWSTextpages.First();
Assert.AreNotEqual(0, p.ParentNodeId);
}
}
[TestMethod, Isolated]
public void ParentTest_ParentCreated()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var page = ctx.CWSTextpages.Single(p => p.Id == 1099);
Assert.AreEqual(1098, page.ParentNodeId);
var parent = page.Parent<CWSHome>();
Assert.AreEqual(page.ParentNodeId, parent.Id);
}
}
[TestMethod, Isolated]
public void ParentTest_TopParentNull()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var hp = ctx.CWSHomes.First();
Assert.IsNull(hp.Parent<CWSHome>());
}
}
[TestMethod, Isolated, ExpectedException(typeof(DocTypeMissMatchException))]
public void ParentTest_InvalidParentType()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var p = ctx.CWSPhotos.First().Parent<CWSHome>();
}
}
}
}
@@ -1,9 +0,0 @@
using System.Reflection;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Core")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Core")]
@@ -1,179 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using umbraco.Test;
using TypeMock.ArrangeActAssert;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Summary description for SelectTest
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class SelectTest
{
public SelectTest()
{
//
// TODO: Add constructor logic here
//
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod, Isolated]
public void SelectTest_LoopTree_Query()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var homePages = from hp in ctx.CWSHomes
select hp;
Assert.IsNotNull(homePages);
foreach (var item in homePages)
{
Assert.IsTrue(item.BodyText.Length > 0);
}
}
}
[TestMethod, Isolated]
public void SelectTest_LoopTree_Lambda()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var homePages = ctx.CWSHomes;
Assert.IsNotNull(homePages);
foreach (CWSHome item in homePages)
{
Assert.IsTrue(item.BodyText.Length > 0);
}
}
}
[TestMethod, Isolated]
public void SelectTest_SingleProperty_Query()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var homePageText = from hp in ctx.CWSHomes
select hp.BodyText;
Assert.IsNotNull(homePageText);
foreach (var item in homePageText)
{
Assert.IsNotNull(item);
}
}
}
[TestMethod, Isolated]
public void SelectTest_SingleProperty_Lambda()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var homePageText = ctx.CWSHomes.Select(hp => hp.BodyText);
Assert.IsNotNull(homePageText);
foreach (var item in homePageText)
{
Assert.IsNotNull(item);
}
}
}
[TestMethod, Isolated]
public void SelectTest_Anonymous_Query()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var anon = from hp in ctx.CWSHomes
select new
{
hp.BodyText,
CreatedDate = hp.CreateDate
};
Assert.IsNotNull(anon);
foreach (var item in anon)
{
Assert.IsNotNull(item.BodyText);
Assert.AreNotEqual(DateTime.MinValue, item.CreatedDate);
}
}
}
[TestMethod, Isolated]
public void SelectTest_Anonymous_Lambda()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var anon = ctx.CWSHomes.Select(hp => new
{
hp.BodyText,
CreatedDate = hp.CreateDate
});
Assert.IsNotNull(anon);
foreach (var item in anon)
{
Assert.IsNotNull(item.BodyText);
Assert.AreNotEqual(DateTime.MinValue, item.CreatedDate);
}
}
}
}
}
@@ -1,130 +0,0 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TypeMock.ArrangeActAssert;
using umbraco.Test;
namespace umbraco.Linq.Core.Tests
{
/// <summary>
/// Summary description for WhereTest
/// </summary>
[TestClass, DeploymentItem("umbraco.config")]
public class WhereTest
{
public WhereTest()
{
//
// TODO: Add constructor logic here
//
}
private TestContext testContextInstance;
/// <summary>
///Gets or sets the test context which provides
///information about and functionality for the current test run.
///</summary>
public TestContext TestContext
{
get
{
return testContextInstance;
}
set
{
testContextInstance = value;
}
}
#region Additional test attributes
//
// You can use the following additional attributes as you write your tests:
//
// Use ClassInitialize to run code before running the first test in the class
// [ClassInitialize()]
// public static void MyClassInitialize(TestContext testContext) { }
//
// Use ClassCleanup to run code after all tests in a class have run
// [ClassCleanup()]
// public static void MyClassCleanup() { }
//
// Use TestInitialize to run code before running each test
// [TestInitialize()]
// public void MyTestInitialize() { }
//
// Use TestCleanup to run code after each test has run
// [TestCleanup()]
// public void MyTestCleanup() { }
//
#endregion
[TestMethod, Isolated]
public void WhereTest_SingleParameter_Query()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var pages = from page in ctx.CWSTextpages
where page.BodyText.Length > 0
select page;
Assert.IsNotNull(pages);
Assert.IsTrue(pages.Count() > 0);
}
}
[TestMethod, Isolated]
public void WhereTest_DateTimeGreaterThan_Query()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var pages = from page in ctx.CWSTextpages
where page.CreateDate > DateTime.MinValue
select page;
Assert.IsNotNull(pages);
Assert.IsTrue(pages.Count() > 0);
}
}
[TestMethod, Isolated]
public void WhereTest_TwoParameter_Query()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var pages = from page in ctx.CWSTextpages
where page.BodyText.Length > 0
&& page.CreateDate > DateTime.MinValue
select page;
Assert.IsNotNull(pages);
Assert.IsTrue(pages.Count() > 0);
}
}
[TestMethod, Isolated]
public void WhereTest_ToAnonymous()
{
MockHelpers.SetupFakeHttpContext();
using (var ctx = new MyUmbracoDataContext())
{
var pages = from page in ctx.CWSTextpages
where page.BodyText.Length > 0
select new
{
page.Id,
page.BodyText
};
Assert.AreNotEqual(0, pages.Count());
}
}
}
}
@@ -1,29 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace umbraco.Linq.Core
{
/// <summary>
/// Represents the child items of TDocTypeBase
/// </summary>
/// <remarks>
/// This is used for creating a DataProvider specific child item collection of a DocType instance.
///
/// It allows a DocType to have strongly typed child associations, and accessors such as:
/// <example>
/// myDocType.SomeChildTypes
/// </example>
/// </remarks>
/// <typeparam name="TDocTypeBase">The type of the DocTypeBase which this association represents.</typeparam>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
public abstract class AssociationTree<TDocTypeBase> : Tree<TDocTypeBase> where TDocTypeBase : DocTypeBase, new()
{
/// <summary>
/// Gets or sets the parent node id which this AssociationTree is for
/// </summary>
/// <value>The parent node id.</value>
public int ParentNodeId { get; protected set; }
}
}
@@ -1,85 +0,0 @@
using System;
namespace umbraco.Linq.Core
{
/// <summary>
/// Standard umbraco info
/// </summary>
[global::System.AttributeUsage(AttributeTargets.Property | AttributeTargets.Class | AttributeTargets.Interface, Inherited = true, AllowMultiple = false)]
public sealed class UmbracoInfoAttribute : Attribute
{
/// <summary>
/// Initializes a new instance of the <see cref="UmbracoInfoAttribute"/> class.
/// </summary>
/// <param name="alias">The alias for this piece of umbraco info.</param>
public UmbracoInfoAttribute(string alias)
{
this.Alias = alias;
}
/// <summary>
/// Gets or sets the display name of the item.
/// </summary>
/// <value>The display name.</value>
public string DisplayName { get; set; }
/// <summary>
/// Gets or sets the alias.
/// </summary>
/// <value>The alias.</value>
public string Alias { get; private set; }
/// <summary>
/// Gets or sets a value indicating whether this property is mandatory.
/// </summary>
/// <value><c>true</c> if mandatory; otherwise, <c>false</c>.</value>
public bool Mandatory { get; set; }
}
/// <summary>
/// Marks a class as an umbraco DocType
/// </summary>
[global::System.AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, Inherited = true, AllowMultiple = false)]
public sealed class DocTypeAttribute : Attribute
{
/// <summary>
/// Initializes a new instance of the <see cref="DocTypeAttribute"/> class.
/// </summary>
public DocTypeAttribute()
{
}
}
/// <summary>
/// Marks a property as a standard umbraco field
/// </summary>
/// <remarks>
/// Example usage:
/// - ID
/// - ParentID
/// - CreateDate
/// </remarks>
[global::System.AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
public sealed class FieldAttribute : Attribute
{
/// <summary>
/// Initializes a new instance of the <see cref="FieldAttribute"/> class.
/// </summary>
public FieldAttribute()
{
}
}
/// <summary>
/// Marks a property as a custom umbraco DocType property
/// </summary>
[global::System.AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
public sealed class PropertyAttribute : Attribute
{
/// <summary>
/// Initializes a new instance of the <see cref="PropertyAttribute"/> class.
/// </summary>
public PropertyAttribute()
{
}
}
}
@@ -1,93 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClassDiagram MajorVersion="1" MinorVersion="1" GroupingSetting="Access" MembersFormat="NameAndType">
<Class Name="umbraco.Linq.Core.AssociationTree&lt;TDocTypeBase&gt;">
<Position X="1" Y="4.75" Width="2.25" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAA=</HashCode>
<FileName>AssociationTree.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="umbraco.Linq.Core.DocTypeBase" BaseTypeListCollapsed="true">
<Position X="8.25" Y="0.75" Width="4.5" />
<Compartments>
<Compartment Name="Internal" Collapsed="true" />
<Compartment Name="Private" Collapsed="true" />
</Compartments>
<TypeIdentifier>
<HashCode>MAASJAACAQCEAAAgAACUYAQBgACAAAAhEAIBAAEEAYI=</HashCode>
<FileName>DocTypeBase.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
<Class Name="umbraco.Linq.Core.Tree&lt;TDocType&gt;">
<Position X="2.5" Y="0.75" Width="3" />
<Compartments>
<Compartment Name="Private" Collapsed="true" />
</Compartments>
<TypeIdentifier>
<HashCode>AAAQAAAAAAAEABAQAAAAAAAAAAAAAAAEAAAAAAAAAAA=</HashCode>
<FileName>Tree.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
<Class Name="umbraco.Linq.Core.UmbracoDataContext" BaseTypeListCollapsed="true">
<Position X="13" Y="0.75" Width="3.5" />
<Compartments>
<Compartment Name="Private" Collapsed="true" />
</Compartments>
<TypeIdentifier>
<HashCode>AAAAAAAAACAEAAAAAAAAAABAAAAAAAAAAAAACACAAAA=</HashCode>
<FileName>UmbracoDataContext.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
<Class Name="umbraco.Linq.Core.Node.NodeAssociationTree&lt;TDocTypeBase&gt;">
<Position X="0.5" Y="6.75" Width="3.25" />
<Compartments>
<Compartment Name="Private" Collapsed="true" />
<Compartment Name="Internal" Collapsed="true" />
</Compartments>
<TypeIdentifier>
<HashCode>AAAUABAAAAAEABAQAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Node\NodeAssociationTree.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="umbraco.Linq.Core.Node.NodeDataProvider" BaseTypeListCollapsed="true">
<Position X="5.25" Y="12" Width="4.5" />
<Compartments>
<Compartment Name="Private" Collapsed="true" />
<Compartment Name="Internal" Collapsed="true" />
</Compartments>
<TypeIdentifier>
<HashCode>IAAAiAAAACAUAAQAAAABCKQAAAAAAAAAAAACKAiAAAA=</HashCode>
<FileName>Node\NodeDataProvider.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="umbraco.Linq.Core.Node.NodeTree&lt;TDocTypeBase&gt;">
<Position X="4.5" Y="4.75" Width="3.25" />
<Compartments>
<Compartment Name="Private" Collapsed="true" />
<Compartment Name="Internal" Collapsed="true" />
</Compartments>
<TypeIdentifier>
<HashCode>AAASABAAAAAEABAQAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Node\NodeTree.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="umbraco.Linq.Core.UmbracoDataProvider">
<Position X="5.25" Y="8.75" Width="4.5" />
<TypeIdentifier>
<HashCode>AAAAgAAAACAAAAQAAAABAAQAAAAAAAAAAAAAAACAAAA=</HashCode>
<FileName>UmbracoDataProvider.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
<Interface Name="umbraco.Linq.Core.ITree">
<Position X="5.75" Y="0.75" Width="2.25" />
<TypeIdentifier>
<HashCode>AAAQAAAAAAAEAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>ITree.cs</FileName>
</TypeIdentifier>
</Interface>
<Font Name="Segoe UI" Size="9" />
</ClassDiagram>
@@ -1,442 +0,0 @@
using System;
using System.ComponentModel;
using System.Linq;
using System.Runtime.Serialization;
using umbraco.BusinessLogic;
using System.Collections.Generic;
using System.Text.RegularExpressions;
namespace umbraco.Linq.Core
{
/// <summary>
/// Provides the base framework for an umbraco item
/// </summary>
[DataContract]
public class DocTypeBase : IDocTypeBase //This class should be abstract but it can't be done AND achieve the Children property like this
{
#region Internal Storage
private int _Id;
private string _nodeName;
private string _versionId;
private int _templateId;
private int _parentId;
private int writerID;
private User _writer;
private int creatorID;
private User _creator;
private string _path;
private IEnumerable<DocTypeBase> _ancestors;
private AssociationTree<DocTypeBase> _children;
#endregion
/// <summary>
/// Initializes a new instance of the <see cref="DocTypeBase"/> class.
/// </summary>
public DocTypeBase()
{
this.IsDirty = true;
}
/// <summary>
/// Gets or sets the provider.
/// </summary>
/// <value>The provider.</value>
protected internal UmbracoDataProvider Provider { get; set; }
/// <summary>
/// Gets or sets a value indicating whether this instance has been modified since it was first loaded
/// </summary>
/// <value><c>true</c> if this instance has been modified; otherwise, <c>false</c>.</value>
public bool IsDirty { get; protected internal set; }
#region Fields
/// <summary>
/// Gets or sets the id of the umbraco item
/// </summary>
/// <value>The id.</value>
[Field]
[UmbracoInfo("id", DisplayName = "Id", Mandatory = true), DataMember(Name = "Id")]
public virtual int Id
{
get
{
return this._Id;
}
protected internal set
{
if (this._Id != value)
{
this.RaisePropertyChanging();
this._Id = value;
this.RaisePropertyChanged("Id");
}
}
}
/// <summary>
/// Gets or sets the name (title) of the umbraco item
/// </summary>
/// <value>The name.</value>
[Field]
[UmbracoInfo("nodeName", DisplayName = "NodeName", Mandatory = true), DataMember(Name = "NodeName")]
public virtual string NodeName
{
get
{
return this._nodeName;
}
set
{
if (this._nodeName != value)
{
this.RaisePropertyChanging();
this._nodeName = value;
this.IsDirty = true;
this.RaisePropertyChanged("NodeName");
}
}
}
[Field]
[Obsolete("Name property is obsolete, use NodeName instead")] //this is because most people expect NodeName not Name as the property
public virtual string Name
{
get
{
return this.NodeName;
}
set
{
this.NodeName = value;
}
}
/// <summary>
/// Gets or sets the template ID of the umbraco item
/// </summary>
/// <value>The name.</value>
[Field]
[UmbracoInfo("template", DisplayName = "Template", Mandatory = true), DataMember(Name = "TemplateId")]
public virtual int TemplateId
{
get
{
return this._templateId;
}
set
{
if (this._templateId != value)
{
this.RaisePropertyChanging();
this._templateId = value;
this.IsDirty = true;
this.RaisePropertyChanged("Template");
}
}
}
/// <summary>
/// Gets or sets the version of the umbraco item
/// </summary>
/// <value>The version.</value>
[Field]
[UmbracoInfo("version", DisplayName = "Version", Mandatory = true), DataMember(Name = "Version")]
public virtual string Version
{
get
{
return this._versionId;
}
protected internal set
{
if (this._versionId != value)
{
this.RaisePropertyChanging();
this._versionId = value;
this.RaisePropertyChanged("Version");
}
}
}
/// <summary>
/// Gets or sets the ID of the parent node.
/// </summary>
/// <value>The parent node id.</value>
[Field]
[UmbracoInfo("parentID", DisplayName = "ParentId", Mandatory = true), DataMember(Name = "ParentId")]
public virtual int ParentNodeId
{
get
{
return this._parentId;
}
set
{
if (this._parentId != value)
{
this.RaisePropertyChanging();
this._parentId = value;
this.RaisePropertyChanged("ParentId");
}
}
}
/// <summary>
/// Gets or sets the created date.
/// </summary>
/// <value>The create date.</value>
[Field]
[UmbracoInfo("createDate", DisplayName = "CreateDate"), DataMember(Name = "CreateDate")]
public virtual DateTime CreateDate { get; set; }
/// <summary>
/// Gets or sets the sort order.
/// </summary>
/// <value>The sort order.</value>
[Field]
[UmbracoInfo("sortOrder", DisplayName = "SortOrder"), DataMember(Name = "SortOrder")]
public virtual int SortOrder { get; set; }
/// <summary>
/// Gets or sets the last updated date of the current version
/// </summary>
/// <value>The update date.</value>
[Field]
[UmbracoInfo("updateDate", DisplayName = "UpdateDate"), DataMember(Name = "UpdateDate")]
public virtual DateTime UpdateDate { get; set; }
/// <summary>
/// Gets or sets the level of this item in the content tree
/// </summary>
/// <value>The level.</value>
[Field]
[UmbracoInfo("level", DisplayName = "Level"), DataMember(Name = "Level")]
public virtual int Level { get; set; }
/// <summary>
/// Gets or sets the path.
/// </summary>
/// <value>The path.</value>
[Field]
[UmbracoInfo("path", DisplayName = "Path")]
[DataMember(Name = "Path")]
public virtual string Path
{
get
{
return this._path;
}
set
{
if (this._path != value)
{
this.RaisePropertyChanging();
this._path = value;
this.RaisePropertyChanged("Path");
}
}
}
#endregion
#region Parents and Children
/// <summary>
/// Gets the children of this DocType instance.
/// </summary>
/// <value>The children of this DocType instance.</value>
public AssociationTree<DocTypeBase> Children
{
get
{
if (this._children == null)
{
this._children = this.Provider.LoadAssociation(this.Id); //tell the provider to create it
}
return this._children;
}
}
/// <summary>
/// Gets the children which are of the type TDocTypeBase.
/// </summary>
/// <typeparam name="TDocTypeBase">The DocType of the children desired.</typeparam>
/// <returns>An <see cref="umbraco.Linq.Core.AssociationTree&lt;TDocTypeBase&gt;"/> of the children</returns>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
protected AssociationTree<TDocTypeBase> ChildrenOfType<TDocTypeBase>() where TDocTypeBase : DocTypeBase, new()
{
return this.Provider.LoadAssociation<TDocTypeBase>(this.Children.Where(d => d is TDocTypeBase).Cast<TDocTypeBase>());
}
/// <summary>
/// Parent this instance.
/// </summary>
/// <typeparam name="TParent">The type of the parent.</typeparam>
/// <returns>Null when at the root level, else the parent instance</returns>
/// <exception cref="umbraco.Linq.Core.DocTypeMissMatchException">If the type of the parent does not match the provided type</exception>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
public virtual TParent Parent<TParent>() where TParent : DocTypeBase, new()
{
if (this._parentId == -1)
{
return null;
}
return this.Provider.Load<TParent>(this._parentId);
}
/// <summary>
/// Retrieves the first matching ancestor of the current type
/// </summary>
/// <remarks>
/// Provides similar functionality to the XPath method
/// </remarks>
/// <returns>First ancestor matching type. Null if no match found</returns>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
public TDocType AncestorOrDefault<TDocType>() where TDocType : DocTypeBase
{
return this.AncestorOrDefault<TDocType>(t => true); //just a simple little true statement ;)
}
/// <summary>
/// Retrieves the first matching ancestor of the current type and additional boolean function
/// </summary>
/// <typeparam name="TDocType">The type of the doc type.</typeparam>
/// <param name="func">Additional boolean operation to filter on</param>
/// <returns>First ancestor matching type and function. Null if no match found</returns>
/// <exception cref="System.ArgumentNullException">Func parameter required</exception>
public TDocType AncestorOrDefault<TDocType>(Func<TDocType, bool> func) where TDocType : DocTypeBase
{
if (func == null)
{
throw new ArgumentNullException("func");
}
if (this._ancestors == null)
{
this._ancestors = this.Provider.LoadAncestors(this.Id);
}
return this._ancestors.Where(a => a is TDocType).Cast<TDocType>().FirstOrDefault(func);
}
#endregion
/// <summary>
/// Gets or sets the creator ID.
/// </summary>
/// <value>The creator ID.</value>
public int CreatorID
{
get
{
return creatorID;
}
internal set
{
this.creatorID = value;
}
}
/// <summary>
/// Gets the umbraco user who created the item
/// </summary>
/// <value>The creator.</value>
public virtual User Creator
{
get
{
if (this._creator == null)
{
this._creator = new User(this.CreatorID);
}
return this._creator;
}
}
public virtual string CreatorName { get; internal set; }
/// <summary>
/// ID of the user who last edited the item
/// </summary>
public int WriterID
{
get
{
return writerID;
}
internal set
{
this.writerID = value;
}
}
/// <summary>
/// Gets the umbraco user who last edited the instance
/// </summary>
/// <value>The writer.</value>
public virtual User Writer
{
get
{
if (this._writer == null)
{
this._writer = new User(this.WriterID);
}
return this._writer;
}
}
public virtual string WriterName { get; internal set; }
/// <summary>
/// Raises the property changing event.
/// </summary>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1030:UseEventsWhereAppropriate")]
protected virtual void RaisePropertyChanging()
{
if (this.PropertyChanging != null)
{
this.PropertyChanging(this, new PropertyChangingEventArgs(String.Empty));
}
}
/// <summary>
/// Raises the property changed event.
/// </summary>
/// <param name="name">The name of the changed property.</param>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1030:UseEventsWhereAppropriate")]
protected virtual void RaisePropertyChanged(string name)
{
if (this.PropertyChanged != null)
{
this.PropertyChanged(this, new PropertyChangedEventArgs(name));
}
}
#region INotifyPropertyChanging Members
/// <summary>
/// Occurs when a property value is changing.
/// </summary>
public event PropertyChangingEventHandler PropertyChanging;
#endregion
#region INotifyPropertyChanged Members
/// <summary>
/// Occurs when a property value changes.
/// </summary>
public event PropertyChangedEventHandler PropertyChanged;
#endregion
protected void ValidateProperty(string regex, string value)
{
Regex r = new Regex(regex);
if (!r.IsMatch(value))
{
throw new InvalidCastException("Value does not match validation expression from Umbraco");
}
}
}
}
@@ -1,128 +0,0 @@
using System;
namespace umbraco.Linq.Core
{
/// <summary>
/// Exception for when the provided class does not meet the expected class
/// </summary>
[global::System.Serializable]
public class DocTypeMissMatchException : ArgumentException
{
/// <summary>
/// Initializes a new instance of the <see cref="DocTypeMissMatchException"/> class.
/// </summary>
/// <param name="actual">The actual doc type alias.</param>
/// <param name="expected">The expcected doc type alias.</param>
public DocTypeMissMatchException(string actual, string expected) : this(actual, expected, string.Empty) { }
/// <summary>
/// Initializes a new instance of the <see cref="DocTypeMissMatchException"/> class.
/// </summary>
/// <param name="actual">The actual doc type alias.</param>
/// <param name="expected">The expcected doc type alias.</param>
/// <param name="message">Additional message information.</param>
public DocTypeMissMatchException(string actual, string expected, string message)
: base(string.Format("DocTypeAlias provided did not match what was expected (provided: {0}, expected: {1}){2}{3}", actual, expected, Environment.NewLine, message))
{
Expected = expected;
Actual = actual;
}
/// <summary>
/// Initializes a new instance of the <see cref="DocTypeMissMatchException"/> class.
/// </summary>
/// <param name="actual">The actual doc type alias.</param>
/// <param name="expected">The expcected doc type alias.</param>
/// <param name="message">Additional message information.</param>
/// <param name="innerException">The inner exception.</param>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object[])")]
public DocTypeMissMatchException(string actual, string expected, string message, Exception innerException)
: base(string.Format("DocTypeAlias provided did not match what was expected (provided: {0}, expected: {1}){2}{3}", actual, expected, Environment.NewLine, message), innerException)
{
Expected = expected;
Actual = actual;
}
/// <summary>
/// Initializes a new instance of the <see cref="MandatoryFailureException"/> class.
/// </summary>
/// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
/// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
/// <exception cref="T:System.ArgumentNullException">
/// The <paramref name="info"/> parameter is null.
/// </exception>
/// <exception cref="T:System.Runtime.Serialization.SerializationException">
/// The class name is null or <see cref="P:System.Exception.HResult"/> is zero (0).
/// </exception>
protected DocTypeMissMatchException(
System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
: base(info, context) { }
/// <summary>
/// Gets or sets the expected DocTypeAlias
/// </summary>
/// <value>The expected DocTypeAlias.</value>
public string Expected { get; set; }
/// <summary>
/// Gets or sets the actual DocTypeAlias
/// </summary>
/// <value>The actual DocTypeAlias.</value>
public string Actual { get; set; }
}
/// <summary>
/// Exception raised when a field isn't meeting its mandatory requirement
/// </summary>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors"), global::System.Serializable]
public class MandatoryFailureException : Exception
{
/// <summary>
/// Initializes a new instance of the <see cref="MandatoryFailureException"/> class.
/// </summary>
/// <param name="propertyName">Name of the property that failed the mandatory check.</param>
public MandatoryFailureException(string propertyName) : this(propertyName, string.Empty) { }
/// <summary>
/// Initializes a new instance of the <see cref="MandatoryFailureException"/> class.
/// </summary>
/// <param name="propertyName">Name of the property that failed the mandatory check.</param>
/// <param name="message">Additional message information.</param>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object,System.Object)")]
public MandatoryFailureException(string propertyName, string message)
: base(string.Format("The mandatory property \"{0}\" did not have a value.{1}{2}", propertyName, Environment.NewLine, message))
{
PropertyName = propertyName;
}
/// <summary>
/// Initializes a new instance of the <see cref="MandatoryFailureException"/> class.
/// </summary>
/// <param name="propertyName">Name of the property that failed the mandatory check.</param>
/// <param name="message">Additional message information.</param>
/// <param name="innerException">The inner exception.</param>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object,System.Object)")]
public MandatoryFailureException(string propertyName, string message, Exception innerException)
: base(string.Format("The mandatory property \"{0}\" did not have a value.{1}{2}", propertyName, Environment.NewLine, message), innerException)
{
PropertyName = propertyName;
}
/// <summary>
/// Initializes a new instance of the <see cref="MandatoryFailureException"/> class.
/// </summary>
/// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
/// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
/// <exception cref="T:System.ArgumentNullException">
/// The <paramref name="info"/> parameter is null.
/// </exception>
/// <exception cref="T:System.Runtime.Serialization.SerializationException">
/// The class name is null or <see cref="P:System.Exception.HResult"/> is zero (0).
/// </exception>
protected MandatoryFailureException(
System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
: base(info, context) { }
/// <summary>
/// Gets or sets the name of the property the exception was raised for.
/// </summary>
/// <value>The name of the property.</value>
public string PropertyName { get; set; }
}
}
@@ -1,26 +0,0 @@
// This file is used by Code Analysis to maintain SuppressMessage
// attributes that are applied to this project.
// Project-level suppressions either have no target or are given
// a specific target and scoped to a namespace, type, member, etc.
//
// To add a suppression to this file, right-click the message in the
// Error List, point to "Suppress Message(s)", and click
// "In Project Suppression File".
// You do not need to add suppressions to this file manually.
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "umbraco", Scope = "namespace", Target = "umbraco.Linq.Core")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "umbraco.Linq.Core.Node")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "umbraco", Scope = "namespace", Target = "umbraco.Linq.Core.Node")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "umbraco")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors", Scope = "type", Target = "umbraco.Linq.Core.DocTypeMissMatchException")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object[])", Scope = "member", Target = "umbraco.Linq.Core.DocTypeMissMatchException.#.ctor(System.String,System.String,System.String)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "umbraco", Scope = "member", Target = "umbraco.Linq.Core.ReflectionAssistance.#GetumbracoInfoAttribute(System.Type)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "umbraco", Scope = "type", Target = "umbraco.Linq.Core.umbracoDataContext")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "umbraco", Scope = "type", Target = "umbraco.Linq.Core.umbracoDataProvider")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Scope = "member", Target = "umbraco.Linq.Core.umbracoDataProvider.#Load`1(System.Int32)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Scope = "member", Target = "umbraco.Linq.Core.umbracoDataProvider.#LoadTree`1()")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "umbraco", Scope = "type", Target = "umbraco.Linq.Core.umbracoInfoAttribute")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Scope = "type", Target = "umbraco.Linq.Core.Node.NodeAssociationTree`1")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Scope = "member", Target = "umbraco.Linq.Core.Node.NodeDataProvider.#LoadTree`1()")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Scope = "type", Target = "umbraco.Linq.Core.Node.NodeTree`1")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Scope = "member", Target = "umbraco.Linq.Core.Node.NodeDataProvider.#Load`1(System.Int32)")]
@@ -1,27 +0,0 @@
namespace umbraco.Linq.Core
{
/// <summary>
/// Base of an umbraco content tree
/// </summary>
public interface IContentTree
{
/// <summary>
/// Gets the <see cref="UmbracoDataProvider"/> Provider associated with this instance
/// </summary>
/// <value>The provider.</value>
UmbracoDataProvider Provider { get; }
/// <summary>
/// Gets a value indicating whether this instance is read only.
/// </summary>
/// <value>
/// <c>true</c> if this instance is read only; otherwise, <c>false</c>.
/// </value>
bool IsReadOnly { get; }
/// <summary>
/// Reloads the cache for the particular tree
/// </summary>
void ReloadCache();
}
}
@@ -1,116 +0,0 @@
using System;
using System.ComponentModel;
namespace umbraco.Linq.Core
{
/// <summary>
///
/// </summary>
public interface IDocTypeBase : INotifyPropertyChanging, INotifyPropertyChanged
{
/// <summary>
/// Gets the Ancestor or Default based on type
/// </summary>
/// <typeparam name="TDocType">The type of the Ancestor.</typeparam>
/// <returns></returns>
TDocType AncestorOrDefault<TDocType>() where TDocType : DocTypeBase;
/// <summary>
/// Gets the Ancestor or Default based on type
/// </summary>
/// <typeparam name="TDocType">The type of the Ancestor.</typeparam>
/// <param name="func">The func.</param>
/// <returns></returns>
TDocType AncestorOrDefault<TDocType>(Func<TDocType, bool> func) where TDocType : DocTypeBase;
/// <summary>
/// Gets the children.
/// </summary>
/// <value>The children.</value>
AssociationTree<DocTypeBase> Children { get; }
/// <summary>
/// Gets or sets the create date.
/// </summary>
/// <value>The create date.</value>
DateTime CreateDate { get; set; }
/// <summary>
/// Gets the creator user ID.
/// </summary>
/// <value>The creator ID.</value>
int CreatorID { get; }
/// <summary>
/// Gets the name of the creator.
/// </summary>
/// <value>The name of the creator.</value>
string CreatorName { get; }
/// <summary>
/// Gets the id of the item.
/// </summary>
/// <value>The id.</value>
int Id { get; }
/// <summary>
/// Gets a value indicating whether this instance is dirty.
/// </summary>
/// <value><c>true</c> if this instance is dirty; otherwise, <c>false</c>.</value>
bool IsDirty { get; }
/// <summary>
/// Gets or sets the level of the item
/// </summary>
/// <value>The level.</value>
int Level { get; set; }
/// <summary>
/// Gets or sets the name.
/// </summary>
/// <value>The name.</value>
string NodeName { get; set; }
/// <summary>
/// Gets or sets the name.
/// </summary>
/// <value>The name.</value>
[Obsolete("Name property is obsolete, use NodeName instead")] //this is because most people expect NodeName not Name as the property
string Name { get; set; }
/// <summary>
/// Parent if current instance
/// </summary>
/// <typeparam name="TParent">The type of the parent.</typeparam>
/// <returns></returns>
TParent Parent<TParent>() where TParent : DocTypeBase, new();
/// <summary>
/// Gets or sets the parent node id.
/// </summary>
/// <value>The parent node id.</value>
int ParentNodeId { get; set; }
/// <summary>
/// Gets or sets the sort order.
/// </summary>
/// <value>The sort order.</value>
int SortOrder { get; set; }
/// <summary>
/// Gets or sets the template id.
/// </summary>
/// <value>The template id.</value>
int TemplateId { get; set; }
/// <summary>
/// Gets or sets the update date.
/// </summary>
/// <value>The update date.</value>
DateTime UpdateDate { get; set; }
/// <summary>
/// Gets the version.
/// </summary>
/// <value>The version.</value>
string Version { get; }
/// <summary>
/// Gets the writer user ID.
/// </summary>
/// <value>The writer ID.</value>
int WriterID { get; }
/// <summary>
/// Gets the name of the writer.
/// </summary>
/// <value>The name of the writer.</value>
string WriterName { get; }
/// <summary>
/// Gets or sets the path.
/// </summary>
/// <value>The path.</value>
string Path { get; set; }
}
}
@@ -1,20 +0,0 @@
using System;
namespace umbraco.Linq.Core
{
/// <summary>
/// Abstraction of the UmbracoDataContext
/// </summary>
public interface IUmbracoDataContext : IDisposable
{
/// <summary>
/// Gets the data provider.
/// </summary>
/// <value>The data provider.</value>
UmbracoDataProvider DataProvider { get; }
/// <summary>
/// Submits the changes tracked in this data context
/// </summary>
void SubmitChanges();
}
}

Some files were not shown because too many files have changed in this diff Show More