Merge pull request #34 from umbraco/dev-v2

Version 2.0

build/build.xml

@@ -1 +1 @@
-<build version="1.0.2"></build>
+<build version="2.0.0"></build>

build/packageManifest.xml

@@ -336,8 +336,8 @@
             <url>https://umbraco.com</url>
             <requirements type="strict">
                 <major>7</major>
-                <minor>6</minor>
-                <patch>4</patch>
+                <minor>7</minor>
+                <patch>0</patch>
             </requirements>
         </package>
         <author>
@@ -347,7 +347,7 @@
         <readme>
             <![CDATA[This is the default starter kit for Umbraco 7.6+.
 
-It's only compatible with Umbraco 7.6.4+, it will not install or work on older versions.]]>
+It contains a simple website that contains many basic features to help get you started including a home page, a blog, a product catalogue, contact page and more.]]>
         </readme>
     </info>
     <Documents>
@@ -1577,7 +1577,7 @@ It's only compatible with Umbraco 7.6.4+, it will not install or work on older v
                 <GenericProperty>
                     <Name>Features</Name>
                     <Alias>features</Alias>
-                    <Type>Our.Umbraco.NestedContent</Type>
+                    <Type>Umbraco.NestedContent</Type>
                     <Definition>2b806d03-d9f7-41a3-8226-4abc870585c4</Definition>
                     <Tab>Features</Tab>
                     <SortOrder>0</SortOrder>
@@ -2283,7 +2283,7 @@ It's only compatible with Umbraco 7.6.4+, it will not install or work on older v
                 <PreValue Id="59" Value="Csv" Alias="storageType" SortOrder="1" />
             </PreValues>
         </DataType>
-        <DataType Name="Product - Features - Nested Content" Id="Our.Umbraco.NestedContent" Definition="2b806d03-d9f7-41a3-8226-4abc870585c4" DatabaseType="Ntext">
+        <DataType Name="Product - Features - Nested Content" Id="Umbraco.NestedContent" Definition="2b806d03-d9f7-41a3-8226-4abc870585c4" DatabaseType="Ntext">
             <PreValues>
                 <PreValue Id="108" Value="[&#xD;&#xA;  {&#xD;&#xA;    &quot;ncAlias&quot;: &quot;feature&quot;,&#xD;&#xA;    &quot;ncTabAlias&quot;: &quot;Feature&quot;,&#xD;&#xA;    &quot;nameTemplate&quot;: &quot;{{featureName}}&quot;&#xD;&#xA;  }&#xD;&#xA;]" Alias="contentTypes" SortOrder="0" />
                 <PreValue Id="109" Value="0" Alias="minItems" SortOrder="1" />

src/SolutionInfo.cs

@@ -11,6 +11,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.0.2")]
-[assembly: AssemblyFileVersion("1.0.2")]
-[assembly: AssemblyInformationalVersion("1.0.2")]
+[assembly: AssemblyVersion("2.0.0")]
+[assembly: AssemblyFileVersion("2.0.0")]
+[assembly: AssemblyInformationalVersion("2.0.0")]

src/Umbraco.SampleSite.Website/App_Data/packages/created/createdPackages.config

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="1" version="1.0.2" url="https://umbraco.com" name="Starter Kit" folder="cc9f41ad-9830-4a5f-bceb-cf46f0a94ff6" packagepath="~/media/created-packages/Starter_Kit_1.0.0.zip" repositoryGuid="" iconUrl="" umbVersion="7.6.4" packageGuid="ae56d4d1-0c8d-4a68-934c-d4f2d66c72af" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
+  <package id="1" version="2.0.0" url="https://umbraco.com" name="Starter Kit" folder="cc9f41ad-9830-4a5f-bceb-cf46f0a94ff6" packagepath="~/media/created-packages/Starter_Kit_2.0.1.zip" repositoryGuid="" iconUrl="" umbVersion="7.7.0" packageGuid="ae56d4d1-0c8d-4a68-934c-d4f2d66c72af" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
     <license url="http://opensource.org/licenses/MIT">MIT License</license>
     <author url="https://umbraco.com">Umbraco HQ</author>
-    <readme><![CDATA[Starter Kit. 
+    <readme><![CDATA[This is the default starter kit for Umbraco 7.6+.
 
-Todo: 
-- Review implementation code
-- Update copy]]></readme>
+It contains a simple website that contains many basic features to help get you started including a home page, a blog, a product catalogue, contact page and more.]]></readme>
     <actions>
       <Action runat="install" undo="false" alias="SampleSiteInitialContent">
         <mediaItem folder="design" name="Umbraco Campari Meeting Room" path="/media/1030/16403439029_f500be349b_o.jpg" key="3d758b1f-24ec-47b0-a75c-225b0444991b" updateDocPath="//home" updatePropertyAlias="heroBackgroundImage" />
@@ -26,7 +24,7 @@ Todo:
         <mediaItem folder="people" name="Jeroen Breuer" path="/media/1005/18530280048_459b8b61b2_h.jpg" key="fcc18600-8f9b-4995-8954-3cb0d335faf1" updateDocPath="//person [@nodeName = 'Jeroen Breuer']" updatePropertyAlias="photo" />
       </Action>
     </actions>
-    <datatypes>1090,1180,1181,1093,1094,1182,1096,1177,1183,1098,1099,1100,1101,1102,1103,1104,1184,1185,1187,1174</datatypes>
+    <datatypes>1104,1096,1174,1177,1093,1101,1180,1098,1100,1090,1181,1099,1187,1183,1182,1102,1185,1103,1094,1184</datatypes>
     <content nodeId="1127" loadChildNodes="True">
     </content>
     <templates>1105,1106,1107,1108,1109,1110,1111,1112,1113,1114</templates>
@@ -55,8 +53,6 @@ Todo:
       <file>/Views/MacroPartials/FeaturedProducts.cshtml</file>
       <file>/Views/MacroPartials/LatestBlogposts.cshtml</file>
       <file>/Views/Partials/Navigation</file>
-      <file>/bin/Our.Umbraco.NestedContent.dll</file>
-      <file>/App_Plugins/NestedContent</file>
       <file>/bin/Umbraco.SampleSite.dll</file>
       <file>/App_Plugins/Terratype</file>
       <file>/App_Plugins/Terratype.GoogleMapsV3</file>