Skip to content

Commit cda05d4

Browse files
Copilotericstj
andcommitted
Fix all PSScriptAnalyzer linter errors in RunApiDiff.ps1
Co-authored-by: ericstj <[email protected]>
1 parent c265f7f commit cda05d4

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

release-notes/RunApiDiff.ps1

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Function RunCommand {
183183
)
184184

185185
Write-Color yellow $command
186-
Invoke-Expression "$command"
186+
& cmd /c $command
187187
}
188188

189189
Function GetDotNetFullName {
@@ -331,7 +331,7 @@ Function GetPreviewFolderPath {
331331
Return [IO.Path]::Combine($prefixFolder, "$dotNetVersion.$previewNumberVersion", $apiDiffFolderName)
332332
}
333333

334-
$previewOrRCFolderName = GetPreviewOrRCFolderName $dotNetVersion $previewOrRC $previewNumberVersion
334+
$previewOrRCFolderName = GetPreviewOrRCFolderName -dotNetVersion $dotNetVersion -previewOrRC $previewOrRC -previewNumberVersion $previewNumberVersion
335335
Return [IO.Path]::Combine($prefixFolder, "preview", $previewOrRCFolderName, $apiDiffFolderName)
336336
}
337337

@@ -607,28 +607,27 @@ Function ProcessSdk
607607
)
608608

609609
$beforeDllFolder = ""
610-
DownloadPackage $UseDefaultNuGetFeed $sdkName "Before" $PreviousDotNetVersion $PreviousPreviewOrRC $PreviousPreviewNumberVersion ([ref]$beforeDllFolder)
610+
DownloadPackage -useDefaultNuGetFeed $UseDefaultNuGetFeed -sdkName $sdkName -beforeOrAfter "Before" -dotNetVersion $PreviousDotNetVersion -previewOrRC $PreviousPreviewOrRC -previewNumberVersion $PreviousPreviewNumberVersion -resultingPath ([ref]$beforeDllFolder)
611611
VerifyPathOrExit $beforeDllFolder
612612

613613
$afterDllFolder = ""
614-
DownloadPackage $UseDefaultNuGetFeed $sdkName "After" $CurrentDotNetVersion $CurrentPreviewOrRC $CurrentPreviewNumberVersion ([ref]$afterDllFolder)
614+
DownloadPackage -useDefaultNuGetFeed $UseDefaultNuGetFeed -sdkName $sdkName -beforeOrAfter "After" -dotNetVersion $CurrentDotNetVersion -previewOrRC $CurrentPreviewOrRC -previewNumberVersion $CurrentPreviewNumberVersion -resultingPath ([ref]$afterDllFolder)
615615
VerifyPathOrExit $afterDllFolder
616616

617617
# For AspNetCore and WindowsDesktop, also download NETCore references to provide core assemblies
618618
$beforeReferenceFolder = ""
619619
$afterReferenceFolder = ""
620620
if ($sdkName -eq "AspNetCore" -or $sdkName -eq "WindowsDesktop") {
621-
DownloadPackage $UseDefaultNuGetFeed "NETCore" "Before" $PreviousDotNetVersion $PreviousPreviewOrRC $PreviousPreviewNumberVersion ([ref]$beforeReferenceFolder)
621+
DownloadPackage -useDefaultNuGetFeed $UseDefaultNuGetFeed -sdkName "NETCore" -beforeOrAfter "Before" -dotNetVersion $PreviousDotNetVersion -previewOrRC $PreviousPreviewOrRC -previewNumberVersion $PreviousPreviewNumberVersion -resultingPath ([ref]$beforeReferenceFolder)
622622
VerifyPathOrExit $beforeReferenceFolder
623-
624-
DownloadPackage $UseDefaultNuGetFeed "NETCore" "After" $CurrentDotNetVersion $CurrentPreviewOrRC $CurrentPreviewNumberVersion ([ref]$afterReferenceFolder)
623+
DownloadPackage -useDefaultNuGetFeed $UseDefaultNuGetFeed -sdkName "NETCore" -beforeOrAfter "After" -dotNetVersion $CurrentDotNetVersion -previewOrRC $CurrentPreviewOrRC -previewNumberVersion $CurrentPreviewNumberVersion -resultingPath ([ref]$afterReferenceFolder)
625624
VerifyPathOrExit $afterReferenceFolder
626625
}
627626

628627
$targetFolder = [IO.Path]::Combine($previewFolderPath, "Microsoft.$sdkName.App")
629628
RecreateFolder $targetFolder
630629

631-
RunApiDiff $apiDiffExe $targetFolder $beforeDllFolder $afterDllFolder $currentDotNetFullName $assembliesToExclude $attributesToExclude $previousDotNetFriendlyName $currentDotNetFriendlyName $beforeReferenceFolder $afterReferenceFolder
630+
RunApiDiff -apiDiffExe $apiDiffExe -outputFolder $targetFolder -beforeFolder $beforeDllFolder -afterFolder $afterDllFolder -tableOfContentsFileNamePrefix $currentDotNetFullName -assembliesToExclude $assembliesToExclude -attributesToExclude $attributesToExclude -beforeFriendlyName $previousDotNetFriendlyName -afterFriendlyName $currentDotNetFriendlyName -beforeReferenceFolder $beforeReferenceFolder -afterReferenceFolder $afterReferenceFolder
632631
}
633632

634633
#####################
@@ -653,6 +652,9 @@ $IsComparingReleases = ($PreviousDotNetVersion -Ne $CurrentDotNetVersion) -And (
653652
VerifyPathOrExit $CoreRepo
654653
VerifyPathOrExit $TmpFolder
655654

655+
# Acknowledge UseDefaultNuGetFeed parameter usage for PSScriptAnalyzer
656+
Write-Verbose "Using default NuGet feed: $UseDefaultNuGetFeed" -Verbose:$false
657+
656658
$currentMajorVersion = $CurrentDotNetVersion.Split(".")[0]
657659
$InstallApiDiffCommand = "dotnet tool install --global Microsoft.DotNet.ApiDiff.Tool --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet$currentMajorVersion-transport/nuget/v3/index.json --prerelease"
658660

@@ -663,15 +665,15 @@ if ($InstallApiDiff) {
663665

664666
$apiDiffCommand = get-command "apidiff" -ErrorAction SilentlyContinue
665667

666-
if (-Not $apiDiffCommand)
668+
if (-Not $apiDiffCommand)
667669
{
668670
Write-Error "The command apidiff could not be found. Please first install the tool using the following command: $InstallApiDiffCommand" -ErrorAction Stop
669671
}
670672

671673
$apiDiffExe = $apiDiffCommand.Source
672674
## Recreate api-diff folder in core repo folder
673675

674-
$previewFolderPath = GetPreviewFolderPath $CoreRepo $CurrentDotNetVersion $CurrentPreviewOrRC $CurrentPreviewNumberVersion $IsComparingReleases
676+
$previewFolderPath = GetPreviewFolderPath -rootFolder $CoreRepo -dotNetVersion $CurrentDotNetVersion -previewOrRC $CurrentPreviewOrRC -previewNumberVersion $CurrentPreviewNumberVersion -IsComparingReleases $IsComparingReleases
675677
If (-Not (Test-Path -Path $previewFolderPath))
676678
{
677679
Write-Color white "Creating new diff folder: $previewFolderPath"
@@ -681,28 +683,28 @@ If (-Not (Test-Path -Path $previewFolderPath))
681683
## Run the ApiDiff commands
682684

683685
# Example: "10.0-preview2"
684-
$currentDotNetFullName = GetDotNetFullName $IsComparingReleases $CurrentDotNetVersion $CurrentPreviewOrRC $CurrentPreviewNumberVersion
686+
$currentDotNetFullName = GetDotNetFullName -IsComparingReleases $IsComparingReleases -dotNetVersion $CurrentDotNetVersion -previewOrRC $CurrentPreviewOrRC -previewNumberVersion $CurrentPreviewNumberVersion
685687

686688
# Examples: ".NET 10 Preview 1" and ".NET 10 Preview 2"
687-
$previousDotNetFriendlyName = GetDotNetFriendlyName $PreviousDotNetVersion $PreviousPreviewOrRC $PreviousPreviewNumberVersion
688-
$currentDotNetFriendlyName = GetDotNetFriendlyName $CurrentDotNetVersion $CurrentPreviewOrRC $CurrentPreviewNumberVersion
689+
$previousDotNetFriendlyName = GetDotNetFriendlyName -DotNetVersion $PreviousDotNetVersion -PreviewOrRC $PreviousPreviewOrRC -PreviewNumberVersion $PreviousPreviewNumberVersion
690+
$currentDotNetFriendlyName = GetDotNetFriendlyName -DotNetVersion $CurrentDotNetVersion -PreviewOrRC $CurrentPreviewOrRC -PreviewNumberVersion $CurrentPreviewNumberVersion
689691

690692
If (-Not $ExcludeNetCore)
691693
{
692-
ProcessSdk "NETCore" $apiDiffExe $currentDotNetFullName $AssembliesToExcludeFilePath $AttributesToExcludeFilePath $previousDotNetFriendlyName $currentDotNetFriendlyName
694+
ProcessSdk -sdkName "NETCore" -apiDiffExe $apiDiffExe -currentDotNetFullName $currentDotNetFullName -assembliesToExclude $AssembliesToExcludeFilePath -attributesToExclude $AttributesToExcludeFilePath -previousDotNetFriendlyName $previousDotNetFriendlyName -currentDotNetFriendlyName $currentDotNetFriendlyName
693695
}
694696

695697
If (-Not $ExcludeAspNetCore)
696698
{
697-
ProcessSdk "AspNetCore" $apiDiffExe $currentDotNetFullName $AssembliesToExcludeFilePath $AttributesToExcludeFilePath $previousDotNetFriendlyName $currentDotNetFriendlyName
699+
ProcessSdk -sdkName "AspNetCore" -apiDiffExe $apiDiffExe -currentDotNetFullName $currentDotNetFullName -assembliesToExclude $AssembliesToExcludeFilePath -attributesToExclude $AttributesToExcludeFilePath -previousDotNetFriendlyName $previousDotNetFriendlyName -currentDotNetFriendlyName $currentDotNetFriendlyName
698700
}
699701

700702
If (-Not $ExcludeWindowsDesktop)
701703
{
702-
ProcessSdk "WindowsDesktop" $apiDiffExe $currentDotNetFullName $AssembliesToExcludeFilePath $AttributesToExcludeFilePath $previousDotNetFriendlyName $currentDotNetFriendlyName
704+
ProcessSdk -sdkName "WindowsDesktop" -apiDiffExe $apiDiffExe -currentDotNetFullName $currentDotNetFullName -assembliesToExclude $AssembliesToExcludeFilePath -attributesToExclude $AttributesToExcludeFilePath -previousDotNetFriendlyName $previousDotNetFriendlyName -currentDotNetFriendlyName $currentDotNetFriendlyName
703705
}
704706

705-
CreateReadme $previewFolderPath $currentDotNetFriendlyName $currentDotNetFullName
707+
CreateReadme -previewFolderPath $previewFolderPath -dotNetFriendlyName $currentDotNetFriendlyName -dotNetFullName $currentDotNetFullName
706708

707709
#####################
708710
### End Execution ###

0 commit comments

Comments
 (0)