Merge pull request #805 from SubPointSolutions/dev

SPMeta2 v1.2.60, February 2016
SubPointSolutions · Mar 8, 2016 · 0ebdca5 · 0ebdca5
2 parents 08561b0 + d4c1e6f
commit 0ebdca5
Show file tree

Hide file tree

Showing 189 changed files with 6,746 additions and 3,505 deletions.
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="psake" version="4.4.2" />
+</packages>
diff --git a/README.md b/README.md
@@ -98,6 +98,8 @@ SharePoint 2010 SSOM
 * [SPMeta2.SSOM.Standard-v14](https://www.nuget.org/packages/SPMeta2.SSOM.Standard-v14/)
 
 #### Blogposts
+* [Office Dev PnP Web Cast – SharePoint Feature Framework vs Remote Provisioning](http://dev.office.com/blogs/feature-framework-vs-remote-provisioning)
+* [Provisioning Google Maps JSLink with SPMeta2](http://chuvash.eu/2015/12/15/provisioning-google-maps-jslink-with-spmeta2/)
 * [Provisioning: spmeta2 vs O365 PnP provisioning](http://blog.repsaj.nl/index.php/2015/05/o365-provisioning-spmeta2-vs-o365-pnp-provisioning/)
 * [SharePoint Site Provisioning Engine](http://wp.sjkp.dk/sharepoint-site-provisioning-engine/)
 * [Kom igång med SPMeta2](http://chuvash.eu/2015/09/17/kom-igang-med-spmeta2/)
@@ -108,4 +110,4 @@ SharePoint 2010 SSOM
 #### Presentations
 * [SharePoint Saturday Oslo 2015 - NEW!](http://yuriburger.net/2015/10/17/slidedeck-sharepoint-saturday-oslo-2015-now-available/)
 * [Slidedeck SharePoint Artifact Provisioning - VX Company](http://www.werkenbijvxcompany.nl/wp-content/uploads/2015/05/Provisioning-SharePoint-Artifacts-Blog.pdf)
-* [SharePointCommunity.ch SharePoint Lösungen für die Zukunft](http://www.slideshare.net/fiddich1/sharepointcommunitych-sharepoint-lsungen-fr-die-zukunft)
+* [SharePointCommunity.ch SharePoint Lösungen für die Zukunft](http://www.slideshare.net/fiddich1/sharepointcommunitych-sharepoint-lsungen-fr-die-zukunft)
diff --git a/SPMeta2.sln b/SPMeta2.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Provision", "Provision", "{8A0307D3-5564-4034-9DB1-D13FEE1DADD9}"
 EndProject
@@ -60,6 +60,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPMeta2.Regression.SSOM", "SPMeta2\SPMeta2.Regression.SSOM\SPMeta2.Regression.SSOM.csproj", "{00E1581F-31D9-493E-AD16-C188AE966458}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{200D7335-DB4A-4BF2-906F-9E17DC82113B}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPMeta2.SSOM.Standard", "SPMeta2\SPMeta2.SSOM.Standard\SPMeta2.SSOM.Standard.csproj", "{7D095A0D-0BDE-446D-8093-13E5685F1D3C}"
 EndProject
@@ -106,11 +109,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2F17C825-5DA2-4F80-93CD-0C2A0F084F6F}"
 EndProject
 Global
-	GlobalSection(AutomaticVersions) = postSolution
-		UpdateAssemblyVersion = False
-		UpdateAssemblyFileVersion = False
-		UpdateAssemblyInfoVersion = False
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CI-CSOM2013|Any CPU = CI-CSOM2013|Any CPU
 		CI-O365|Any CPU = CI-O365|Any CPU
@@ -464,4 +462,9 @@ Global
 		{2A290D6E-6AF3-4D17-975D-3C393700A0B1} = {358E83EE-8ABA-463E-A868-3906865FDA39}
 		{0DE538C9-1723-46B1-90F8-5DC67C56D7DD} = {AA39B47D-287D-4DAC-A1B6-CBEE826B0D83}
 	EndGlobalSection
+	GlobalSection(AutomaticVersions) = postSolution
+		UpdateAssemblyVersion = False
+		UpdateAssemblyFileVersion = False
+		UpdateAssemblyInfoVersion = False
+	EndGlobalSection
 EndGlobal
diff --git a/SPMeta2/SPMeta2.Build/build.v12.ps1 b/SPMeta2/SPMeta2.Build/build.v12.ps1
@@ -1,5 +1,7 @@
 cls
 
+#region  utils
+
 function Get-ScriptDirectory
 {
     $Invocation = (Get-Variable MyInvocation -Scope 1).Value;
@@ -17,60 +19,107 @@ function Get-ScriptDirectory
     }
 }
 
+function BuildProfile($buildProfile) {
+
+    $configuration = $buildProfile.Configuration
+
+    foreach($projectName in $buildProfiles.ProjectNames) {
+
+        $buildProfile.BuildParams
+
+        & $msbuild_path """$solutionRootPath\$projectName\$projectName.csproj"" $($buildProfile.BuildParams)"
+    }
+
+}
+
+#endregion
+
+#region default values / profiles
+
+$defaultProjects = @("SPMeta2", "SPMeta2.Standard", "SPMeta2.SSOM", "SPMeta2.SSOM.Standard", "SPMeta2.CSOM", "SPMeta2.CSOM.Standard" )
+#$defaultProjects = @( "SPMeta2", "SPMeta2.Standard", "SPMeta2.SSOM")
+$o365Projects = @("SPMeta2", "SPMeta2.Standard", "SPMeta2.CSOM", "SPMeta2.CSOM.Standard" )
+
+$verbosity = "minimal"
+$defaultBuildParams = " /t:Clean,Rebuild /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:$verbosity"
+
 $currentPath =  Get-ScriptDirectory
 $solutionRootPath =  "$currentPath\..\"
 
 $msbuild_path = "C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 
-$includeV14Build = $true
-$includeV15Build = $true
-$includeV16Build = $true
+#endregion
 
-$verbosity = "minimal"
 
-# 14, 3.5 
-if($includeV14Build -eq $true) {
-
-    & $msbuild_path """$solutionRootPath\SPMeta2\SPMeta2.csproj"" /t:Clean,Rebuild /p:Configuration=Debug35 /p:DefineConstants=NET35 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-    & $msbuild_path """$solutionRootPath\SPMeta2.Standard\SPMeta2.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug35 /p:DefineConstants=NET35 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-
-    & $msbuild_path """$solutionRootPath\SPMeta2.SSOM\SPMeta2.SSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug35 /p:DefineConstants=NET35 /p:spRuntime=14 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-    & $msbuild_path """$solutionRootPath\SPMeta2.SSOM.Standard\SPMeta2.SSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug35 /p:DefineConstants=NET35 /p:spRuntime=14 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
+$buildProfiles =  @()
+
+$build14 = $true
+$build15 = $true
+$build16 = $true
+$build365 = $true
+
+if($build14 -eq $true) {
+
+    $buildProfiles += @{
+        "Name"  = "M2 SP2010 - NET35";
+        "ProjectNames" = $defaultProjects
+        "BuildParams" = ("/p:spRuntime=14 /p:Configuration=Debug35 /p:DefineConstants=NET35 " + $defaultBuildParams);
+    }
 }
 
-# 15, main solution, all, 45
-if($includeV15Build -eq $true) {
-    & $msbuild_path """$solutionRootPath\..\SPMeta2.sln"" /t:Clean,Rebuild /p:WarningLevel=0 /verbosity:minimal"
+if($build15 -eq $true) {
+
+    $buildProfiles += @{
+        "Name"  = "M2 SP2013 NET40";
+        "ProjectNames" = $defaultProjects
+        "BuildParams" = ("/p:spRuntime=15 /p:Configuration=Debug40 /p:DefineConstants=NET40 " + $defaultBuildParams);
+    }
+
+    $buildProfiles += @{
+        "Name"  = "M2 SP2013 NET45";
+        "ProjectNames" = $defaultProjects
+        "BuildParams" = ("/p:spRuntime=15 /p:Configuration=Debug45 /p:DefineConstants=NET45 " + $defaultBuildParams);
+    }
 }
 
-# partial, for NuGet, 40/45
-& $msbuild_path """$solutionRootPath\SPMeta2\SPMeta2.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-& $msbuild_path """$solutionRootPath\SPMeta2\SPMeta2.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
+if($build16 -eq $true) {
+
+    $buildProfiles += @{
+        "Name"  = "M2 SP2016 NET40";
+        "ProjectNames" = $defaultProjects
+        "BuildParams" = ("/p:spRuntime=16 /p:Configuration=Debug40 /p:DefineConstants=NET40 " + $defaultBuildParams);
+    }
 
-& $msbuild_path """$solutionRootPath\SPMeta2.Standard\SPMeta2.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-& $msbuild_path """$solutionRootPath\SPMeta2.Standard\SPMeta2.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
+    $buildProfiles += @{
+        "Name"  = "M2 SP2016 NET45";
+        "ProjectNames" = $defaultProjects
+        "BuildParams" = ("/p:spRuntime=16 /p:Configuration=Debug45 /p:DefineConstants=NET45 " + $defaultBuildParams);
+    }
+}
 
-# CSOM
+if($build365 -eq $true) {
 
-& $msbuild_path """$solutionRootPath\SPMeta2.CSOM\SPMeta2.CSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-& $msbuild_path """$solutionRootPath\SPMeta2.CSOM\SPMeta2.CSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
+    $buildProfiles += @{
+        "Name"  = "M2 O365 NET40";
+        "ProjectNames" = $o365Projects; 
+        "BuildParams" = ("/p:spRuntime=365 /p:Configuration=Debug40 /p:DefineConstants=NET40 " + $defaultBuildParams);
+    }
 
-if($includeV16Build -eq $true) {
-    & $msbuild_path """$solutionRootPath\SPMeta2.CSOM\SPMeta2.CSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:spRuntime=16 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-    & $msbuild_path """$solutionRootPath\SPMeta2.CSOM\SPMeta2.CSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:spRuntime=16 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
+    $buildProfiles += @{
+        "Name"  = "M2 O365 NET45";
+        "ProjectNames" = $o365Projects; 
+        "BuildParams" = ("/p:spRuntime=365 /p:Configuration=Debug45 /p:DefineConstants=NET45 " + $defaultBuildParams);
+    }
 }
 
-& $msbuild_path """$solutionRootPath\SPMeta2.CSOM.Standard\SPMeta2.CSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-& $msbuild_path """$solutionRootPath\SPMeta2.CSOM.Standard\SPMeta2.CSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
+foreach($buildProfile in $buildProfiles) {
 
-if($includeV16Build -eq $true) {
-    & $msbuild_path """$solutionRootPath\SPMeta2.CSOM.Standard\SPMeta2.CSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:spRuntime=16 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-    & $msbuild_path """$solutionRootPath\SPMeta2.CSOM.Standard\SPMeta2.CSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:spRuntime=16 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
+    Write-Host "Building profile [$($buildProfile.Name)]"
+
+    BuildProfile $buildProfile
 }
 
-# SSOM
-& $msbuild_path """$solutionRootPath\SPMeta2.SSOM\SPMeta2.SSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:DefineConstants=NET40 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-& $msbuild_path """$solutionRootPath\SPMeta2.SSOM\SPMeta2.SSOM.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
 
-& $msbuild_path """$solutionRootPath\SPMeta2.SSOM.Standard\SPMeta2.SSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug40 /p:DefineConstants=NET40 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
-& $msbuild_path """$solutionRootPath\SPMeta2.SSOM.Standard\SPMeta2.SSOM.Standard.csproj"" /t:Clean,Rebuild /p:Configuration=Debug45 /p:spRuntime=15 /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:minimal"
+
+
+
diff --git a/SPMeta2/SPMeta2.CSOM.Standard/ModelHandlers/SearchSettingsModelHandler.cs b/SPMeta2/SPMeta2.CSOM.Standard/ModelHandlers/SearchSettingsModelHandler.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Web.Script.Serialization;
 using Microsoft.SharePoint.Client;
-using Microsoft.SharePoint.Client.Search.Administration;
-using Microsoft.SharePoint.Client.Search.Portability;
 using SPMeta2.Common;
 using SPMeta2.Config;
 using SPMeta2.CSOM.Extensions;

diff --git a/SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.16020.0016")]
+[assembly: AssemblyFileVersion("1.2.16068.0806")]