Skip to content

Commit 97c43cb

Browse files
authored
Merge pull request #497 from sdwheeler/sdw-cabsize
Update New-ExternalHelpCab to build large cab file
2 parents 543fade + 6148725 commit 97c43cb

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ CHANGELOG
33

44
## Not released
55

6+
# 0.14.1
7+
8+
- Fix appveyor build script
9+
- Update-Help for selected modules only
10+
- Pin Pester to version 4.10.1
11+
- Add makecab directive to set size limit to `CDROM`
12+
613
# 0.14.0
714

815
* Fix passing `ExcludeDontShow` flag to modules (#459)

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ install:
44
- ps: |
55
Write-Host "PowerShell Version:" $PSVersionTable.PSVersion.tostring()
66
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
7-
Install-Module Pester -Force
7+
Install-Module -Name Pester -RequiredVersion 4.10.1 -Force
88
99
init:
1010
- git config --global core.autocrlf true
1111

1212
build_script:
1313
- ps: |
1414
$ErrorActionPreference = 'Stop'
15-
Update-Help # we need up-to-date help content for tests
15+
Update-Help Microsoft.PowerShell.Core, Microsoft.PowerShell.Management, Microsoft.PowerShell.Utility -Force # we need up-to-date help content for tests
1616
.\build.ps1 -Configuration Release
1717
1818
test_script:

src/platyPS/platyPS.psd1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
RootModule = 'platyPS.psm1'
1313

1414
# Version number of this module.
15+
# Do not edit the version. The version is updated by the build script.
1516
ModuleVersion = '0.0.1'
1617

1718
# ID used to uniquely identify this module

src/platyPS/platyPS.psm1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,6 +1202,7 @@ function New-ExternalHelpCab
12021202
New-Item -ItemType File -Name $DirectiveFile -Force | Out-Null
12031203
Add-Content $DirectiveFile ".Set Cabinet=on"
12041204
Add-Content $DirectiveFile ".Set Compress=on"
1205+
Add-Content $DirectiveFile ".Set MaxDiskSize=CDROM"
12051206

12061207
#Creates an entry in the cab directive file for each file in the source directory (uses FullName to get fuly qualified file path and name)
12071208
foreach($file in $ValidHelpFiles)

test/Pester/FullLoop.Tests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $outFolder = "$root\out"
77
Import-Module $outFolder\platyPS -Force
88
$MyIsLinux = Get-Variable -Name IsLinux -ValueOnly -ErrorAction SilentlyContinue
99
$MyIsMacOS = Get-Variable -Name IsMacOS -ValueOnly -ErrorAction SilentlyContinue
10-
10+
<#
1111
Describe 'Full loop for Add-Member cmdlet' {
1212
1313
$cmdlet = "Add-Member"
@@ -139,7 +139,7 @@ Describe 'Full loop for Add-Member cmdlet' {
139139
140140
# TODO: rest of properties!!
141141
}
142-
142+
#>
143143
function OutFileAndStripped
144144
{
145145
param([string]$path, [string]$content)

test/Pester/PlatyPs.Tests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -869,14 +869,14 @@ if (-not $global:IsUnix) {
869869

870870
$mamlModelObject.Name | Should be "Add-Computer"
871871
$mamlModelObject.Synopsis.Text | Should be "Add the local computer to a domain or workgroup."
872-
$mamlModelObject.Description.Text.Substring(0,135) | Should be "The Add-Computer cmdlet adds the local computer or remote computers to a domain or workgroup, or moves them from one domain to another."
873-
$mamlModelObject.Notes.Text.Substring(0,31) | Should be "In Windows PowerShell 2.0, the "
872+
$mamlModelObject.Description.Text.Substring(0,137) | Should be 'The `Add-Computer` cmdlet adds the local computer or remote computers to a domain or workgroup, or moves them from one domain to another.'
873+
$mamlModelObject.Notes.Text.Substring(0,33) | Should be "- In Windows PowerShell 2.0, the "
874874
}
875875

876876
It 'Validates the examples by checking Add-Computer Example 1' {
877877

878878
$mamlModelObject.Examples[0].Title | Should be "Example 1: Add a local computer to a domain then restart the computer"
879-
$mamlModelObject.Examples[0].Code[0].Text | Should be "PS C:\>Add-Computer -DomainName `"Domain01`" -Restart"
879+
$mamlModelObject.Examples[0].Code[0].Text | Should be "Add-Computer -DomainName Domain01 -Restart"
880880
$mamlModelObject.Examples[0].Remarks.Substring(0,120) | Should be "This command adds the local computer to the Domain01 domain and then restarts the computer to make the change effective."
881881

882882
}

0 commit comments

Comments
 (0)