Merge pull request #989 from PowerShell/release-3.1

Release v3.1
dsccommunity · Nov 28, 2018 · af5f29b · af5f29b
2 parents 63efb9c + 49ed159
commit af5f29b
Show file tree

Hide file tree

Showing 33 changed files with 1,241 additions and 442 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,41 @@
 # Change log for SharePointDsc
 
+## v3.1
+
+* Changes to SharePointDsc
+  * Updated LICENSE file to match the Microsoft Open Source Team standard.
+* ProjectServerConnector
+  * Added a file hash validation check to prevent the ability to load custom code
+    into the module.
+* SPFarm
+  * Fixed localization issue where TypeName was in the local language.
+* SPInstallPrereqs
+  * Updated links in the Readme.md file to docs.microsoft.com.
+  * Fixed required prereqs for SharePoint 2019, added MSVCRT11.
+* SPManagedMetadataServiceApp
+  * Fixed issue where Get-TargetResource method throws an error when the
+    service app proxy does not exist.
+* SPSearchContentSource
+  * Corrected issue where the New-SPEnterpriseSearchCrawlContentSource cmdlet
+    was called twice.
+* SPSearchServiceApp
+  * Fixed issue where Get-TargetResource method throws an error when the
+    service application pool does not exist.
+  * Implemented check to make sure cmdlets are only executed when it actually
+    has something to update.
+  * Deprecated WindowsServiceAccount parameter and moved functionality to
+    new resource (SPSearchServiceSettings).
+* SPSearchServiceSettings
+  * Added new resource to configure search service settings.
+* SPServiceAppSecurity
+  * Fixed unavailable utility method (ExpandAccessLevel).
+  * Updated the schema to no longer specify username as key for the sub class.
+* SPUserProfileServiceApp
+  * Fixed issue where localized versions of Windows and SharePoint would throw
+    an error.
+* SPUserProfileSyncConnection
+  * Corrected implementation of Ensure parameter.
+
 ## v3.0
 
 * Changes to SharePointDsc

diff --git a/LICENSE b/LICENSE
@@ -1,22 +1,21 @@
-The MIT License (MIT)
+    MIT License
 
-Copyright (c) 2015 Microsoft
+    Copyright (c) Microsoft Corporation. All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
 
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE
diff --git a/Modules/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 b/Modules/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1
@@ -174,10 +174,16 @@ function Get-TargetResource
                                 }
 
             $centralAdminProvisioned = $false
-            $ca = Get-SPServiceInstance -Server $env:ComputerName `
-                  | Where-Object -Filterscript {
-                        $_.TypeName -eq "Central Administration" -and $_.Status -eq "Online"
-                    }
+            $ca = Get-SPServiceInstance -Server $env:ComputerName
+            if ($null -ne $ca)
+            {
+                $ca = $ca | Where-Object -Filterscript {
+                          $_.GetType().Name -eq "SPWebServiceInstance" -and `
+                          $_.Name -eq "WSS_Administration" -and `
+                          $_.Status -eq "Online"
+                      }
+            }
+
             if ($null -ne $ca)
             {
                 $centralAdminProvisioned = $true
@@ -376,19 +382,22 @@ function Set-TargetResource
                 # Provision central administration
                 if ($params.RunCentralAdmin -eq $true)
                 {
-                    $serviceInstance = Get-SPServiceInstance -Server $env:COMPUTERNAME `
-                                            | Where-Object -FilterScript {
-                                                $_.TypeName -eq "Central Administration"
-                                            }
+                    $serviceInstance = Get-SPServiceInstance -Server $env:COMPUTERNAME
                     if ($null -eq $serviceInstance)
                     {
                         $domain = (Get-CimInstance -ClassName Win32_ComputerSystem).Domain
                         $fqdn = "$($env:COMPUTERNAME).$domain"
                         $serviceInstance = Get-SPServiceInstance -Server $fqdn `
-                                            | Where-Object -FilterScript {
-                                                $_.TypeName -eq "Central Administration"
-                                            }
                     }
+
+                    if ($null -ne $serviceInstance)
+                    {
+                        $serviceInstance = $serviceInstance | Where-Object -FilterScript {
+                                               $_.GetType().Name -eq "SPWebServiceInstance" -and `
+                                               $_.Name -eq "WSS_Administration"
+                                           }
+                    }
+
                     if ($null -eq $serviceInstance)
                     {
                         throw [Exception] "Unable to locate Central Admin service instance on this server"
@@ -398,19 +407,22 @@ function Set-TargetResource
                 else
                 {
                     # Unprovision central administration
-                    $serviceInstance = Get-SPServiceInstance -Server $env:COMPUTERNAME `
-                                                | Where-Object -FilterScript {
-                                                    $_.TypeName -eq "Central Administration"
-                                                }
+                    $serviceInstance = Get-SPServiceInstance -Server $env:COMPUTERNAME
                     if ($null -eq $serviceInstance)
                     {
                         $domain = (Get-CimInstance -ClassName Win32_ComputerSystem).Domain
                         $fqdn = "$($env:COMPUTERNAME).$domain"
-                        $serviceInstance = Get-SPServiceInstance -Server $fqdn `
-                                            | Where-Object -FilterScript {
-                                                $_.TypeName -eq "Central Administration"
-                                            }
+                        $serviceInstance = Get-SPServiceInstance -Server $fqdn
                     }
+
+                    if ($null -ne $serviceInstance)
+                    {
+                        $serviceInstance = $serviceInstance | Where-Object -FilterScript {
+                                               $_.GetType().Name -eq "SPWebServiceInstance" -and `
+                                               $_.Name -eq "WSS_Administration"
+                                           }
+                    }
+
                     if ($null -eq $serviceInstance)
                     {
                         throw "Unable to locate Central Admin service instance on this server"
@@ -644,19 +656,22 @@ function Set-TargetResource
                 }
                 else
                 {
-                    $serviceInstance = Get-SPServiceInstance -Server $env:COMPUTERNAME `
-                                            | Where-Object -FilterScript {
-                                                $_.TypeName -eq "Central Administration"
-                                            }
+                    $serviceInstance = Get-SPServiceInstance -Server $env:COMPUTERNAME
                     if ($null -eq $serviceInstance)
                     {
                         $domain = (Get-CimInstance -ClassName Win32_ComputerSystem).Domain
                         $fqdn = "$($env:COMPUTERNAME).$domain"
-                        $serviceInstance = Get-SPServiceInstance -Server $fqdn `
-                                            | Where-Object -FilterScript {
-                                                $_.TypeName -eq "Central Administration"
-                                            }
+                        $serviceInstance = Get-SPServiceInstance -Server $fqdn
                     }
+
+                    if ($null -ne $serviceInstance)
+                    {
+                        $serviceInstance = $serviceInstance | Where-Object -FilterScript {
+                            $_.GetType().Name -eq "SPWebServiceInstance" -and `
+                            $_.Name -eq "WSS_Administration"
+                        }
+                    }
+
                     if ($null -eq $serviceInstance)
                     {
                         throw [Exception] "Unable to locate Central Admin service instance on this server"

diff --git a/Modules/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1 b/Modules/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1
@@ -608,7 +608,7 @@ function Set-TargetResource
         {
             Write-Verbose -Message "Version: SharePoint 2019"
             $requiredParams = @("SQLNCli","Sync","AppFabric","IDFX11","MSIPCClient","KB3092423",
-            "WCFDataServices56","DotNet472","MSVCRT141")
+            "WCFDataServices56","DotNet472","MSVCRT11","MSVCRT141")
 
             if ($osVersion.Major -eq 11)
             {

diff --git a/Modules/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/Readme.md b/Modules/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/Readme.md
@@ -42,9 +42,10 @@ then execute the installation from there.
 The SharePoint prerequisites can be downloaded from the following locations:
 
 SharePoint 2013:
-https://technet.microsoft.com/library/a88d3f72-7ac3-4f08-b302-c4ca0a796268%28v=office.16%29.aspx?#section5
+https://docs.microsoft.com/en-us/SharePoint/install/hardware-and-software-requirements-0#section5
 
 SharePoint 2016:
-https://technet.microsoft.com/en-us/library/cc262485(v=office.16).aspx#section5
+https://docs.microsoft.com/en-us/SharePoint/install/hardware-and-software-requirements#section5
 
 SharePoint 2019:
+https://docs.microsoft.com/en-us/sharepoint/install/hardware-and-software-requirements-2019#links-to-applicable-software
diff --git a/...ntDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1 b/...ntDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1
@@ -104,7 +104,8 @@ function Get-TargetResource
                 }
             }
 
-            $proxy = Get-SPMetadataServiceApplicationProxy -Identity $proxyName
+            $proxy = Get-SPMetadataServiceApplicationProxy -Identity $proxyName `
+                                                           -ErrorAction SilentlyContinue
             if ($null -ne $proxy)
             {
                 $contentTypePushDownEnabled = $proxy.Properties["IsContentTypePushdownEnabled"]

diff --git a/...les/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 b/...les/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1
@@ -427,12 +427,6 @@ function Set-TargetResource
                                     -LOBSystemSet $params.LOBSystemSet
                 }
 
-                $source = New-SPEnterpriseSearchCrawlContentSource `
-                                -SearchApplication $params.ServiceAppName `
-                                -Type $newType `
-                                -Name $params.Name `
-                                -StartAddresses $startAddresses
-
                 if ($null -eq $source)
                 {
                     throw ("An error occurred during creation of the Content Source, " + `