Skip to content

Commit 5410bde

Browse files
johljujohlju
authored
Fix build in AppVeyor (#441)
1 parent 5965697 commit 5410bde

File tree

10 files changed

+30
-28
lines changed

10 files changed

+30
-28
lines changed

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3737
- `SmbServerConfiguration` remove errant argument
3838
- Update all calls to edit the registry so that the value Type is explicitly set.
3939
Fixes [Issue #433](https://github.com/dsccommunity/ComputerManagementDsc/issues/433).
40+
- Made AppVeyor use ModuleFast to resolve dependencies.
4041

4142
### Changed
4243

@@ -49,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4950
- Updated integration tests to ensure resource and configuration names are matching.
5051
- Converted tests to Pester 5
5152
- Rename Delete-ADSIObject to Delete-ADSIObject to satisfy HQRM
53+
- No longer uses alias `New-InvalidArgumentException` but instead `New-ArgumentException`
5254

5355
### Removed
5456

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ build_script:
5050
$env:ModuleVersion = $gitVersionObject.NuGetVersionV2
5151
5252
# Build the module
53-
./build.ps1 -ResolveDependency -tasks build
53+
./build.ps1 -ResolveDependency -tasks build -UseModuleFast
5454
5555
# DEBUG: If running on own AppVeyor project, comment the if-block below to run on all branches.
5656
test_script:

‎source/Classes/020.PSResourceRepository.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class PSResourceRepository : ResourceBase
193193
{
194194
$errorMessage = $this.LocalizedData.SourceLocationRequiredForRegistration
195195

196-
New-InvalidArgumentException -ArgumentName 'SourceLocation' -Message $errorMessage
196+
New-ArgumentException -ArgumentName 'SourceLocation' -Message $errorMessage
197197
}
198198

199199
if ($params.Keys -notcontains 'SourceLocation')
@@ -277,7 +277,7 @@ class PSResourceRepository : ResourceBase
277277
{
278278
$errorMessage = $this.localizedData.NoDefaultSettingsPSGallery
279279

280-
New-InvalidArgumentException -ArgumentName 'Default' -Message $errorMessage
280+
New-ArgumentException -ArgumentName 'Default' -Message $errorMessage
281281
}
282282
}
283283
else
@@ -286,15 +286,15 @@ class PSResourceRepository : ResourceBase
286286
{
287287
$errorMessage = $this.localizedData.DefaultSettingsNoPSGallery
288288

289-
New-InvalidArgumentException -ArgumentName 'Default' -Message $errorMessage
289+
New-ArgumentException -ArgumentName 'Default' -Message $errorMessage
290290
}
291291
}
292292

293293
if ($this.ProxyCredential -and (-not $this.Proxy))
294294
{
295295
$errorMessage = $this.localizedData.ProxyCredentialPassedWithoutProxyUri
296296

297-
New-InvalidArgumentException -ArgumentName 'ProxyCredential' -Message $errorMessage
297+
New-ArgumentException -ArgumentName 'ProxyCredential' -Message $errorMessage
298298
}
299299
}
300300
}

‎source/DSCResources/DSC_Computer/DSC_Computer.psm1

+4-4
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ function Set-TargetResource
378378
{
379379
if ($DomainName)
380380
{
381-
New-InvalidArgumentException `
381+
New-ArgumentException `
382382
-Message ($script:localizedData.CredentialsNotSpecifiedError) `
383383
-ArgumentName 'Credentials'
384384
}
@@ -528,7 +528,7 @@ function Test-TargetResource
528528
{
529529
if (-not ($Credential))
530530
{
531-
New-InvalidArgumentException `
531+
New-ArgumentException `
532532
-Message ($script:localizedData.CredentialsNotSpecifiedError) `
533533
-ArgumentName 'Credentials'
534534
}
@@ -861,7 +861,7 @@ function Assert-ResourceProperty
861861
if ($options -contains 'PasswordPass' -and
862862
$options -notcontains 'UnsecuredJoin')
863863
{
864-
New-InvalidArgumentException `
864+
New-ArgumentException `
865865
-Message $script:localizedData.InvalidOptionPasswordPassUnsecuredJoin `
866866
-ArgumentName 'PasswordPass'
867867
}
@@ -871,7 +871,7 @@ function Assert-ResourceProperty
871871
-not [System.String]::IsNullOrEmpty($Credential.UserName))
872872
{
873873

874-
New-InvalidArgumentException `
874+
New-ArgumentException `
875875
-Message $script:localizedData.InvalidOptionCredentialUnsecuredJoinNullUsername `
876876
-ArgumentName 'Credential'
877877
}

‎source/DSCResources/DSC_OfflineDomainJoin/DSC_OfflineDomainJoin.psm1

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function Set-TargetResource
9494
# Check the ODJ Request file exists
9595
if (-not (Test-Path -Path $RequestFile))
9696
{
97-
New-InvalidArgumentException `
97+
New-ArgumentException `
9898
-Message ($script:localizedData.RequestFileNotFoundError -f $RequestFile) `
9999
-ArgumentName 'RequestFile'
100100
} # if
@@ -144,7 +144,7 @@ function Test-TargetResource
144144
# Check the ODJ Request file exists
145145
if (-not (Test-Path -Path $RequestFile))
146146
{
147-
New-InvalidArgumentException `
147+
New-ArgumentException `
148148
-Message ($script:localizedData.RequestFileNotFoundError -f $RequestFile) `
149149
-ArgumentName 'RequestFile'
150150
} # if

‎source/DSCResources/DSC_ScheduledTask/DSC_ScheduledTask.psm1

+9-9
Original file line numberDiff line numberDiff line change
@@ -520,28 +520,28 @@ function Set-TargetResource
520520

521521
if ($RepetitionDuration -lt $RepeatInterval)
522522
{
523-
New-InvalidArgumentException `
523+
New-ArgumentException `
524524
-Message ($script:localizedData.RepetitionDurationLessThanIntervalError -f $RepetitionDuration, $RepeatInterval) `
525525
-ArgumentName RepeatInterval
526526
}
527527

528528
if ($ScheduleType -eq 'Daily' -and $DaysInterval -eq 0)
529529
{
530-
New-InvalidArgumentException `
530+
New-ArgumentException `
531531
-Message ($script:localizedData.DaysIntervalError -f $DaysInterval) `
532532
-ArgumentName DaysInterval
533533
}
534534

535535
if ($ScheduleType -eq 'Weekly' -and $WeeksInterval -eq 0)
536536
{
537-
New-InvalidArgumentException `
537+
New-ArgumentException `
538538
-Message ($script:localizedData.WeeksIntervalError -f $WeeksInterval) `
539539
-ArgumentName WeeksInterval
540540
}
541541

542542
if ($ScheduleType -eq 'Weekly' -and $DaysOfWeek.Count -eq 0)
543543
{
544-
New-InvalidArgumentException `
544+
New-ArgumentException `
545545
-Message ($script:localizedData.WeekDayMissingError) `
546546
-ArgumentName DaysOfWeek
547547
}
@@ -554,29 +554,29 @@ function Set-TargetResource
554554
}
555555
catch
556556
{
557-
New-InvalidArgumentException `
557+
New-ArgumentException `
558558
-Message ($script:localizedData.OnEventSubscriptionError) `
559559
-ArgumentName EventSubscription
560560
}
561561
}
562562

563563
if ($ScheduleType -eq 'OnSessionState' -and [System.String]::IsNullOrEmpty($StateChange))
564564
{
565-
New-InvalidArgumentException `
565+
New-ArgumentException `
566566
-Message ($script:localizedData.OnSessionStateChangeError) `
567567
-ArgumentName StateChange
568568
}
569569

570570
if ($ExecuteAsGMSA -and ($ExecuteAsCredential -or $BuiltInAccount))
571571
{
572-
New-InvalidArgumentException `
572+
New-ArgumentException `
573573
-Message ($script:localizedData.gMSAandCredentialError) `
574574
-ArgumentName ExecuteAsGMSA
575575
}
576576

577577
if ($SynchronizeAcrossTimeZone -and ($ScheduleType -notin @('Once', 'Daily', 'Weekly')))
578578
{
579-
New-InvalidArgumentException `
579+
New-ArgumentException `
580580
-Message ($script:localizedData.SynchronizeAcrossTimeZoneInvalidScheduleType) `
581581
-ArgumentName SynchronizeAcrossTimeZone
582582
}
@@ -832,7 +832,7 @@ function Set-TargetResource
832832

833833
if ($RepetitionDuration -le $RepeatInterval)
834834
{
835-
New-InvalidArgumentException `
835+
New-ArgumentException `
836836
-Message ($script:localizedData.RepetitionIntervalError -f $RepeatInterval, $RepetitionDuration) `
837837
-ArgumentName RepetitionDuration
838838
}

‎source/DSCResources/DSC_SmbShare/DSC_SmbShare.psm1

+1-1
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ function Assert-AccessPermissionParameters
848848
#>
849849
if ($fullAccessIsEmpty -and $changeAccessIsEmpty -and $noAccessIsEmpty)
850850
{
851-
New-InvalidArgumentException -Message $script:localizedData.InvalidAccessParametersCombination -ArgumentName 'FullAccess, ChangeAccess, ReadAccess, NoAccess'
851+
New-ArgumentException -Message $script:localizedData.InvalidAccessParametersCombination -ArgumentName 'FullAccess, ChangeAccess, ReadAccess, NoAccess'
852852
}
853853
}
854854
}

‎source/DSCResources/DSC_SystemLocale/DSC_SystemLocale.psm1

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ function Test-TargetResource
145145

146146
if (-not (Test-SystemLocaleValue -SystemLocale $SystemLocale))
147147
{
148-
New-InvalidArgumentException `
148+
New-ArgumentException `
149149
-Message ($script:localizedData.InvalidSystemLocaleError -f $SystemLocale) `
150150
-ArgumentName 'SystemLocale'
151151
} # if

‎source/DSCResources/DSC_WindowsCapability/DSC_WindowsCapability.psm1

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function Get-TargetResource
3333

3434
if ([System.String]::IsNullOrEmpty($windowsCapability.Name))
3535
{
36-
New-InvalidArgumentException `
36+
New-ArgumentException `
3737
-Message ($script:localizedData.CapabilityNameNotFound -f $Name) `
3838
-ArgumentName 'Name'
3939
}

‎source/DSCResources/DSC_WindowsEventLog/DSC_WindowsEventLog.psm1

+5-5
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ function Get-WindowsEventLogRetentionDays
720720
if ($null -eq $matchingEventLog.MinimumRetentionDays)
721721
{
722722
$message = $script:localizedData.GetWindowsEventLogRetentionDaysFailure -f $LogName
723-
New-InvalidArgumentException -Message $message -ArgumentName 'LogName'
723+
New-ArgumentException -Message $message -ArgumentName 'LogName'
724724
}
725725

726726
return $matchingEventLog.MinimumRetentionDays
@@ -783,7 +783,7 @@ function Register-WindowsEventLogSource
783783
{
784784
$message = $script:localizedData.RegisterWindowsEventLogSourceInvalidPath `
785785
-f $SourceName, $CategoryResourceFile
786-
New-InvalidArgumentException -Message $message -ArgumentName 'CategoryResourceFile'
786+
New-ArgumentException -Message $message -ArgumentName 'CategoryResourceFile'
787787
}
788788

789789
$arguments.CategoryResourceFile = $CategoryResourceFile
@@ -796,7 +796,7 @@ function Register-WindowsEventLogSource
796796
{
797797
$message = $script:localizedData.RegisterWindowsEventLogSourceInvalidPath `
798798
-f $SourceName, $MessageResourceFile
799-
New-InvalidArgumentException -Message $message -ArgumentName 'MessageResourceFile'
799+
New-ArgumentException -Message $message -ArgumentName 'MessageResourceFile'
800800
}
801801

802802
$arguments.MessageResourceFile = $MessageResourceFile
@@ -809,7 +809,7 @@ function Register-WindowsEventLogSource
809809
{
810810
$message = $script:localizedData.RegisterWindowsEventLogSourceInvalidPath `
811811
-f $SourceName, $ParameterResourceFile
812-
New-InvalidArgumentException -Message $message -ArgumentName 'ParameterResourceFile'
812+
New-ArgumentException -Message $message -ArgumentName 'ParameterResourceFile'
813813
}
814814

815815
$arguments.ParameterResourceFile = $ParameterResourceFile
@@ -998,6 +998,6 @@ function Set-WindowsEventLogRetentionDays
998998
else
999999
{
10001000
$message = $script:localizedData.SetWindowsEventLogRetentionDaysWrongMode -f $LogName
1001-
New-InvalidArgumentException -Message $message -ArgumentName 'LogMode'
1001+
New-ArgumentException -Message $message -ArgumentName 'LogMode'
10021002
}
10031003
}

0 commit comments

Comments
 (0)