Merge pull request #977 from SubPointSolutions/dev

+ SPMeta2 v1.2.120-beta2, March 2017
SubPointSolutions · Mar 13, 2017 · 561e743 · 561e743
2 parents b1a75dc + c890e52
commit 561e743
Show file tree

Hide file tree

Showing 53 changed files with 1,259 additions and 1,046 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 
 # M2 docs index and refs
 *.sample-ref
+*.ncrunchsolution
 
 # User-specific files
 *.suo

diff --git a/SPMeta2/Build/build.json b/SPMeta2/Build/build.json
@@ -2,7 +2,7 @@
     "defaultSolutionDirectory": "./../../",
     "defaultSolutionFilePath": "./../../SPMeta2.sln",
 
-    "defaultDocsBuildEnabled" : false,
+    "defaultDocsBuildEnabled" : true,
 
     "defaultDocsViewFolder" : "SPMeta2/SubPointSolutions.Docs/Views/SPMeta2",
     "defaultDocsRepoFolder" : "m2-m2",
@@ -211,7 +211,7 @@
     "defaultChocolateyPackagesDirectory": "./build-artifact-cli-packages",
     "defaultNuspecVersion": "0.1.0",
 
-    "defaultDocsViewFolder" : "SubPointSolutions.Docs/Views/SPMeta2",
+    "defaultDocsViewFolder" : "SPMeta2/SubPointSolutions.Docs/Views/SPMeta2",
     "defaultDocsRepoFolder" : "m2-m2",
     "defaultDocsBranch" : "wyam-dev",
     "defaultDocsFileExtensions" : [
@@ -227,7 +227,7 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2",
             "Id": "SPMeta2.Core",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
             "ProjectUrl": "https://github.com/SubPointSolutions/spmeta2",
@@ -266,11 +266,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.Standard",
             "Id": "SPMeta2.Core.Standard",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -311,11 +311,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -348,15 +348,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -389,11 +389,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM",
             "Id": "SPMeta2.SSOM.Foundation",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -426,15 +426,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM.Standard",
             "Id": "SPMeta2.SSOM.Standard",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.SSOM.Foundation",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -468,11 +468,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation-v14",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -498,15 +498,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard-v14",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation-v14",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -532,11 +532,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM",
             "Id": "SPMeta2.SSOM.Foundation-v14",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -562,15 +562,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM.Standard",
             "Id": "SPMeta2.SSOM.Standard-v14",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.SSOM.Foundation-v14",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -596,11 +596,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation-v16",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 },
                 {
                     "Id": "Microsoft.SharePointOnline.CSOM",
@@ -637,15 +637,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard-v16",
-            "Version": "1.2.120-beta1",
+            "Version": "1.2.120-beta2",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation-v16",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta1"
+                    "Version": "1.2.120-beta2"
                 },
                 {
                     "Id": "Microsoft.SharePointOnline.CSOM",

diff --git a/SPMeta2/Build/build.ps1 b/SPMeta2/Build/build.ps1
@@ -4,7 +4,6 @@
 # Feel free to change this file to fit your needs.
 ##########################################################################
 
-
 <#
 
 .SYNOPSIS
@@ -160,12 +159,20 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
     Set-Location $TOOLS_DIR
 
     # Check for changes in packages.config and remove installed tools if true.
+	<#
     [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
     if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
       ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
         Write-Verbose -Message "Missing or changed package.config hash..."
         Remove-Item * -Recurse -Exclude packages.config,nuget.exe
     }
+	#>
+	[string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
+    if((!(Test-Path $PACKAGES_CONFIG_MD5))) {
+        Write-Verbose -Message "Missing or changed package.config hash..."
+		throw "Missing or changed package.config hash..."
+        #Remove-Item * -Recurse -Exclude packages.config,nuget.exe
+    }
 
     Write-Verbose -Message "Restoring tools from NuGet..."
     $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
@@ -189,4 +196,4 @@ if (!(Test-Path $CAKE_EXE)) {
 # Start Cake
 Write-Host "Running build script..."
 Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
-exit $LASTEXITCODE
+exit $LASTEXITCODE
diff --git a/SPMeta2/Build/tools/packages.config b/SPMeta2/Build/tools/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Cake" version="0.17.0" />
-  <package id="SubPointSolutions.CakeBuildTools" version="0.1.0-alpha170521456"  />
+  <package id="SubPointSolutions.CakeBuildTools" version="0.1.0-beta3"  />
 </packages>
diff --git a/SPMeta2/Build/tools/packages.config.md5sum b/SPMeta2/Build/tools/packages.config.md5sum
@@ -1 +1 @@
-1E-30-75-ED-E8-A0-8E-6E-ED-7C-7F-40-98-54-8D-A7
+93-A8-F9-3B-FF-40-99-D5-E4-C1-E0-AF-32-14-3A-BB
diff --git a/SPMeta2/SPMeta2.CSOM.Behaviours/ContentTypeBehaviours.cs b/SPMeta2/SPMeta2.CSOM.Behaviours/ContentTypeBehaviours.cs
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1E-30-75-ED-E8-A0-8E-6E-ED-7C-7F-40-98-54-8D-A7
		93-A8-F9-3B-FF-40-99-D5-E4-C1-E0-AF-32-14-3A-BB