SPMeta2 1.2.25-beta1, October 2015

SubPointSolutions · Oct 7, 2015 · f01df12 · f01df12
1 parent c760dc4
commit f01df12
Show file tree

Hide file tree

Showing 31 changed files with 36 additions and 30 deletions.
diff --git a/SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.CSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.CSOM/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Containers.CSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.CSOM/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Containers.O365/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.O365/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Containers.O365v16/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.O365v16/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Containers.SSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.SSOM/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Containers.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.Standard/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Containers/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.O365/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.O365/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Regression.CSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.CSOM.Standard/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Regression.CSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.CSOM/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Regression.Impl.Tests/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.Impl.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Regression.SSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.SSOM.Standard/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Regression.SSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.SSOM/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Regression.Tests/Impl/Definitions/TaxonomyFieldDefinitionTests.cs b/SPMeta2/SPMeta2.Regression.Tests/Impl/Definitions/TaxonomyFieldDefinitionTests.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.Definitions.Fields;
 using SPMeta2.Enumerations;

diff --git a/SPMeta2/SPMeta2.Regression.Tests/Impl/Definitions/UserFieldDefinitionTests.cs b/SPMeta2/SPMeta2.Regression.Tests/Impl/Definitions/UserFieldDefinitionTests.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.Definitions.Fields;
 using SPMeta2.Enumerations;

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

diff --git a/SPMeta2/SPMeta2.Regression.Tests/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.Tests/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Regression/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.15271.0017")]
+[assembly: AssemblyFileVersion("1.0.15280.0803")]
diff --git a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Taxonomy/TaxonomyTermModelHandler.cs b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Taxonomy/TaxonomyTermModelHandler.cs
@@ -174,15 +174,20 @@ protected void MapTermProperties(Term currentTerm, TaxonomyTermDefinition termMo
             if (termModel.IsAvailableForTagging.HasValue)
                 currentTerm.IsAvailableForTagging = termModel.IsAvailableForTagging.Value;
 
+#if !NET35
             foreach (var customProp in termModel.CustomProperties.Where(p => p.Override))
             {
                 currentTerm.SetCustomProperty(customProp.Name, customProp.Value);
             }
+#endif
 
+#if !NET35
             foreach (var customProp in termModel.LocalCustomProperties.Where(p => p.Override))
             {
                 currentTerm.SetLocalCustomProperty(customProp.Name, customProp.Value);
             }
+#endif
+
         }
 
         private void DeployTermUnderTermSet(object modelHost, TermSetModelHost groupModelHost, TaxonomyTermDefinition termModel)

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Taxonomy/TaxonomyTermSetModelHandler.cs b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Taxonomy/TaxonomyTermSetModelHandler.cs
@@ -136,11 +136,12 @@ private static void MapTermSet(TermSet currentTermSet, TaxonomyTermSetDefinition
             if (termSetModel.IsAvailableForTagging.HasValue)
                 currentTermSet.IsAvailableForTagging = termSetModel.IsAvailableForTagging.Value;
 
-
+#if !NET35
             foreach (var customProp in termSetModel.CustomProperties.Where(p => p.Override))
             {
                 currentTermSet.SetCustomProperty(customProp.Name, customProp.Value);
             }
+#endif
         }
 
         protected TermSet FindTermSet(Microsoft.SharePoint.Taxonomy.Group termGroup, TaxonomyTermSetDefinition termSetModel)

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.SSOM.Standard/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.SSOM/ModelHandlers/AnonymousAccessSettingsModelHandler.cs b/SPMeta2/SPMeta2.SSOM/ModelHandlers/AnonymousAccessSettingsModelHandler.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using Microsoft.SharePoint;
 using SPMeta2.Common;
 using SPMeta2.Definitions;

diff --git a/SPMeta2/SPMeta2.SSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.SSOM/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2.Standard/Enumerations/BuiltInManagedDataType.cs b/SPMeta2/SPMeta2.Standard/Enumerations/BuiltInManagedDataType.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/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Standard/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.15271.0017")]
+[assembly: AssemblyFileVersion("1.2.15280.0803")]
diff --git a/SPMeta2/SPMeta2/Attributes/Capabilities/NotAbsoluteUrlCapabilityAttribute.cs b/SPMeta2/SPMeta2/Attributes/Capabilities/NotAbsoluteUrlCapabilityAttribute.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 
 namespace SPMeta2.Attributes.Capabilities
 {

diff --git a/SPMeta2/SPMeta2/Definitions/AnonymousAccessSettingsDefinition.cs b/SPMeta2/SPMeta2/Definitions/AnonymousAccessSettingsDefinition.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.Capabilities;
 using SPMeta2.Attributes.Identity;

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

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

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