SSOM regression pass, .NET35 compatibility, 1.2.35-beta1 release

SubPointSolutions · Oct 28, 2015 · b0defc9 · b0defc9
1 parent d41856b
commit b0defc9
Show file tree

Hide file tree

Showing 26 changed files with 36 additions and 31 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -231,17 +231,17 @@
     <Compile Include="ModelHandlers\Taxonomy\TaxonomyGroupModelHandler.cs" />
     <Compile Include="ModelHandlers\WebNavigationSettingsModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\CategoryWebPartModelHandler.cs" />
-    <Compile Include="ModelHandlers\Webparts\CommunityAdminWebPartModelHandler.cs" />
-    <Compile Include="ModelHandlers\Webparts\CommunityJoinWebPartModelHandler.cs" />
+    <Compile Include="ModelHandlers\Webparts\CommunityAdminWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
+    <Compile Include="ModelHandlers\Webparts\CommunityJoinWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\ContentBySearchWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\DocumentSetContentsWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\DocumentSetPropertiesWebPartModelHandler.cs" />
-    <Compile Include="ModelHandlers\Webparts\MyMembershipWebPartModelHandler.cs" />
+    <Compile Include="ModelHandlers\Webparts\MyMembershipWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\RefinementScriptWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\ResultScriptWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\RSSAggregatorWebPartModelHandler.cs" />
-    <Compile Include="ModelHandlers\Webparts\SearchBoxScriptWebPartModelHandler.cs" />
-    <Compile Include="ModelHandlers\Webparts\SearchNavigationWebPartModelHandler.cs" />
+    <Compile Include="ModelHandlers\Webparts\SearchBoxScriptWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
+    <Compile Include="ModelHandlers\Webparts\SearchNavigationWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\SiteDocumentsModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\SocialCommentWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\SummaryLinkWebPartModelHandler.cs" />

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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git a/SPMeta2/SPMeta2.SSOM/SPMeta2.SSOM.csproj b/SPMeta2/SPMeta2.SSOM/SPMeta2.SSOM.csproj
@@ -282,19 +282,19 @@
     <Compile Include="ModelHandlers\WebModelHandler.cs" />
     <Compile Include="ModelHandlers\WebPartPageModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\BlogAdminWebPartModelHandler.cs" />
-    <Compile Include="ModelHandlers\Webparts\BlogLinksWebPartModelHandler.cs" />
+    <Compile Include="ModelHandlers\Webparts\BlogLinksWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\BlogMonthQuickLaunchModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\ClientWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\DataFormWebPartModelHandler.cs" />
-    <Compile Include="ModelHandlers\Webparts\GettingStartedWebPartModelHandler.cs" />
+    <Compile Include="ModelHandlers\Webparts\GettingStartedWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\ImageWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\ListViewWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\MembersWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\PageViewerWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\PictureLibrarySlideshowWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\SilverlightWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\SimpleFormWebPartModelHandler.cs" />
-    <Compile Include="ModelHandlers\Webparts\SPTimelineWebPartModelHandler.cs" />
+    <Compile Include="ModelHandlers\Webparts\SPTimelineWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\UserCodePartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\UserDocsWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\UserTasksWebPartModelHandler.cs" />

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.15294.1219")]
+[assembly: AssemblyFileVersion("1.2.15301.0536")]
diff --git 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
@@ -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
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 
 namespace SPMeta2.Services
 {