+ build fix, testing

SubPointSolutions · Oct 24, 2016 · dba2270 · dba2270
1 parent b24e680
commit dba2270
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 85 deletions.
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
diff --git a/SPMeta2/SPMeta2.Containers.CSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.CSOM/Properties/AssemblyInfo.cs
@@ -33,8 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: AssemblyFileVersion("1.2.16298.0658")]
-=======
-[assembly: AssemblyFileVersion("1.2.16284.1257")]
->>>>>>> cabc215006c9caa819cf7fab856a3ec7dd1b707f
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
diff --git a/SPMeta2/SPMeta2.Containers.O365v16/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.O365v16/Properties/AssemblyInfo.cs
@@ -33,8 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: AssemblyFileVersion("1.2.16298.0658")]
-=======
-[assembly: AssemblyFileVersion("1.2.16284.1257")]
->>>>>>> cabc215006c9caa819cf7fab856a3ec7dd1b707f
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.0.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
diff --git a/SPMeta2/SPMeta2.Standard/Definitions/WebNavigationSettingsDefinition.cs b/SPMeta2/SPMeta2.Standard/Definitions/WebNavigationSettingsDefinition.cs
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-using System;
+using System;
 using System.ComponentModel;
 using SPMeta2.Attributes;
 using SPMeta2.Attributes.Identity;
@@ -43,59 +42,6 @@ public WebNavigationSettingsDefinition()
         public bool? DisplayShowHideRibbonAction { get; set; }
 
         [DataMember]
-=======
-using System;
-using System.Runtime.Serialization;
-
-using SPMeta2.Attributes;
-using SPMeta2.Attributes.Identity;
-using SPMeta2.Attributes.Regression;
-using SPMeta2.Definitions;
-using SPMeta2.Utils;
-using SPMeta2.Attributes.Capabilities;
-
-namespace SPMeta2.Standard.Definitions
-{
-    [SPObjectType(SPObjectModelType.SSOM, "Microsoft.SharePoint.Publishing.Navigation.WebNavigationSettings", "Microsoft.SharePoint.Publishing")]
-    [SPObjectType(SPObjectModelType.CSOM, "Microsoft.SharePoint.Client.Publishing.Navigation.WebNavigationSettings", "Microsoft.SharePoint.Client.Publishing")]
-
-    [DefaultParentHost(typeof(WebDefinition))]
-    [DefaultRootHost(typeof(SiteDefinition))]
-
-    [Serializable]
-    [DataContract]
-    [SingletonIdentity]
-
-    [ParentHostCapability(typeof(WebDefinition))]
-    public class WebNavigationSettingsDefinition : DefinitionBase
-    {
-        #region constructors
-
-        public WebNavigationSettingsDefinition()
-        {
-            CurrentNavigationTermSetLCID = 1033;
-            GlobalNavigationTermSetLCID = 1033;
-        }
-
-
-        #endregion
-
-        #region properties
-
-        [DataMember]
-        [ExpectValidation]
-        public bool? DisplayShowHideRibbonAction { get; set; }
-
-        [DataMember]
-        [ExpectValidation]
-        public bool? AddNewPagesToNavigation { get; set; }
-
-        [DataMember]
-        [ExpectValidation]
-        public bool? CreateFriendlyUrlsForNewPages { get; set; }
-
-        [DataMember]
->>>>>>> cabc215006c9caa819cf7fab856a3ec7dd1b707f
         [ExpectValidation]
         public bool? AddNewPagesToNavigation { get; set; }
 
@@ -217,4 +163,4 @@ public override string ToString()
 
         #endregion
     }
-}
+}
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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
diff --git a/SPMeta2/SPMeta2/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2/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.16284.1257")]
+[assembly: AssemblyFileVersion("1.2.16298.0736")]
diff --git a/SPMeta2/SubPointSolutions.Docs/Properties/AssemblyInfo.cs b/SPMeta2/SubPointSolutions.Docs/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.16284.1257")]
+[assembly: AssemblyFileVersion("1.0.16298.0736")]