diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-12 20:41:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 20:41:44 +0300 |
| commit | f94b3a5f75b7556db10c345b158efedcd03147ce (patch) | |
| tree | 51ceb899101d87fc246f1af8d3d41b8ed0467d5a | |
| parent | 822849dd485b208f0d0a94eeaf468a3188d97eb4 (diff) | |
Sync shared code from arcade (#81)
Co-authored-by: dougbu <dougbu@users.noreply.github.com>
| -rw-r--r-- | eng/common/generate-locproject.ps1 | 2 | ||||
| -rw-r--r-- | eng/common/sdl/NuGet.config | 5 | ||||
| -rw-r--r-- | eng/common/sdl/sdl.ps1 | 1 | ||||
| -rw-r--r-- | eng/common/templates/steps/execute-sdl.yml | 6 |
4 files changed, 11 insertions, 3 deletions
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bab1854..dbf2ab4 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -91,6 +91,7 @@ $locJson = @{ ) }, @{ + LanguageSet = $LanguageSet CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( @@ -110,7 +111,6 @@ $locJson = @{ SourceFile = $sourceFile CopyOption = "LangIDOnPath" OutputPath = $outputPath - Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW" } } } diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index 0c5451c..3849bdb 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -7,6 +7,11 @@ <clear /> <add key="guardian" value="https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json" /> </packageSources> + <packageSourceMapping> + <packageSource key="guardian"> + <package pattern="microsoft.guardian.cli" /> + </packageSource> + </packageSourceMapping> <disabledPackageSources> <clear /> </disabledPackageSources> diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 index ac196e1..648c506 100644 --- a/eng/common/sdl/sdl.ps1 +++ b/eng/common/sdl/sdl.ps1 @@ -1,6 +1,7 @@ function Install-Gdn { param( + [Parameter(Mandatory=$true)] [string]$Path, # If omitted, install the latest version of Guardian, otherwise install that specific version. diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 86cf578..9dd5709 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -17,14 +17,16 @@ steps: - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - pwsh: | - . $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1 + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian (Overridden) - ${{ if eq(parameters.overrideGuardianVersion, '') }}: - pwsh: | - . $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1 + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian |