Skip to content

Commit e6fd414

Browse files
authored
[Tool] Fix some issues in tools and pipeline (Azure#13706)
* Fix the issue that forget to copy the utils from generation to master. * Fix the issue of GenerateHelp.ps1 * Fix the issue of BinSkim 1.7.1 Co-authored-by: wyunchi-ms <[email protected]>
1 parent 377d518 commit e6fd414

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.azure-pipelines/windows-powershell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
displayName: 'Download BinSkim'
4646
inputs:
4747
command: custom
48-
arguments: 'install Microsoft.CodeAnalysis.BinSkim -OutputDirectory $(System.DefaultWorkingDirectory)/tools/SecurityTools'
48+
arguments: 'install Microsoft.CodeAnalysis.BinSkim -OutputDirectory $(System.DefaultWorkingDirectory)/tools/SecurityTools -Version 1.7.0'
4949
- task: PowerShell@2
5050
displayName: 'Run BinSkim'
5151
inputs:

tools/Gen2Master/MoveFromGeneration2Master.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Function Move-Generation2Master {
1414
If (-not (Test-Path $DestPath)) {
1515
New-Item -ItemType Directory -Path $DestPath
1616
}
17-
$Dir2Copy = @('custom', 'examples', 'exports', 'generated', 'internal', 'test')
17+
$Dir2Copy = @('custom', 'examples', 'exports', 'generated', 'internal', 'test', 'utils')
1818
Foreach($Dir in $Dir2Copy) {
1919
$SourceItem = Join-Path -Path $SourcePath -ChildPath $Dir
2020
$DestItem = Join-Path -Path $DestPath -ChildPath $Dir

tools/GenerateHelp.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ if ($ValidateMarkdownHelp)
8282
}
8383

8484
# We need to define new version of module instead of hardcode here
85-
$GeneratedModuleListPath = [System.IO.Path]::Combine(@($PSScriptRoot, "GeneratedModuleList.txt"))
85+
$GeneratedModuleListPath = [System.IO.Path]::Combine($PSScriptRoot, "GeneratedModuleList.txt")
8686
$NewModules = Get-Content $GeneratedModuleListPath
8787
if ($GenerateMamlHelp)
8888
{

0 commit comments

Comments
 (0)