Merge pull request #899 from SubPointSolutions/dev

SPMeta2 v1.2.90, October 2016
SubPointSolutions · Oct 4, 2016 · 5528acf · 5528acf
2 parents 9b8214a + 8307725
commit 5528acf
Show file tree

Hide file tree

Showing 303 changed files with 2,442 additions and 6,795 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/SPMeta2/Build/build.cake b/SPMeta2/Build/build.cake
@@ -39,6 +39,9 @@ Task("Docs-Publishing")
      var srcDocsPath = System.IO.Path.GetFullPath(string.Format(@"./../SubPointSolutions.Docs/Views/{0}", projectDocsFolder));
      var dstDocsPath = string.Format(@"{0}/subpointsolutions-docs/SubPointSolutions.Docs/Views", docsRepoFolder);
 
+     var srcSamplesPath = System.IO.Path.GetFullPath(string.Format(@"./../SubPointSolutions.Docs/Code/Samples/m2Samples.cs"));
+     var dstSamplesPath = string.Format(@"{0}/subpointsolutions-docs/SubPointSolutions.Docs/Code/Samples", docsRepoFolder);
+
      var commitName = string.Format(@"{0} - CI docs update {1}", projectName, DateTime.Now.ToString("yyyyMMdd_HHmmssfff"));
 
      Information(string.Format("Merging documentation wiht commit:[{0}]", commitName));
@@ -72,6 +75,7 @@ Task("Docs-Publishing")
       var mergeCmd = new []{
             string.Format("cd '{0}'", docsRepoFolder),
             string.Format("copy-item  '{0}' '{1}' -Recurse -Force", srcDocsPath,  dstDocsPath),
+            string.Format("copy-item  '{0}' '{1}' -Recurse -Force", srcSamplesPath,  dstSamplesPath),
             string.Format("git add *.md"),
             string.Format("git add *.cs"),
             string.Format("git commit -m '{0}'", commitName),

diff --git a/SPMeta2/SPMeta2.Build/_m2.nuget.core.ps1 b/SPMeta2/SPMeta2.Build/_m2.nuget.core.ps1
@@ -521,6 +521,8 @@ function CreateSPMeta2CoreStandardPackage($version) {
 
 function CreateSPMeta2CSOMFoundationPackage($version, $spRuntime) {
 
+    Write-BInfo "CreateSPMeta2CSOMFoundationPackage - Version:[$version] Runtime:[$spRuntime]"
+
 	$package = GetPackagePrototype
 
 	$package.Version = $version;
@@ -557,11 +559,27 @@ function CreateSPMeta2CSOMFoundationPackage($version, $spRuntime) {
 
 	$package.Dependencies += $spMetaCore
 
+	# add reference to Microsoft.SharePointOnline.CSOM 
+	if($spRuntime -eq "16") {
+
+        Write-BInfo "Detected [$spRuntime] runtime, adding ref to Microsoft.SharePointOnline.CSOM"
+
+		$o365CSOMPackage = GetDependencyPrototype
+		$o365CSOMPackage.Id = "Microsoft.SharePointOnline.CSOM"
+		$o365CSOMPackage.Version = "16.1.5715.1200"
+
+		$package.Dependencies += $o365CSOMPackage
+	} else {
+        Write-BInfo "Detected [$spRuntime] runtime, no ref to Microsoft.SharePointOnline.CSOM is needed"
+    }
+
 	CreatePackage $package $spRuntime
 }
 
-function CreateSPMeta2CSOMStandardPackage($versionm, $spRuntime) {
+function CreateSPMeta2CSOMStandardPackage($version, $spRuntime) {
 
+    Write-BInfo "CreateSPMeta2CSOMStandardPackage - Version:[$version] Runtime:[$spRuntime]"
+
 	$package = GetPackagePrototype
 
 	$package.Version = $version;
@@ -623,6 +641,20 @@ function CreateSPMeta2CSOMStandardPackage($versionm, $spRuntime) {
 
 	$package.Dependencies += $spMetaCSOM
 
+	# add reference to Microsoft.SharePointOnline.CSOM 
+	if($spRuntime -eq "16") {
+
+        Write-BInfo "Detected [$spRuntime] runtime, adding ref to Microsoft.SharePointOnline.CSOM"
+
+		$o365CSOMPackage = GetDependencyPrototype
+		$o365CSOMPackage.Id = "Microsoft.SharePointOnline.CSOM"
+		$o365CSOMPackage.Version = "16.1.5715.1200"
+
+		$package.Dependencies += $o365CSOMPackage
+	} else {
+        Write-BInfo "Detected [$spRuntime] runtime, no ref to Microsoft.SharePointOnline.CSOM is needed"
+    }
+
 	CreatePackage $package $spRuntime
 }
 

diff --git a/SPMeta2/SPMeta2.Build/build.v12.ps1 b/SPMeta2/SPMeta2.Build/build.v12.ps1
@@ -89,7 +89,7 @@ function BuildProfile($buildProfile) {
             Write-BError "`t[M2 Build] Expanding params:" -fore Red
 
             foreach($key in $buildProfile.Keys) {
-                Write-BError "`t$key":[$( $buildProfile[$key])] -fore Red
+                Write-BError "`t$key":[$($buildProfile[$key])] -fore Red
             }
 
 			throw "`t[M2 Build] !!! Build faild on profile:[$($buildProfile.Name)]. Please check output early to check the details. !!!" 
@@ -145,6 +145,7 @@ $o365Projects = @("SPMeta2", "SPMeta2.Standard", "SPMeta2.CSOM", "SPMeta2.CSOM.S
 
 # https://msdn.microsoft.com/en-us/library/ms164311.aspx
 $defaultBuildParams = " /t:Clean,Rebuild /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:quiet /clp:ErrorsOnly /nologo"
+#$defaultBuildParams = " /t:Clean,Rebuild /p:Platform=AnyCPU /p:WarningLevel=0 /verbosity:detailed /clp:ErrorsOnly /nologo"
 
 $isAppVeyor = $g_isAppVeyor
 

diff --git a/SPMeta2/SPMeta2.Build/nuget.v12.ps1 b/SPMeta2/SPMeta2.Build/nuget.v12.ps1
@@ -28,7 +28,7 @@ cd "$currentDir"
 # global 'g_' variables to be used across the board
 
 # should publish to NuGet?
-$g_shouldPublish = $false
+$g_shouldPublish = $true
 
 # should use daily-based version
 $g_useDayVersion = $false
@@ -37,10 +37,10 @@ $g_useDayVersion = $false
 $g_is13 = $false
 
 # M2 NuGet package version, release noted URL and target solution directory
-$g_hardcoreVersionBase = "1.2.75";
-$g_hardcoreVersion = "$g_hardcoreVersionBase-beta1";
+$g_hardcoreVersionBase = "1.2.85";
+$g_hardcoreVersion = "$g_hardcoreVersionBase-beta2";
 
-$g_releaseNotes = "https://github.com/SubPointSolutions/spmeta2/releases/tag/1.2.60";
+$g_releaseNotes = "https://github.com/SubPointSolutions/spmeta2/releases/tag/$g_hardcoreVersion";
 $g_solutionDirectory = "C:\Users\$env:USERNAME.$env:USERDOMAIN\Source\Repos\spmeta2\spmeta2"
 
 $g_Verbosity = 'quiet'

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.16270.1325")]
+[assembly: AssemblyFileVersion("1.2.16278.0757")]