SPMeta2 1.1.95-beta1 release

SubPointSolutions · Jun 8, 2015 · 51a5d96 · 51a5d96
1 parent a19c5f5
commit 51a5d96
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/SPMeta2.v12.suo b/SPMeta2.v12.suo
diff --git a/SPMeta2/SPMeta2.CSOM/ModelHandlers/MasterPagePreviewModelHandler.cs b/SPMeta2/SPMeta2.CSOM/ModelHandlers/MasterPagePreviewModelHandler.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using Microsoft.SharePoint.Client;
 using SPMeta2.CSOM.ModelHandlers.Base;
 using SPMeta2.Definitions;

diff --git a/SPMeta2/SPMeta2.CSOM/ModelHandlers/Webparts/SilverlightWebPartModelHandler.cs b/SPMeta2/SPMeta2.CSOM/ModelHandlers/Webparts/SilverlightWebPartModelHandler.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using SPMeta2.CSOM.ModelHosts;
 using SPMeta2.Definitions.Base;
 using SPMeta2.Definitions.Webparts;

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/ManagedPropertyModelHandler.cs b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/ManagedPropertyModelHandler.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using Microsoft.Office.Server.Search.Administration;
 using Microsoft.Office.Server.Search.Query;
 using Microsoft.SharePoint;

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Webparts/RefinementScriptWebPartModelHandler.cs b/SPMeta2/SPMeta2.SSOM.Standard/ModelHandlers/Webparts/RefinementScriptWebPartModelHandler.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 using System.Web.UI.WebControls.WebParts;
 using Microsoft.Office.Server.Search.WebControls;
 using SPMeta2.Definitions;

diff --git a/SPMeta2/SPMeta2.SSOM.Standard/SPMeta2.SSOM.Standard.csproj b/SPMeta2/SPMeta2.SSOM.Standard/SPMeta2.SSOM.Standard.csproj
@@ -184,7 +184,7 @@
     <Compile Include="ModelHandlers\Fields\HTMLFieldModelHandler.cs" />
     <Compile Include="ModelHandlers\Fields\ImageFieldModelHandler.cs" />
     <Compile Include="ModelHandlers\Fields\LinkFieldModelHandler.cs" />
-    <Compile Include="ModelHandlers\ManagedPropertyModelHandler.cs" />
+    <Compile Include="ModelHandlers\ManagedPropertyModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\ReusableTextItemModelHandler.cs" />
     <Compile Include="ModelHandlers\ReusableHTMLItemModelHandler.cs" />
     <Compile Include="ModelHandlers\SearchSettingsModelHandler.cs" />
@@ -204,7 +204,7 @@
     <Compile Include="ModelHandlers\Taxonomy\TaxonomyGroupModelHandler.cs" />
     <Compile Include="ModelHandlers\WebNavigationSettingsModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\Webparts\ContentBySearchWebPartModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
-    <Compile Include="ModelHandlers\Webparts\RefinementScriptWebPartModelHandler.cs" />
+    <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\SummaryLinkWebPartModelHandler.cs" />
     <Compile Include="ModelHandlers\Webparts\ContactFieldControlModelHandler.cs" />

diff --git a/SPMeta2/SPMeta2.SSOM/SPMeta2.SSOM.csproj b/SPMeta2/SPMeta2.SSOM/SPMeta2.SSOM.csproj
@@ -173,7 +173,7 @@
     <Compile Include="Extensions\WebPartExtensions.cs" />
     <Compile Include="ModelHandlers\AuditSettingsModelHandler.cs" />
     <Compile Include="ModelHandlers\Base\ContentFileModelHandlerBase.cs" />
-    <Compile Include="ModelHandlers\ComposedLookItemLinkModelHandler.cs" />
+    <Compile Include="ModelHandlers\ComposedLookItemLinkModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\DeleteWebPartsModelHandler.cs" />
     <Compile Include="ModelHandlers\DocumentParserModelHandler.cs" />
     <Compile Include="ModelHandlers\AlternateUrlModelHandler.cs" />
@@ -213,7 +213,7 @@
     <Compile Include="ModelHandlers\MasterPagePreviewModelHandler.cs" />
     <Compile Include="ModelHandlers\MasterPageModelHandler.cs" />
     <Compile Include="ModelHandlers\ResetRoleInheritanceModelHandler.cs" />
-    <Compile Include="ModelHandlers\ComposedLookItemModelHandler.cs" />
+    <Compile Include="ModelHandlers\ComposedLookItemModelHandler.cs" Condition="'$(spRuntime)'=='15' Or '$(Configuration)'=='Debug'" />
     <Compile Include="ModelHandlers\TreeViewSettingsModelHandler.cs" />
     <Compile Include="ModelHandlers\ManagedAccountModelHandler.cs" />
     <Compile Include="ModelHandlers\MasterPageSettingsModelHandler.cs" />

diff --git a/SPMeta2/SPMeta2.Standard/Definitions/ManagedPropertyDefinition.cs b/SPMeta2/SPMeta2.Standard/Definitions/ManagedPropertyDefinition.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;

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

diff --git a/SPMeta2/SPMeta2/Definitions/ComposedLookItemLinkDefinition.cs b/SPMeta2/SPMeta2/Definitions/ComposedLookItemLinkDefinition.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;

diff --git a/SPMeta2/SPMeta2/Definitions/Webparts/SilverlightWebPartDefinition.cs b/SPMeta2/SPMeta2/Definitions/Webparts/SilverlightWebPartDefinition.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.Regression;
 using SPMeta2.Utils;

diff --git a/SPMeta2/SPMeta2/Enumerations/BuiltInComposedLookItemNames.cs b/SPMeta2/SPMeta2/Enumerations/BuiltInComposedLookItemNames.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/Utils/CamlQueryUtils.cs b/SPMeta2/SPMeta2/Utils/CamlQueryUtils.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 
 namespace SPMeta2.Utils
 {

diff --git a/SPMeta2/SPMeta2/Utils/WebpartXmlExtensions.cs b/SPMeta2/SPMeta2/Utils/WebpartXmlExtensions.cs
@@ -788,7 +788,7 @@ public static TDefinition LoadDefinitionFromWebpartFile<TDefinition>(string webp
 
                     var defPropValue = genericMethod.Invoke(null, new object[] { xmlPropValue, CultureInfo.CurrentCulture });
 
-                    defProp.SetValue(def, defPropValue);
+                    defProp.SetValue(def, defPropValue, null);
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up @@
                         var defPropValue = genericMethod.Invoke(null, new object[] { xmlPropValue, CultureInfo.CurrentCulture });
-                        defProp.SetValue(def, defPropValue);
+                        defProp.SetValue(def, defPropValue, null);
                     }
                 }
@@ Expand Down @@