SPMeta2 1.1.90 release, May 2015

SubPointSolutions · May 25, 2015 · 21d6b48 · 21d6b48
1 parent b4917fc
commit 21d6b48
Show file tree

Hide file tree

Showing 21 changed files with 105 additions and 119 deletions.
diff --git a/SPMeta2.v12.suo b/SPMeta2.v12.suo
diff --git a/SPMeta2/SPMeta2.CSOM/ModelHandlers/Webparts/PageViewerWebPartModelHandler.cs b/SPMeta2/SPMeta2.CSOM/ModelHandlers/Webparts/PageViewerWebPartModelHandler.cs
@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 
 namespace SPMeta2.CSOM.ModelHandlers.Webparts
 {

diff --git a/...2/SPMeta2.Containers.Standard/DefinitionGenerators/ReusableHTMLItemDefinitionGenerator.cs b/...2/SPMeta2.Containers.Standard/DefinitionGenerators/ReusableHTMLItemDefinitionGenerator.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using SPMeta2.BuiltInDefinitions;
 using SPMeta2.Containers.Services.Base;
 using SPMeta2.Definitions;

diff --git a/...2/SPMeta2.Containers.Standard/DefinitionGenerators/ReusableTextItemDefinitionGenerator.cs b/...2/SPMeta2.Containers.Standard/DefinitionGenerators/ReusableTextItemDefinitionGenerator.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using SPMeta2.BuiltInDefinitions;
 using SPMeta2.Containers.Services.Base;
 using SPMeta2.Definitions;

diff --git a/...a2/SPMeta2.Containers/DefinitionGenerators/Webparts/UserCodeWebPartDefinitionGenerator.cs b/...a2/SPMeta2.Containers/DefinitionGenerators/Webparts/UserCodeWebPartDefinitionGenerator.cs
@@ -53,7 +53,7 @@ public override IEnumerable<DefinitionBase> GetAdditionalArtifacts()
 
             var webpartFeature = new FeatureDefinition
             {
-                Scope = FeatureDefinitionScope.Site,
+                Scope = FeatureDefinitionScope.Site,
                 Id = new Guid("9acf0f59-3cdc-412b-a647-4185dd4cd9bc"),
                 Enable = true
             };

diff --git a/SPMeta2/SPMeta2.Regression.CSOM/Validation/Fields/BusinessDataFieldDefinitionValidator.cs b/SPMeta2/SPMeta2.Regression.CSOM/Validation/Fields/BusinessDataFieldDefinitionValidator.cs
@@ -1,58 +1,43 @@
-using SPMeta2.CSOM.ModelHandlers.Fields;
-using SPMeta2.CSOM.ModelHosts;
-using SPMeta2.Definitions;
-using SPMeta2.Definitions.Base;
-using SPMeta2.Definitions.Fields;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using SPMeta2.Regression.CSOM.Utils;
-using SPMeta2.Utils;
-using Microsoft.SharePoint.Client;
-using SPMeta2.Exceptions;
-using System.Xml.Linq;
-
-namespace SPMeta2.Regression.CSOM.Validation.Fields
-{
-    public class BusinessDataFieldDefinitionValidator : ClientFieldDefinitionValidator
-    {
-        public override Type TargetType
-        {
-            get { return typeof(BusinessDataFieldDefinition); }
-        }
-
-        public override void DeployModel(object modelHost, DefinitionBase model)
-        {
-            base.DeployModel(modelHost, model);
-
-            var siteModelHost = modelHost.WithAssertAndCast<SiteModelHost>("modelHost", value => value.RequireNotNull());
-            var definition = model.WithAssertAndCast<BusinessDataFieldDefinition>("model", value => value.RequireNotNull());
-
-            var spObject = FindField(modelHost, definition);
-
-            var assert = ServiceFactory.AssertService.NewAssert(model, definition, spObject);
-
-            assert
-                .ShouldBeEqual(m => m.Title, o => o.Title)
-                    .ShouldBeEqual(m => m.InternalName, o => o.InternalName)
-                    .ShouldBeEqual(m => m.Id, o => o.Id)
-                    .ShouldBeEqual(m => m.Required, o => o.Required)
-                    .ShouldBeEqual(m => m.Description, o => o.Description)
-                    .ShouldBeEqual(m => m.FieldType, o => o.TypeAsString)
-                    .ShouldBeEqual(m => m.Group, o => o.Group)
-
-                    .ShouldBeEqual(m => m.SystemInstanceName, o => o.GetSystemInstanceName())
-                    .ShouldBeEqual(m => m.EntityNamespace, o => o.GetEntityNamespace())
-                    .ShouldBeEqual(m => m.EntityName, o => o.GetEntityName())
-                    .ShouldBeEqual(m => m.BdcFieldName, o => o.GetBdcFieldName());
-
-        }
-    }
-
-    //internal static class BCSFieldExt
-    //{
-
-    //}
-}
+using SPMeta2.CSOM.ModelHandlers.Fields;
+using SPMeta2.CSOM.ModelHosts;
+using SPMeta2.Definitions;
+using SPMeta2.Definitions.Base;
+using SPMeta2.Definitions.Fields;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using SPMeta2.Regression.CSOM.Utils;
+using SPMeta2.Utils;
+using Microsoft.SharePoint.Client;
+using SPMeta2.Exceptions;
+using System.Xml.Linq;
+
+namespace SPMeta2.Regression.CSOM.Validation.Fields
+{
+    public class BusinessDataFieldDefinitionValidator : ClientFieldDefinitionValidator
+    {
+        public override Type TargetType
+        {
+            get { return typeof(BusinessDataFieldDefinition); }
+        }
+
+        public override void DeployModel(object modelHost, DefinitionBase model)
+        {
+            base.DeployModel(modelHost, model);
+
+            var definition = model.WithAssertAndCast<BusinessDataFieldDefinition>("model", value => value.RequireNotNull());
+            var spObject = FindField(modelHost, definition);
+
+            var assert = ServiceFactory.AssertService
+                                       .NewAssert(model, definition, spObject);
+
+            assert
+                .ShouldBeEqual(m => m.SystemInstanceName, o => o.GetSystemInstanceName())
+                .ShouldBeEqual(m => m.EntityNamespace, o => o.GetEntityNamespace())
+                .ShouldBeEqual(m => m.EntityName, o => o.GetEntityName())
+                .ShouldBeEqual(m => m.BdcFieldName, o => o.GetBdcFieldName());
+        }
+    }
+}
diff --git a/SPMeta2/SPMeta2.Regression.Tests/Base/ListViewWebPartScenariosTestBase.cs b/SPMeta2/SPMeta2.Regression.Tests/Base/ListViewWebPartScenariosTestBase.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using SPMeta2.Definitions;
 using SPMeta2.Exceptions;
 using SPMeta2.Regression.Tests.Impl.Scenarios;

diff --git a/SPMeta2/SPMeta2.Regression.Tests/Impl/Scenarios/ListViewWebPartScenariosTest.cs b/SPMeta2/SPMeta2.Regression.Tests/Impl/Scenarios/ListViewWebPartScenariosTest.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SPMeta2.BuiltInDefinitions;
 using SPMeta2.Containers;

diff --git a/SPMeta2/SPMeta2.Regression.Tests/Impl/Scenarios/ReusableItemScenariosTest.cs b/SPMeta2/SPMeta2.Regression.Tests/Impl/Scenarios/ReusableItemScenariosTest.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SPMeta2.BuiltInDefinitions;
 using SPMeta2.Containers;

diff --git a/SPMeta2/SPMeta2.Regression.Tests/PSScripts/200 - Configure M2 Test Environment.ps1 b/SPMeta2/SPMeta2.Regression.Tests/PSScripts/200 - Configure M2 Test Environment.ps1
@@ -6,5 +6,5 @@ M2ShowSettings $g_M2TestEnvironment
 
 # CSOM, SSOM, O365
 SetupSPMeta2RegressionTestEnvironment "SSOM"
-SetupSPMeta2RegressionTestEnvironment "CSOM"
+#SetupSPMeta2RegressionTestEnvironment "CSOM"
 #SetupSPMeta2RegressionTestEnvironment "O365"

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Base/ReusableTextItemModelHandlerBase.cs b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Base/ReusableTextItemModelHandlerBase.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using Microsoft.SharePoint;
 using SPMeta2.Definitions;
 using SPMeta2.SSOM.ModelHandlers;

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/ReusableHTMLItemModelHandler.cs b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/ReusableHTMLItemModelHandler.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using Microsoft.SharePoint;
 using SPMeta2.Definitions;
 using SPMeta2.Enumerations;

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/ReusableTextItemModelHandler.cs b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/ReusableTextItemModelHandler.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using Microsoft.SharePoint;
 using SPMeta2.Definitions;
 using SPMeta2.Enumerations;

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/SPMeta2.SSOM.Standard.csproj b/SPMeta2/SPMeta2.SSOM.Standard/SPMeta2.SSOM.Standard.csproj
@@ -211,7 +211,7 @@
     <Compile Include="ModelHosts\TermSetModelHost.cs" />
     <Compile Include="ModelHosts\TermGroupModelHost.cs" />
     <Compile Include="ModelHosts\TermStoreModelHost.cs" />
-    <Compile Include="ModelHandlers\Webparts\ProjectSummaryWebPartModelHandler.cs" />
+    <Compile Include="ModelHandlers\Webparts\ProjectSummaryWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" /> 
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PublishingPageTemplates.Designer.cs">
       <AutoGen>True</AutoGen>

diff --git a/SPMeta2/SPMeta2.SSOM/ModelHandlers/Webparts/XsltListViewWebPartModelHandler.cs b/SPMeta2/SPMeta2.SSOM/ModelHandlers/Webparts/XsltListViewWebPartModelHandler.cs
@@ -94,8 +94,9 @@ protected override void ProcessWebpartProperties(WebPart webpartInstance, WebPar
 
                         hiddenView.RowLimit = srcView.RowLimit;
                         hiddenView.Query = srcView.Query;
+#if !NET35
                         hiddenView.JSLink = srcView.JSLink;
-
+#endif
                         hiddenView.IncludeRootFolder = srcView.IncludeRootFolder;
                         hiddenView.Scope = srcView.Scope;
 

diff --git a/SPMeta2/SPMeta2.Standard/Definitions/Base/ReusableItemDefinitionBase.cs b/SPMeta2/SPMeta2.Standard/Definitions/Base/ReusableItemDefinitionBase.cs
@@ -1,44 +1,44 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-using SPMeta2.Attributes.Regression;
-using SPMeta2.Definitions;
-
-namespace SPMeta2.Standard.Definitions.Base
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+using SPMeta2.Attributes.Regression;
+using SPMeta2.Definitions;
+
+namespace SPMeta2.Standard.Definitions.Base
 {
-    public abstract class ReusableItemDefinitionBase : ListItemDefinition
-    {
-        #region constructors
-
-        public ReusableItemDefinitionBase()
-        {
-            Overwrite = true;
-            AutomaticUpdate = true;
-        }
-
-        #endregion
-
-        #region properties
-
-        [ExpectValidation]
-        [DataMember]
-        public string Comments { get; set; }
-
-        [ExpectValidation]
-        [DataMember]
-        public string ContentCategory { get; set; }
-
-        [ExpectValidation]
-        [DataMember]
-        public bool AutomaticUpdate { get; set; }
-
-        [ExpectValidation]
-        [DataMember]
-        public bool ShowInDropDownMenu { get; set; }
-
-        #endregion
-    }
-}
+    public abstract class ReusableItemDefinitionBase : ListItemDefinition
+    {
+        #region constructors
+
+        public ReusableItemDefinitionBase()
+        {
+            Overwrite = true;
+            AutomaticUpdate = true;
+        }
+
+        #endregion
+
+        #region properties
+
+        [ExpectValidation]
+        [DataMember]
+        public string Comments { get; set; }
+
+        [ExpectValidation]
+        [DataMember]
+        public string ContentCategory { get; set; }
+
+        [ExpectValidation]
+        [DataMember]
+        public bool AutomaticUpdate { get; set; }
+
+        [ExpectValidation]
+        [DataMember]
+        public bool ShowInDropDownMenu { get; set; }
+
+        #endregion
+    }
+}
diff --git a/SPMeta2/SPMeta2.Standard/Definitions/ReusableHTMLItemDefinition.cs b/SPMeta2/SPMeta2.Standard/Definitions/ReusableHTMLItemDefinition.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
-using System.Threading.Tasks;
+
 using SPMeta2.Attributes;
 using SPMeta2.Attributes.Identity;
 using SPMeta2.Attributes.Regression;

diff --git a/SPMeta2/SPMeta2.Standard/Definitions/ReusableTextItemDefinition.cs b/SPMeta2/SPMeta2.Standard/Definitions/ReusableTextItemDefinition.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
-using System.Threading.Tasks;
+
 using SPMeta2.Attributes;
 using SPMeta2.Attributes.Identity;
 using SPMeta2.Attributes.Regression;

diff --git a/SPMeta2/SPMeta2.Standard/Enumerations/BuiltInContentClass.cs b/SPMeta2/SPMeta2.Standard/Enumerations/BuiltInContentClass.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 
 namespace SPMeta2.Standard.Enumerations
 {

diff --git a/SPMeta2/SPMeta2.Standard/Syntax/TypedWebpartsDefinitionSyntax.cs b/SPMeta2/SPMeta2.Standard/Syntax/TypedWebpartsDefinitionSyntax.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using SPMeta2.Definitions.Webparts;
 using SPMeta2.Models;
 using SPMeta2.Syntax.Default.Extensions;

diff --git a/SPMeta2/SPMeta2/Definitions/ComposedLookItemDefinition.cs b/SPMeta2/SPMeta2/Definitions/ComposedLookItemDefinition.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
-using System.Threading.Tasks;
+
 using SPMeta2.Attributes;
 using SPMeta2.Attributes.Identity;
 using SPMeta2.Attributes.Regression;