Merge pull request #1046 from SubPointSolutions/dev

SPMeta2 1.2.130, June 2017
SubPointSolutions · Jul 10, 2017 · 6234157 · 6234157
2 parents 5d96ad8 + bf326aa
commit 6234157
Show file tree

Hide file tree

Showing 180 changed files with 9,607 additions and 5,024 deletions.
diff --git a/SPMeta2.sln b/SPMeta2.sln
@@ -123,6 +123,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPMeta2.Nintex.SSOM", "SPMe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Regression", "SPMeta2\Regression\Regression.csproj", "{593FFE45-EFCC-43DC-8AA2-27236DD6160D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPMeta2.Containers.FarmSolutionWebAppContainer", "SPMeta2\SPMeta2.Containers.FarmSolutionWebAppContainer\SPMeta2.Containers.FarmSolutionWebAppContainer.csproj", "{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPMeta2.Containers.FarmSolutionWebAppContainer1", "SPMeta2\SPMeta2.Containers.FarmSolutionWebAppContainer1\SPMeta2.Containers.FarmSolutionWebAppContainer1.csproj", "{B9DDD9D7-99AF-4849-A559-C02558D4F774}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -386,6 +390,30 @@ Global
 		{593FFE45-EFCC-43DC-8AA2-27236DD6160D}.Debug45|Any CPU.Build.0 = Debug|Any CPU
 		{593FFE45-EFCC-43DC-8AA2-27236DD6160D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{593FFE45-EFCC-43DC-8AA2-27236DD6160D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Debug40|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Debug40|Any CPU.Build.0 = Debug|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Debug40|Any CPU.Deploy.0 = Debug|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Debug45|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Debug45|Any CPU.Build.0 = Debug|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Debug45|Any CPU.Deploy.0 = Debug|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Debug40|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Debug40|Any CPU.Build.0 = Debug|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Debug40|Any CPU.Deploy.0 = Debug|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Debug45|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Debug45|Any CPU.Build.0 = Debug|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Debug45|Any CPU.Deploy.0 = Debug|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -432,5 +460,7 @@ Global
 		{588FC30F-1C85-410E-AB20-C9741DB28857} = {543E02CC-AA4A-4B1F-ABBD-2C88CFAA463C}
 		{788D7D6E-5347-4D09-BFF8-E83AD7CA1FD3} = {543E02CC-AA4A-4B1F-ABBD-2C88CFAA463C}
 		{593FFE45-EFCC-43DC-8AA2-27236DD6160D} = {EE9BD842-2CA9-45B2-AB7C-A8EB0353AAB7}
+		{9A306EC6-DE61-49B9-940D-7C1A36FC15AD} = {358E83EE-8ABA-463E-A868-3906865FDA39}
+		{B9DDD9D7-99AF-4849-A559-C02558D4F774} = {358E83EE-8ABA-463E-A868-3906865FDA39}
 	EndGlobalSection
 EndGlobal
diff --git a/SPMeta2/Build/build.json b/SPMeta2/Build/build.json
@@ -284,7 +284,7 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2",
             "Id": "SPMeta2.Core",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
             "ProjectUrl": "https://github.com/SubPointSolutions/spmeta2",
@@ -323,11 +323,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.Standard",
             "Id": "SPMeta2.Core.Standard",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -368,11 +368,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -405,15 +405,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -446,11 +446,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM",
             "Id": "SPMeta2.SSOM.Foundation",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -483,15 +483,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM.Standard",
             "Id": "SPMeta2.SSOM.Standard",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.SSOM.Foundation",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -525,11 +525,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation-v14",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -555,15 +555,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard-v14",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation-v14",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -589,11 +589,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM",
             "Id": "SPMeta2.SSOM.Foundation-v14",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -619,15 +619,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM.Standard",
             "Id": "SPMeta2.SSOM.Standard-v14",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.SSOM.Foundation-v14",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -653,11 +653,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation-v16",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 },
                 {
                     "Id": "Microsoft.SharePointOnline.CSOM",
@@ -694,15 +694,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard-v16",
-            "Version": "1.2.120",
+            "Version": "1.2.130-beta1",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation-v16",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120"
+                    "Version": "1.2.130-beta1"
                 },
                 {
                     "Id": "Microsoft.SharePointOnline.CSOM",

diff --git a/SPMeta2/Regression/_ut_grid_baseline_config.ps1 b/SPMeta2/Regression/_ut_grid_baseline_config.ps1
@@ -57,7 +57,19 @@ $configScript = {
             $s.Configuration.Alter()
         }
 
-        function Ensure-AssociatedGroups() {
+         function Ensure-AssociatedGroups-ForAllSites() {
+
+            Add-PSSnapin Microsoft.SharePoint.PowerShell
+            $sites = Get-SPSite
+
+            foreach($site in $sites)
+            {
+                Write-Host "Ensuring associated security group on site:[$($site.Url)]"
+                Ensure-AssociatedGroups $site.Url
+            }
+         }
+
+        function Ensure-AssociatedGroups($url) {
 
             Add-PSSnapin Microsoft.SharePoint.PowerShell
 
@@ -66,7 +78,7 @@ $configScript = {
 
              # TODO
 
-            $web = Get-SPWeb ("http://" + $computerName + ":31449")
+            $web = Get-SPWeb ($url)
             if ($web.AssociatedVisitorGroup -eq $null) {
                 Write-Host 'The Visitor Group does not exist. It will be created...' -ForegroundColor DarkYellow
                 $currentLogin = $web.CurrentUser.LoginName
@@ -127,9 +139,8 @@ $configScript = {
         $computerName = [environment]::MachineName
 
         Write-Host "Runing on [$computerName]"
-        #return
 
-        Ensure-AssociatedGroups
+        Ensure-AssociatedGroups-ForAllSites
 
         Update-SharePoint-ULS
         Limit-SharePoint-Search

diff --git a/SPMeta2/Regression/_ut_grid_dsc_spmeta2_webapp_unittests.ps1 b/SPMeta2/Regression/_ut_grid_dsc_spmeta2_webapp_unittests.ps1
@@ -122,7 +122,18 @@ Configuration SPMeta2_UnitTestSettings
 
     if($onprem -eq $true) {
 
-        $siteUrl = $webApp_Url.TrimEnd('/') + $config.SiteCollectionUrls 
+        $siteUrl = $config.SiteCollectionUrls 
+
+        if( ($siteUrl -is [System.Object[]]) -eq $true)
+        {
+            $siteUrl = $siteUrl[0]
+        }
+
+        if($siteUrl.StartsWith("http") -eq $false)
+        {
+            $siteUrl = $webApp_Url.TrimEnd('/') + $siteUrl
+        }
+
         Write-Host "Fetching default taxoomy store for SharePoint:[$siteUrl]" -fore Green
 
         $o365_UserName = $config.OnlineUserName
@@ -303,9 +314,6 @@ $config = @{
             )
     }
 
-#$dsc_nodeNames = @("dev13")
-
-
 <#
 Apply-Dsc-Configuration -name SPMeta2_UnitTestSettings_Clean `
                         -nodeNames $dsc_nodeNames `
@@ -316,4 +324,4 @@ Apply-Dsc-Configuration -name SPMeta2_UnitTestSettings_Clean `
 Apply-Dsc-Configuration -name SPMeta2_UnitTestSettings `
                         -nodeNames $dsc_nodeNames `
                         -isVerbose $true `
-                        -config $config
+                        -config $config
diff --git a/SPMeta2/SPMeta2.Build/m2.buildbaseline.xml b/SPMeta2/SPMeta2.Build/m2.buildbaseline.xml
diff --git a/SPMeta2/SPMeta2.CSOM.Standard/ModelHandlers/Fields/TaxonomyFieldModelHandler.cs b/SPMeta2/SPMeta2.CSOM.Standard/ModelHandlers/Fields/TaxonomyFieldModelHandler.cs
@@ -52,7 +52,10 @@ protected override void ProcessFieldProperties(Field field, FieldDefinition fiel
             // let base setting be setup
             base.ProcessFieldProperties(taxField, fieldModel);
 
-            taxField.AllowMultipleValues = taxFieldModel.IsMulti;
+            taxField.AllowMultipleValues = taxFieldModel.IsMulti;
+
+            if (taxFieldModel.UserCreated.HasValue)
+                taxField.UserCreated = taxFieldModel.UserCreated.Value;
 
             if (taxFieldModel.Open.HasValue)
                 taxField.Open = taxFieldModel.Open.Value;
@@ -76,7 +79,9 @@ protected override void ProcessFieldProperties(Field field, FieldDefinition fiel
                 taxField.TermSetId = termSet.Id;
 
             if (term != null)
-                taxField.AnchorId = term.Id;
+                taxField.AnchorId = term.Id;
+
+
         }
 
         public static TermStore LookupTermStore(ClientContext clientContext,