Skip to content

Commit 112c680

Browse files
committed
2 parents 54b7586 + 2e7765e commit 112c680

10 files changed

Lines changed: 16 additions & 14 deletions

File tree

.github/workflows/analyze-reusable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
# Initializes the CodeQL tools for scanning.
4949
- name: Initialize CodeQL
50-
uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
50+
uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v3.29.5
5151
with:
5252
languages: ${{ matrix.language }}
5353
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -74,4 +74,4 @@ jobs:
7474
shell: pwsh
7575
7676
- name: Perform CodeQL Analysis
77-
uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
77+
uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v3.29.5

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ jobs:
6767

6868
# Upload the results to GitHub's code scanning dashboard.
6969
- name: "Upload to code-scanning"
70-
uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
70+
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v3.29.5
7171
with:
7272
sarif_file: results.sarif

.pipelines/PowerShell-Release-Official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ extends:
289289
jobs:
290290
- template: /.pipelines/templates/release-githubNuget.yml@self
291291
parameters:
292-
SkipPublish: ${{ parameters.SkipPublish }}
292+
skipPublish: ${{ parameters.SkipPublish }}
293293

294294
- stage: PushGitTagAndMakeDraftPublic
295295
displayName: Push Git Tag and Make Draft Public

.pipelines/templates/release-githubNuget.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
- name: skipPublish
3-
default: false
43
type: boolean
54

65
jobs:
@@ -99,8 +98,8 @@ jobs:
9998
10099
Write-Host "##vso[task.setvariable variable=ReleaseNotesFilePath;]$releaseNotesFilePath"
101100
102-
#if name has prelease then make preelease true as a variable
103-
if ($releaseVersion -like '*-preview*') {
101+
#if name has prelease then make prerelease true as a variable
102+
if ($releaseVersion -like '*-*') {
104103
Write-Host "##vso[task.setvariable variable=IsPreRelease;]true"
105104
} else {
106105
Write-Host "##vso[task.setvariable variable=IsPreRelease;]false"
@@ -202,4 +201,3 @@ jobs:
202201
packagesToPush: '$(Pipeline.Workspace)/release/*.nupkg'
203202
nuGetFeedType: external
204203
publishFeedCredentials: PowerShellNuGetOrgPush
205-

test/powershell/Modules/Microsoft.PowerShell.Management/Rename-Computer.Tests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $DefaultResultValue = 0
77
try
88
{
99
# set up for testing
10+
$originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
1011
$PSDefaultParameterValues["it:skip"] = ! $IsWindows
1112
Enable-Testhook -testhookName $RenameTesthook
1213
# we also set TestStopComputer
@@ -73,7 +74,7 @@ try
7374
}
7475
finally
7576
{
76-
$PSDefaultParameterValues.Remove("it:skip")
77+
$global:PSDefaultParameterValues = $originalDefaultParameterValues
7778
Disable-Testhook -testhookName $RenameTestHook
7879
Disable-Testhook -testhookName TestStopComputer
7980
Set-TesthookResult -testhookName $RenameResultName -value 0

test/powershell/Modules/Microsoft.PowerShell.Security/AclCmdlets.Tests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Describe "Acl cmdlets are available and operate properly" -Tag CI {
44
Context "Windows ACL test" {
55
BeforeAll {
6+
$originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
67
$PSDefaultParameterValues["It:Skip"] = -not $IsWindows
78
}
89

@@ -103,7 +104,7 @@ Describe "Acl cmdlets are available and operate properly" -Tag CI {
103104
}
104105

105106
AfterAll {
106-
$PSDefaultParameterValues.Remove("It:Skip")
107+
$global:PSDefaultParameterValues = $originalDefaultParameterValues
107108
}
108109
}
109110
}

test/powershell/engine/ETS/CimAdapter.Tests.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
Describe "CIM Objects are adapted properly" -Tag @("CI") {
55
BeforeAll {
6+
$originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
7+
68
function getIndex
79
{
810
param([string[]]$strings,[string]$pattern)
@@ -32,7 +34,7 @@ Describe "CIM Objects are adapted properly" -Tag @("CI") {
3234
}
3335
}
3436
AfterAll {
35-
$PSDefaultParameterValues.Remove("it:pending")
37+
$global:PSDefaultParameterValues = $originalDefaultParameterValues
3638
}
3739

3840
It "Namespace-qualified Win32_Process is present" -Skip:(!$IsWindows) {

test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ Describe "JEA session Transcript script test" -Tag @("Feature", 'RequireAdminOnW
8383
AfterAll {
8484
if ($skipTest) {
8585
Pop-DefaultParameterValueStack
86-
return
8786
}
88-
Pop-DefaultParameterValueStack
8987
}
9088

9189
It "Configuration name should be in the transcript header" {

test/powershell/engine/Remoting/SessionOption.Tests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
try {
4+
$originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
45
if ( ! $IsWindows ) {
56
$PSDefaultParameterValues['it:skip'] = $true
67
}
@@ -52,5 +53,5 @@ try {
5253
}
5354
}
5455
finally {
55-
$PSDefaultParameterValues.remove("it:skip")
56+
$global:PSDefaultParameterValues = $originalDefaultParameterValues
5657
}

test/powershell/engine/Security/FileSignature.Tests.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ Describe "Windows file content signatures" -Tags @('Feature', 'RequireAdminOnWin
8989

9090
AfterAll {
9191
if ($shouldSkip) {
92+
Pop-DefaultParameterValueStack
9293
return
9394
}
9495

0 commit comments

Comments
 (0)