SP2016 changes.

glapointe · Jun 17, 2016 · 5abae72 · 5abae72
1 parent 52749ac
commit 5abae72
Show file tree

Hide file tree

Showing 14 changed files with 10,389 additions and 9,611 deletions.
diff --git a/Build-WSPs.ps1 b/Build-WSPs.ps1
@@ -25,12 +25,14 @@ mkdir $outDir -Force | Out-Null
 $projects = @{
 				"$solutionFolder\Lapointe.SharePoint2010.PowerShell\Lapointe.SharePoint2010.PowerShell.csproj" = @("ReleaseMOSS", "ReleaseFoundation")
 				"$solutionFolder\Lapointe.SharePoint2013.PowerShell\Lapointe.SharePoint2013.PowerShell.csproj" = @("ReleaseMOSS", "ReleaseFoundation")
+				"$solutionFolder\Lapointe.SharePoint2016.PowerShell\Lapointe.SharePoint2016.PowerShell.csproj" = @("ReleaseMOSS")
 			}
 foreach ($project in $projects.Keys) {
 	Write-Host "Building $project..." -ForegroundColor Blue
 	foreach ($config in $projects[$project]) {
 		$version = "SP2010"
 		if ($project.Contains("Lapointe.SharePoint2013.PowerShell.csproj")) { $version = "SP2013" }
+		elseif ($project.Contains("Lapointe.SharePoint2016.PowerShell.csproj")) { $version = "SP2016" }
 		Write-Host "Building $config..." -ForegroundColor Blue
 		del "$outDir\$version\$config\*.wsp" -Force -ErrorAction SilentlyContinue
 		&$msbuild $project /v:m /t:Rebuild /t:Package /p:Configuration="$config" /p:OutDir="$outDir\$version\$config"

diff --git a/Lapointe.SharePoint2010.PowerShell/Cmdlets/SiteCollections/SPCmdletRepairSite.cs b/Lapointe.SharePoint2010.PowerShell/Cmdlets/SiteCollections/SPCmdletRepairSite.cs
@@ -21,7 +21,7 @@ namespace Lapointe.SharePoint.PowerShell.Cmdlets.SiteCollections
     [CmdletDescription("Repair a site collection that was created using the export of a web.")]
     [Example(Code = "PS C:\\> Get-SPSite http://portal/sites/newsitecoll | Repair-SPSite -SourceSite \"http://portal/\"",
         Remarks = "This example repairs the site collection located at http://portal/sites/newsitecoll using the site collection http://portal as the model site for the repairs.")]
-#elif SP2013
+#else
     [Cmdlet("Repair", "SPMigratedSite", SupportsShouldProcess = false),
     SPCmdlet(RequireLocalFarmExist = true, RequireUserMachineAdmin = false, RequireUserFarmAdmin = true)]
     [CmdletDescription("Repair a site collection that was created using the export of a web. This cmdlet is the equivalent to the SharePoint 2010 Repair-SPSite cmdlet - it was renamed because SharePoint 2013 introduced a Repair-SPSite cmdlet which does different things.")]

diff --git a/Lapointe.SharePoint2010.PowerShell/Cmdlets/WebParts/SPCmdletAddListViewWebPart.cs b/Lapointe.SharePoint2010.PowerShell/Cmdlets/WebParts/SPCmdletAddListViewWebPart.cs
@@ -131,7 +131,7 @@ public class SPCmdletAddListViewWebPart : SPNewCmdletBaseCustom<Microsoft.ShareP
             HelpMessage = "Add some space before the web part.")]
         public SwitchParameter AddSpace { get; set; }
 
-#if SP2013
+#if !SP2010
         [Parameter(
             Position = 12,
             Mandatory = false,

diff --git a/Lapointe.SharePoint2010.PowerShell/Common/ManagedMetadata/ExportTerms.cs b/Lapointe.SharePoint2010.PowerShell/Common/ManagedMetadata/ExportTerms.cs
@@ -149,7 +149,7 @@ private XmlElement AddTermSetElement(XmlElement parent, TermSet termSet)
             element.SetAttribute("IsOpenForTermCreation", termSet.IsOpenForTermCreation.ToString());
             element.SetAttribute("CustomSortOrder", termSet.CustomSortOrder);
 
-#if SP2013
+#if !SP2010
             // Updated provided by John Calvert
             XmlElement propertiesElement = _xml.CreateElement("CustomProperties");
             element.AppendChild(propertiesElement);
@@ -235,7 +235,7 @@ private XmlElement AddTermElement(XmlElement parent, Term term)
                 propertyElement.SetAttribute("Value", term.CustomProperties[key]);
             }
 
-#if SP2013
+#if !SP2010
             // Updated provided by John Calvert
             XmlElement localpropertiesElement = _xml.CreateElement("LocalCustomProperties");
             element.AppendChild(localpropertiesElement);

diff --git a/Lapointe.SharePoint2010.PowerShell/Common/ManagedMetadata/ImportTerms.cs b/Lapointe.SharePoint2010.PowerShell/Common/ManagedMetadata/ImportTerms.cs
@@ -292,7 +292,7 @@ private void Import(XmlElement termSetElement, Group parentGroup)
                 termSet.IsOpenForTermCreation = true;
             }
 
-#if SP2013
+#if !SP2010
             // Updated provided by John Calvert
             XmlNodeList propertyNodes = termSetElement.SelectNodes("./CustomProperties/CustomProperty");
             if (propertyNodes != null && propertyNodes.Count > 0)
@@ -401,7 +401,7 @@ private void Import(XmlElement termElement, TermSetItem parentTermSetItem)
                 }
             }
 
-#if SP2013
+#if !SP2010
             // Updated provided by John Calvert
             XmlNodeList localpropertyNodes = termElement.SelectNodes("./LocalCustomProperties/LocalCustomProperty");
             if (localpropertyNodes != null && localpropertyNodes.Count > 0)

diff --git a/Lapointe.SharePoint2010.PowerShell/Common/WebParts/AddListViewWebPart.cs b/Lapointe.SharePoint2010.PowerShell/Common/WebParts/AddListViewWebPart.cs
@@ -79,7 +79,7 @@ public static Microsoft.SharePoint.WebPartPages.WebPart Add(string pageUrl, stri
                     else
                     {
                         ((XsltListViewWebPart)lvw).ListName = list.ID.ToString("B").ToUpperInvariant();
-#if SP2013
+#if !SP2010
                         if (!string.IsNullOrEmpty(jsLink))
                             ((XsltListViewWebPart)lvw).JSLink = jsLink;
 #endif
@@ -182,7 +182,7 @@ public static Microsoft.SharePoint.WebPartPages.WebPart AddToWikiPage(string pag
                     else
                     {
                         ((XsltListViewWebPart)lvw).ListName = list.ID.ToString("B").ToUpperInvariant();
-#if SP2013
+#if !SP2010
                         if (!string.IsNullOrEmpty(jsLink))
                             ((XsltListViewWebPart)lvw).JSLink = jsLink;
 #endif

diff --git a/Lapointe.SharePoint2010.PowerShell/ReferenceAssemblies/Lapointe.PowerShell.MamlGenerator.dll b/Lapointe.SharePoint2010.PowerShell/ReferenceAssemblies/Lapointe.PowerShell.MamlGenerator.dll
diff --git a/Lapointe.SharePoint2010.PowerShell/StsAdm/ContentDatabases/CreateContentDB.cs b/Lapointe.SharePoint2010.PowerShell/StsAdm/ContentDatabases/CreateContentDB.cs
@@ -99,7 +99,7 @@ public override int Execute(string command, StringDictionary keyValues, out stri
                 // matching search server using the server address property.
 #if SP2010
                 SPSearchService service = SPFarm.Local.Services.GetValue<SPSearchService>("SPSearch");
-#elif SP2013
+#else
                 SPSearchService service = SPFarm.Local.Services.GetValue<SPSearchService>("SPSearch4");
 #endif
                 SPServiceInstance searchServiceServer = null;

diff --git a/Lapointe.SharePoint2010.PowerShell/StsAdm/ContentDatabases/ManageContentDBSettings.cs b/Lapointe.SharePoint2010.PowerShell/StsAdm/ContentDatabases/ManageContentDBSettings.cs
@@ -6,7 +6,7 @@
 using Microsoft.SharePoint.Administration;
 #if SP2010
 using Microsoft.SharePoint.Search.Administration;
-#elif SP2013
+#else
 using Microsoft.SharePoint.Search.Administration;
 #endif
 using Lapointe.SharePoint.PowerShell.StsAdm.SPValidators;
@@ -120,7 +120,7 @@ public override int Execute(string command, StringDictionary keyValues, out stri
                 // matching search server using the server address property.
 #if SP2010
                 SPSearchService service = SPFarm.Local.Services.GetValue<SPSearchService>("SPSearch");
-#elif SP2013
+#else
                 SPSearchService service = SPFarm.Local.Services.GetValue<SPSearchService>("SPSearch4");
 #endif
                 SPServiceInstance searchServiceServer = null;

diff --git a/Lapointe.SharePoint2010.PowerShell/Utilities.cs b/Lapointe.SharePoint2010.PowerShell/Utilities.cs
@@ -56,15 +56,15 @@ public static string GetGenericSetupPath(string subDir)
         {
 #if SP2010
             return GetGenericSetupPath(subDir, 14);
-#elif SP2013
+#else
             return GetGenericSetupPath(subDir, 15);
 #endif
         }
         public static string GetGenericSetupPath(string subDir, int desiredVersion)
         {
 #if SP2010
             return SPUtility.GetGenericSetupPath(subDir);
-#elif SP2013
+#else
             return SPUtility.GetVersionedGenericSetupPath(subDir, desiredVersion);
 #endif
         }