Merge pull request #1 from umbraco/dev-v7

update my dev-v7 branch

.gitignore

@@ -141,3 +141,4 @@ build/docs.zip
 build/ui-docs.zip
 build/csharp-docs.zip
 build/msbuild.log
+.vs/

README.md

@@ -1,42 +1,52 @@
 Umbraco CMS
 ===========
-Umbraco is a free open source Content Management System built on the ASP.NET platform.
+The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 350,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
+
+[![ScreenShot](vimeo.png)](https://vimeo.com/172382998/)
+
+## Umbraco CMS ##
+Umbraco is a free open source Content Management System built on the ASP.NET platform. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
+
 
 ## Building Umbraco from source ##
+
 The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `grunt vs` in `src\Umbraco.Web.UI.Client`.
 
 If you're interested in making changes to Belle without running Visual Studio make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). 
 
 Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
 
-## Watch a introduction video ##
+## Watch an introduction video ##
 
 [![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
 
-## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
+## Umbraco - The Friendly CMS ##
+
+For the first time on the Microsoft platform, there is 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 has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. 
 
-**More than 350,000 sites trust Umbraco** 
+Umbraco is not only loved by developers, but is a content editors dream. Enjoy intuitive editing tools, media management, responsive views and approval workflows to send your content live.
 
-For the first time on the Microsoft platform, there is 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 has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developer's dream and your users will love it too. 
+Used by more than 350,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 200,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
 
-Used by more than 350,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)), you can be sure that the technology is proven, stable and scales. 
+To view more examples, please visit [https://umbraco.com/why-umbraco/#caseStudies](https://umbraco.com/why-umbraco/#caseStudies)
 
-To view more examples, please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
+## Why Open Source? ##
+As an Open Source platform, Umbraco is more than just a CMS. We are transparent with our roadmap for future versions, our incremental sprint planning notes are publicly accessible and community contributions and packages are available for all to use.
 
 ## Downloading ##
 
-The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
+The downloadable Umbraco releases live at [https://our.umbraco.org/download](https://our.umbraco.org/download).
 
 ## Forums ##
 
-We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
+Peer-to-peer support is available 24/7 at the community forum on [https://our.umbraco.org](https://our.umbraco.org). 
 
 ## Contribute to Umbraco ##
 
-If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
+Umbraco is contribution focused and community driven. If you want to contribute back to Umbraco please check out our [guide to contributing](https://our.umbraco.org/contribute).
 
 ## Found a bug? ##
 
-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 for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+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 for reporting issues](https://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
 
 To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -27,14 +27,14 @@
  <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
  <dependency id="MySql.Data" version="[6.9.8, 7.0.0)" />
  <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
- <dependency id="ClientDependency" version="[1.9.1, 2.0.0)" />
+ <dependency id="ClientDependency" version="[1.9.2, 2.0.0)" />
  <dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
  <!-- AutoMapper can not be updated due to: https://github.com/AutoMapper/AutoMapper/issues/373#issuecomment-127644405 -->
- <dependency id="AutoMapper" version="[3.0.0, 3.1.0)" />
+ <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
  <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
- <dependency id="Examine" version="[0.1.69, 1.0.0)" />
- <dependency id="ImageProcessor" version="[2.4.4, 3.0.0)" />
- <dependency id="ImageProcessor.Web" version="[4.6.4, 5.0.0)" />
+ <dependency id="Examine" version="[0.1.70, 1.0.0)" />
+ <dependency id="ImageProcessor" version="[2.4.5, 3.0.0)" />
+ <dependency id="ImageProcessor.Web" version="[4.6.6, 5.0.0)" />
  <dependency id="semver" version="[1.1.2, 2.0.0)" />
  <dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" /> 
  <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->

build/NuSpecs/UmbracoCms.nuspec

@@ -17,7 +17,7 @@
  <dependencies>
  <dependency id="UmbracoCms.Core" version="[$version$]" />
  <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
- <dependency id="Umbraco.ModelsBuilder" version="[3.0.4, 4.0.0)" />
+ <dependency id="Umbraco.ModelsBuilder" version="[3.0.5, 4.0.0)" />
  </dependencies>
  </metadata>
  <files>

build/NuSpecs/tools/Web.config.install.xdt

@@ -319,6 +319,7 @@
  <runtime>
  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
  <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
+ <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
  <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
  <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
  <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
@@ -334,10 +335,14 @@
 
  <runtime>
  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
+ <dependentAssembly xdt:Transform="Insert">
  <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
  <bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
  </dependentAssembly>
+ <dependentAssembly xdt:Transform="Insert">
+ <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+ </dependentAssembly>
  <dependentAssembly xdt:Transform="Insert">
  <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
  <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>

build/UmbracoVersion.txt

@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.5.3
+7.5.5

src/SQLCE4Umbraco/SqlCEInstaller.cs

@@ -21,15 +21,15 @@ namespace SqlCE4Umbraco
  public class SqlCEInstaller : DefaultInstallerUtility<SqlCEHelper>
  {
  #region Private Constants
- 
+
  /// <summary>The latest database version this installer supports.</summary>
  private const DatabaseVersion LatestVersionSupported = DatabaseVersion.Version4_8;
 
  /// <summary>The specifications to determine the database version.</summary>
  private static readonly VersionSpecs[] m_VersionSpecs = new VersionSpecs[] {
- new VersionSpecs("SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS LEFT OUTER JOIN umbracoApp ON appAlias = appAlias WHERE CONSTRAINT_NAME = 'FK_umbracoUser2app_umbracoApp'", 0, DatabaseVersion.Version4_8), 
- new VersionSpecs("SELECT id FROM umbracoNode WHERE id = -21", 1, DatabaseVersion.Version4_1), 
- new VersionSpecs("SELECT action FROM umbracoAppTree",DatabaseVersion.Version4),
+ new VersionSpecs("SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS LEFT OUTER JOIN umbracoApp ON appAlias = appAlias WHERE CONSTRAINT_NAME = 'FK_umbracoUser2app_umbracoApp'", 0, DatabaseVersion.Version4_8),
+ new VersionSpecs("SELECT id FROM umbracoNode WHERE id = -21", 1, DatabaseVersion.Version4_1),
+ new VersionSpecs("SELECT action FROM umbracoAppTree",DatabaseVersion.Version4),
  new VersionSpecs("SELECT description FROM cmsContentType",DatabaseVersion.Version3),
  new VersionSpecs("SELECT id FROM sysobjects",DatabaseVersion.None) };
 
@@ -43,8 +43,9 @@ public class SqlCEInstaller : DefaultInstallerUtility<SqlCEHelper>
  public override bool CanConnect
  {
  get
- { 
- SqlHelper.CreateEmptyDatabase();
+ {
+ using (var sqlHelper = SqlHelper)
+ sqlHelper.CreateEmptyDatabase();
  return base.CanConnect;
  }
  }
@@ -93,22 +94,22 @@ public SqlCEInstaller(SqlCEHelper sqlHelper) : base(sqlHelper, LatestVersionSupp
 
  #region DefaultInstaller Members 
 
- /// <summary>
- /// Returns the sql to do a full install
- /// </summary>
- protected override string FullInstallSql
- {
- get { return string.Empty; }
- }
+ /// <summary>
+ /// Returns the sql to do a full install
+ /// </summary>
+ protected override string FullInstallSql
+ {
+ get { return string.Empty; }
+ }
 
 
- /// <summary>
- /// Returns the sql to do an upgrade
- /// </summary>
- protected override string UpgradeSql
- {
- get { return string.Empty; }
- }
+ /// <summary>
+ /// Returns the sql to do an upgrade
+ /// </summary>
+ protected override string UpgradeSql
+ {
+ get { return string.Empty; }
+ }
 
  // We need to override this as the default way of detection a db connection checks for systables that doesn't exist
  // in a CE db
@@ -123,8 +124,9 @@ protected override DatabaseVersion DetermineCurrentVersion()
  // verify connection
  try
  {
- if (SqlCeApplicationBlock.VerifyConnection(base.SqlHelper.ConnectionString))
- return DatabaseVersion.None;
+ using (var sqlHelper = SqlHelper)
+ if (SqlCeApplicationBlock.VerifyConnection(sqlHelper.ConnectionString))
+ return DatabaseVersion.None;
  }
  catch (Exception e)
  {

src/SQLCE4Umbraco/SqlCETableUtility.cs

@@ -37,21 +37,23 @@ public override ITable GetTable(string name)
  ITable table = null;
 
  // get name in correct casing
- name = SqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
- SqlHelper.CreateParameter("name", name));
+ using (var sqlHelper = SqlHelper)
+ name = sqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
+ sqlHelper.CreateParameter("name", name));
  if (name != null)
  {
  table = new DefaultTable(name);
 
- using (IRecordsReader reader = SqlHelper.ExecuteReader(
+ using (var sqlHelper = SqlHelper)
+ using (IRecordsReader reader = sqlHelper.ExecuteReader(
  @"SELECT c.name AS Name, st.name AS DataType, c.max_length, c.is_nullable, c.is_identity
  FROM sys.tables AS t
  JOIN sys.columns AS c ON t.object_id = c.object_id
  JOIN sys.schemas AS s ON s.schema_id = t.schema_id
  JOIN sys.types AS ty ON ty.user_type_id = c.user_type_id
  JOIN sys.types st ON ty.system_type_id = st.user_type_id
  WHERE t.name = @name
- ORDER BY c.column_id", SqlHelper.CreateParameter("name", name)))
+ ORDER BY c.column_id", sqlHelper.CreateParameter("name", name)))
  {
  while (reader.Read())
  {
@@ -112,7 +114,8 @@ protected virtual void CreateTable(ITable table)
 
  // create query
  StringBuilder createTableQuery = new StringBuilder();
- createTableQuery.AppendFormat("CREATE TABLE [{0}] (", SqlHelper.EscapeString(table.Name));
+ using (var sqlHelper = SqlHelper)
+ createTableQuery.AppendFormat("CREATE TABLE [{0}] (", sqlHelper.EscapeString(table.Name));
 
  // add fields
  while (hasNext)
@@ -136,7 +139,8 @@ protected virtual void CreateTable(ITable table)
  // execute query
  try
  {
- SqlHelper.ExecuteNonQuery(createTableQuery.ToString());
+ using (var sqlHelper = SqlHelper)
+ sqlHelper.ExecuteNonQuery(createTableQuery.ToString());
  }
  catch (Exception executeException)
  {
@@ -154,13 +158,15 @@ protected virtual void CreateColumn(ITable table, IField field)
  Debug.Assert(table != null && field != null);
 
  StringBuilder addColumnQuery = new StringBuilder();
- addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
- SqlHelper.EscapeString(table.Name),
- SqlHelper.EscapeString(field.Name),
- SqlHelper.EscapeString(GetDatabaseType(field)));
+ using (var sqlHelper = SqlHelper)
+ addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
+ sqlHelper.EscapeString(table.Name),
+ sqlHelper.EscapeString(field.Name),
+ sqlHelper.EscapeString(GetDatabaseType(field)));
  try
  {
- SqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
+ using (var sqlHelper = SqlHelper)
+ sqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
  }
  catch (Exception executeException)
  {

src/SolutionInfo.cs

@@ -11,5 +11,5 @@
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.5.3")]
-[assembly: AssemblyInformationalVersion("7.5.3")]
+[assembly: AssemblyFileVersion("7.5.5")]
+[assembly: AssemblyInformationalVersion("7.5.5")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
  public class UmbracoVersion
  {
- private static readonly Version Version = new Version("7.5.3");
+ private static readonly Version Version = new Version("7.5.5");
 
  /// <summary>
  /// Gets the current version of Umbraco.

src/Umbraco.Core/Constants-Conventions.cs

@@ -122,6 +122,11 @@ public static class MediaTypes
  /// MediaType alias for an image.
  /// </summary>
  public const string Image = "Image";
+
+ /// <summary>
+ /// MediaType alias indicating allowing auto-selection.
+ /// </summary>
+ public const string AutoSelect = "umbracoAutoSelect";
  }
 
  /// <summary>

src/Umbraco.Core/Constants-ObjectTypes.cs

@@ -69,6 +69,11 @@ public static class ObjectTypes
  /// </summary>
  public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";
 
+ /// <summary>
+ /// Guid for a Document object.
+ /// </summary>
+ public static readonly Guid DocumentGuid = new Guid(Document);
+
  /// <summary>
  /// Guid for a Document Type object.
  /// </summary>