Merge pull request #983 from SubPointSolutions/dev

SPMeta2 1.2.120-beta4, March 2017
SubPointSolutions · Mar 20, 2017 · 4ae8a30 · 4ae8a30
2 parents c68a643 + 7c18ecf
commit 4ae8a30
Show file tree

Hide file tree

Showing 36 changed files with 1,431 additions and 1,239 deletions.
diff --git a/SPMeta2/Build/build.json b/SPMeta2/Build/build.json
@@ -227,7 +227,7 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2",
             "Id": "SPMeta2.Core",
-            "Version": "1.2.120-beta3",
+            "Version": "1.2.120-beta4",
             "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-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -311,11 +311,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation",
-            "Version": "1.2.120-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -348,15 +348,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard",
-            "Version": "1.2.120-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -389,11 +389,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM",
             "Id": "SPMeta2.SSOM.Foundation",
-            "Version": "1.2.120-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -426,15 +426,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM.Standard",
             "Id": "SPMeta2.SSOM.Standard",
-            "Version": "1.2.120-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.SSOM.Foundation",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -468,11 +468,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation-v14",
-            "Version": "1.2.120-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 }
             ],
             "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-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation-v14",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -532,11 +532,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM",
             "Id": "SPMeta2.SSOM.Foundation-v14",
-            "Version": "1.2.120-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 }
             ],
             "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-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.SSOM.Foundation-v14",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -596,11 +596,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation-v16",
-            "Version": "1.2.120-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 },
                 {
                     "Id": "Microsoft.SharePointOnline.CSOM",
@@ -637,15 +637,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard-v16",
-            "Version": "1.2.120-beta3",
+            "Version": "1.2.120-beta4",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation-v16",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta3"
+                    "Version": "1.2.120-beta4"
                 },
                 {
                     "Id": "Microsoft.SharePointOnline.CSOM",

diff --git a/SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs
@@ -1,35 +1,35 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SPMeta2.CSOM.Standard")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SPMeta2.CSOM.Standard")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fe6947ad-76e7-4527-95ec-af15665de77e")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.17072.1315")]
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SPMeta2.CSOM.Standard")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SPMeta2.CSOM.Standard")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("fe6947ad-76e7-4527-95ec-af15665de77e")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.2.17079.1227")]
diff --git a/SPMeta2/SPMeta2.CSOM/ModelHandlers/ContentTypeLinkModelHandler.cs b/SPMeta2/SPMeta2.CSOM/ModelHandlers/ContentTypeLinkModelHandler.cs
@@ -8,7 +8,8 @@
 using SPMeta2.ModelHandlers;
 using SPMeta2.Services;
 using SPMeta2.Utils;
-using SPMeta2.CSOM.ModelHosts;
+using SPMeta2.CSOM.ModelHosts;
+using SPMeta2.ModelHosts;
 
 namespace SPMeta2.CSOM.ModelHandlers
 {
@@ -20,8 +21,8 @@ public override Type TargetType
         }
 
         public override void WithResolvingModelHost(ModelHostResolveContext modelHostContext)
-        {
-            var modelHost = modelHostContext.ModelHost;
+        {
+            var modelHost = modelHostContext.ModelHost as CSOMModelHostBase;
             var model = modelHostContext.Model;
             var childModelType = modelHostContext.ChildModelType;
             var action = modelHostContext.Action;
@@ -33,18 +34,21 @@ public override void WithResolvingModelHost(ModelHostResolveContext modelHostCon
             var context = list.Context;
 
             context.Load(list, l => l.ContentTypes);
-            context.ExecuteQueryWithTrace();
-
-            var listContentType = FindListContentType(list, contentTypeLinkModel);
-
-            action(new ModelHostContext
-            {
-                Site = listModelHost.HostSite,
-                Web = listModelHost.HostWeb,
-                ContentType = listContentType
-            });
+            context.ExecuteQueryWithTrace();
+
+            var contentType = FindListContentType(list, contentTypeLinkModel);
+
+            var contentTypeLinkHost = ModelHostBase.Inherit<ContentTypeLinkModelHost>(modelHost, host =>
+            {
+                host.HostContentType = contentType;
+                host.HostList = list;
+            });
+
+            action(contentTypeLinkHost);
+
+            if (!contentTypeLinkHost.ShouldUpdateHost)
+                contentType.Update(false);
 
-            listContentType.Update(false);
             context.ExecuteQueryWithTrace();
         }
 

diff --git a/SPMeta2/SPMeta2.CSOM/ModelHandlers/WorkflowAssociationModelHandler.cs b/SPMeta2/SPMeta2.CSOM/ModelHandlers/WorkflowAssociationModelHandler.cs
@@ -53,6 +53,22 @@ public override void DeployModel(object modelHost, DefinitionBase model)
 
                 DeployContentTypeWorkflowAssociationDefinition(modelHost, contentType, workflowAssociationModel);
             }
+            else if (modelHost is ContentTypeLinkModelHost)
+            {
+                var contentTypeLinkModelHost = (modelHost as ContentTypeLinkModelHost);
+
+                // don't update content type link within list
+                if (contentTypeLinkModelHost.HostList != null)
+                    contentTypeLinkModelHost.ShouldUpdateHost = false;
+
+                var contentType = contentTypeLinkModelHost.HostContentType;
+                var web = contentTypeLinkModelHost.HostWeb;
+
+                if (contentTypeLinkModelHost.HostList != null)
+                    contentTypeLinkModelHost.ShouldUpdateHost = false;
+
+                DeployContentTypeWorkflowAssociationDefinition(modelHost, contentType, workflowAssociationModel);
+            }
             else
             {
                 throw new SPMeta2NotSupportedException("model host should be of type ListModelHost or WebModelHost");
@@ -77,6 +93,14 @@ private Web GetWebFromModelHost(object modelHost)
                 return (modelHost as ModelHostContext).Web;
             }
 
+            if (modelHost is ContentTypeLinkModelHost)
+            {
+                var listContentTypeHost = (modelHost as ContentTypeLinkModelHost);
+
+
+                return listContentTypeHost.HostWeb;
+            }
+
             throw new SPMeta2NotSupportedException("model host should be of type ListModelHost or WebModelHost");
         }
 
@@ -121,6 +145,19 @@ protected WorkflowAssociation FindExistringWorkflowAssotiation(object modelHost,
                 return res.FirstOrDefault();
             }
 
+            if (modelHost is ContentTypeLinkModelHost)
+            {
+                var list = (modelHost as ContentTypeLinkModelHost).HostList;
+                var context = list.Context;
+
+                var defName = def.Name;
+
+                var res = context.LoadQuery(list.WorkflowAssociations.Where(w => w.Name == defName));
+                context.ExecuteQueryWithTrace();
+
+                return res.FirstOrDefault();
+            }
+
             throw new SPMeta2NotSupportedException("model host should be of type ListModelHost or WebModelHost");
         }
 

diff --git a/SPMeta2/SPMeta2.CSOM/ModelHosts/ContentTypeLinkModelHost.cs b/SPMeta2/SPMeta2.CSOM/ModelHosts/ContentTypeLinkModelHost.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Microsoft.SharePoint;
+using Microsoft.SharePoint.Client;
+
+namespace SPMeta2.CSOM.ModelHosts
+{
+    public class ContentTypeLinkModelHost : ListModelHost
+    {
+        #region constructors
+
+
+        #endregion
+
+        #region properties
+
+        public ContentType HostContentType { get; set; }
+
+        #endregion
+    }
+}