diff --git a/SPMeta2.sln b/SPMeta2.sln
index a8b447076..0c1d5cc62 100644
--- a/SPMeta2.sln
+++ b/SPMeta2.sln
@@ -106,6 +106,11 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2F17C825-5DA2-4F80-93CD-0C2A0F084F6F}"
EndProject
Global
+ GlobalSection(AutomaticVersions) = postSolution
+ UpdateAssemblyVersion = False
+ UpdateAssemblyFileVersion = False
+ UpdateAssemblyInfoVersion = False
+ EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CI-CSOM2013|Any CPU = CI-CSOM2013|Any CPU
CI-O365|Any CPU = CI-O365|Any CPU
diff --git a/SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.CSOM.Standard/Properties/AssemblyInfo.cs
index cdb1ef96a..43f7b8195 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.CSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.CSOM/Properties/AssemblyInfo.cs
index d8f9a51fb..5b13fa2bc 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Containers.CSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.CSOM/Properties/AssemblyInfo.cs
index 00befa059..17e510e61 100644
--- 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.15294.1230")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Containers.O365/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.O365/Properties/AssemblyInfo.cs
index 400c14364..012ec93e4 100644
--- 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.15294.1230")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Containers.O365v16/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.O365v16/Properties/AssemblyInfo.cs
index 8da001bf8..e2ae82271 100644
--- 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.15294.1230")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Containers.SSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.SSOM/Properties/AssemblyInfo.cs
index e6c9ef843..1048a4ade 100644
--- 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.15294.1230")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Containers.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers.Standard/Properties/AssemblyInfo.cs
index b36caa75f..817c790f9 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Containers/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Containers/Properties/AssemblyInfo.cs
index 16b4058a9..e3b7a17c3 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.O365/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.O365/Properties/AssemblyInfo.cs
index e0b90a92c..0e6bd0a77 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Regression.CSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.CSOM.Standard/Properties/AssemblyInfo.cs
index 2ff342a3e..478fbc81d 100644
--- 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.15294.1230")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Regression.CSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.CSOM/Properties/AssemblyInfo.cs
index b10db8cbf..1bca4b030 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Regression.Impl.Tests/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.Impl.Tests/Properties/AssemblyInfo.cs
index 13b2bd154..bfbe3f745 100644
--- 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.15294.1230")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Regression.SSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.SSOM.Standard/Properties/AssemblyInfo.cs
index 3705a7b8c..9519f4fd7 100644
--- 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.15294.1230")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Regression.SSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.SSOM/Properties/AssemblyInfo.cs
index fec4508fd..0629d781f 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Regression.Tests/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression.Tests/Properties/AssemblyInfo.cs
index 4a69993ba..507f283e4 100644
--- 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.15294.1230")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.Regression/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Regression/Properties/AssemblyInfo.cs
index 223b5a8e3..4383b6c3f 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.0.15301.0536")]
diff --git a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Taxonomy/TaxonomyTermModelHandler.cs b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Taxonomy/TaxonomyTermModelHandler.cs
index a34bfe36f..acb38c7d5 100644
--- a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Taxonomy/TaxonomyTermModelHandler.cs
+++ b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Taxonomy/TaxonomyTermModelHandler.cs
@@ -40,7 +40,7 @@ public override void DeployModel(object modelHost, DefinitionBase model)
throw new SPMeta2Exception(
string.Format("Term name [{0}] cannot contain any of the following characters: {1}",
definition.Name,
- string.Join(", ", TaxonomyUtility.InvalidTermNameStrings)));
+ string.Join(", ", TaxonomyUtility.InvalidTermNameStrings.ToArray())));
}
if (modelHost is TermModelHost)
diff --git a/SPMeta2/SPMeta2.SSOM.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.SSOM.Standard/Properties/AssemblyInfo.cs
index 073ed40f7..95d5c1eb0 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.SSOM.Standard/SPMeta2.SSOM.Standard.csproj b/SPMeta2/SPMeta2.SSOM.Standard/SPMeta2.SSOM.Standard.csproj
index 9f13763e9..f1f55eb4c 100644
--- a/SPMeta2/SPMeta2.SSOM.Standard/SPMeta2.SSOM.Standard.csproj
+++ b/SPMeta2/SPMeta2.SSOM.Standard/SPMeta2.SSOM.Standard.csproj
@@ -231,17 +231,17 @@
-
-
+
+
-
+
-
-
+
+
diff --git a/SPMeta2/SPMeta2.SSOM/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.SSOM/Properties/AssemblyInfo.cs
index c4ead7b8d..fd9dc6826 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.SSOM/SPMeta2.SSOM.csproj b/SPMeta2/SPMeta2.SSOM/SPMeta2.SSOM.csproj
index f84b3ce8e..6f55fe2d0 100644
--- a/SPMeta2/SPMeta2.SSOM/SPMeta2.SSOM.csproj
+++ b/SPMeta2/SPMeta2.SSOM/SPMeta2.SSOM.csproj
@@ -282,11 +282,11 @@
-
+
-
+
@@ -294,7 +294,7 @@
-
+
diff --git a/SPMeta2/SPMeta2.Standard/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2.Standard/Properties/AssemblyInfo.cs
index 8f8841782..291a33a22 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2/Attributes/Regression/IsolationAttribute.cs b/SPMeta2/SPMeta2/Attributes/Regression/IsolationAttribute.cs
index e6cd686bb..66e3a3402 100644
--- a/SPMeta2/SPMeta2/Attributes/Regression/IsolationAttribute.cs
+++ b/SPMeta2/SPMeta2/Attributes/Regression/IsolationAttribute.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using System.Threading.Tasks;
+
namespace SPMeta2.Attributes.Regression
{
diff --git a/SPMeta2/SPMeta2/Properties/AssemblyInfo.cs b/SPMeta2/SPMeta2/Properties/AssemblyInfo.cs
index 6fec95729..bc9ea7898 100644
--- 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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2/Services/ListViewScopeTypesConvertService.cs b/SPMeta2/SPMeta2/Services/ListViewScopeTypesConvertService.cs
index 3f430b4ca..b7833c9ca 100644
--- a/SPMeta2/SPMeta2/Services/ListViewScopeTypesConvertService.cs
+++ b/SPMeta2/SPMeta2/Services/ListViewScopeTypesConvertService.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using System.Threading.Tasks;
+
namespace SPMeta2.Services
{