Skip to content

Commit

Permalink
Merge pull request #1163 from ruandersMSFT/master-1162
Browse files Browse the repository at this point in the history
Update SPExcelServiceApp Documentation and exception
  • Loading branch information
ykuijs authored Feb 18, 2020
2 parents 5465929 + 292c07d commit 20f3e6c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated PULL_REQUEST_TEMPLATE.md to match DSC standard
- SPAzureAccessControlServiceAppProxy
- Added new resource to create Azure Access Control Service Application Proxy
- SPExcelServiceApp
- Documentation update for SharePoint 2016/2019 deprecation.
- SPInstallPrereqs
- Documentation update for SharePoint 2019 offline install parameters.
- SPFarm
- Added possibility to set application credential key.
- SPOAppPrincipalMgmtServiceAppProxy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ function Set-TargetResource
if ((Get-SPDscInstalledProductVersion).FileMajorPart -ne 15)
{
throw [Exception] ("Only SharePoint 2013 is supported to deploy Excel Services " + `
"service applications via DSC, as SharePoint 2016 and SharePoint 2019 are deprecated " + `
"service applications via DSC, as SharePoint 2016 and SharePoint 2019 have deprecated " + `
"this service. See " + `
"https://technet.microsoft.com/en-us/library/mt346112(v=office.16).aspx " + `
"for more info.")
Expand Down Expand Up @@ -577,7 +577,7 @@ function Test-TargetResource
if ((Get-SPDscInstalledProductVersion).FileMajorPart -ne 15)
{
throw [Exception] ("Only SharePoint 2013 is supported to deploy Excel Services " + `
"service applications via DSC, as SharePoint 2016 and SharePoint 2019 are deprecated " + `
"service applications via DSC, as SharePoint 2016 and SharePoint 2019 have deprecated " + `
"this service. See " + `
"https://technet.microsoft.com/en-us/library/mt346112(v=office.16).aspx " + `
"for more info.")
Expand Down
5 changes: 5 additions & 0 deletions SharePointDsc/DSCResources/MSFT_SPExcelServiceApp/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@ Excel Services Service Application.

The default value for the Ensure parameter is Present. When not specifying this
parameter, the service application is provisioned.

Only SharePoint 2013 is supported to deploy Excel Services service applications via DSC,
as SharePoint 2016 and SharePoint 2019 have deprecated this service. See
[What's deprecated or removed from SharePoint Server 2016](https://technet.microsoft.com/en-us/library/mt346112(v=office.16).aspx)
for more info.
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ class MSFT_SPInstallPrereqs : OMI_BaseResource
[Required, Description("The full path to prerequisiteinstaller.exe")] String InstallerPath;
[Required, Description("Should the installer download prerequisites from the internet or not")] Boolean OnlineMode;
[Write, Description("The path to the Windows Server Operating System SXS source files, for use in closed environments without access to Windows Update")] String SXSpath;
[Write, Description("The path to the installer for this prerequisite (SP2013 and SP2016)")] String SQLNCli;
[Write, Description("The path to the installer for this prerequisite (SP2013, SP2016 and SP2019)")] String SQLNCli;
[Write, Description("The path to the installer for this prerequisite (SP2013 only)")] String PowerShell;
[Write, Description("The path to the installer for this prerequisite (SP2013 only)")] String NETFX;
[Write, Description("The path to the installer for this prerequisite (SP2013 only)")] String IDFX;
[Write, Description("The path to the installer for this prerequisite (SP2013 and SP2016)")] String Sync;
[Write, Description("The path to the installer for this prerequisite (SP2013 and SP2016)")] String AppFabric;
[Write, Description("The path to the installer for this prerequisite (SP2013 and SP2016)")] String IDFX11;
[Write, Description("The path to the installer for this prerequisite (SP2013 and SP2016)")] String MSIPCClient;
[Write, Description("The path to the installer for this prerequisite (SP2013, SP2016 and SP2019)")] String Sync;
[Write, Description("The path to the installer for this prerequisite (SP2013, SP2016 and SP2019)")] String AppFabric;
[Write, Description("The path to the installer for this prerequisite (SP2013, SP2016 and SP2019)")] String IDFX11;
[Write, Description("The path to the installer for this prerequisite (SP2013, SP2016 and SP2019)")] String MSIPCClient;
[Write, Description("The path to the installer for this prerequisite (SP2013 only)")] String WCFDataServices;
[Write, Description("The path to the installer for this prerequisite (SP2013 only)")] String KB2671763;
[Write, Description("The path to the installer for this prerequisite (SP2013 and SP2016)")] String WCFDataServices56;
[Write, Description("The path to the installer for this prerequisite (SP2016 only)")] String MSVCRT11;
[Write, Description("The path to the installer for this prerequisite (SP2013, SP2016 and SP2019)")] String WCFDataServices56;
[Write, Description("The path to the installer for this prerequisite (SP2016 and SP2019)")] String MSVCRT11;
[Write, Description("The path to the installer for this prerequisite (SP2016 only)")] String MSVCRT14;
[Write, Description("The path to the installer for this prerequisite (SP2016 only)")] String KB3092423;
[Write, Description("The path to the installer for this prerequisite (SP2016 and SP2019)")] String KB3092423;
[Write, Description("The path to the installer for this prerequisite (SP2016 only)")] String ODBC;
[Write, Description("The path to the installer for this prerequisite (SP2016 only)")] String DotNetFx;
[Write, Description("The path to the installer for this prerequisite (SP2019 only)")] String DotNet472;
Expand Down

0 comments on commit 20f3e6c

Please sign in to comment.