install-dotnet-sdk.yml, run-tests-on-os.yml: Added performMultiLevelLookup parameter for x86 tests
diff --git a/.build/azure-templates/install-dotnet-sdk.yml b/.build/azure-templates/install-dotnet-sdk.yml
index 4737996..ec0e121 100644
--- a/.build/azure-templates/install-dotnet-sdk.yml
+++ b/.build/azure-templates/install-dotnet-sdk.yml
@@ -19,6 +19,7 @@
parameters:
sdkVersion: '' # The .NET SDK version to install
+ performMultiLevelLookup: 'false' # Whether to check for x86 when running commands
steps:
- pwsh: |
@@ -39,4 +40,5 @@
displayName: 'Use .NET SDK ${{ parameters.sdkVersion }}'
inputs:
packageType: 'sdk'
- version: '${{ parameters.sdkVersion }}'
\ No newline at end of file
+ version: '${{ parameters.sdkVersion }}'
+ performMultiLevelLookup: '${{ parameters.performMultiLevelLookup }}'
\ No newline at end of file
diff --git a/.build/azure-templates/run-tests-on-os.yml b/.build/azure-templates/run-tests-on-os.yml
index 9500e31..b1282f2 100644
--- a/.build/azure-templates/run-tests-on-os.yml
+++ b/.build/azure-templates/run-tests-on-os.yml
@@ -75,20 +75,33 @@
#- pwsh: Get-ChildItem -Path $(System.DefaultWorkingDirectory) # Uncomment for debugging
+- pwsh: |
+ $testPlatform = '${{ parameters.vsTestPlatform }}'
+ if ($IsWindows -eq $null) {
+ $IsWindows = $env:OS.StartsWith('Win')
+ }
+ $performMulitLevelLookup = if ($IsWindows -and $testPlatform.Equals('x86')) { 'true' } else { 'false' }
+ Write-Host "##vso[task.setvariable variable=PerformMultiLevelLookup;]$performMulitLevelLookup"
+
- template: 'install-dotnet-sdk.yml'
parameters:
sdkVersion: '${{ parameters.dotNetSdkVersion }}'
+ performMultiLevelLookup: '${{ variables.PerformMultiLevelLookup }}'
- task: UseDotNet@2
displayName: 'Use .NET Core sdk 3.1.412'
inputs:
- version: 3.1.412
+ packageType: 'sdk'
+ version: '3.1.412'
+ performMultiLevelLookup: '${{ variables.PerformMultiLevelLookup }}'
condition: and(succeeded(), contains('${{ parameters.framework }}', 'netcoreapp3.'))
- task: UseDotNet@2
displayName: 'Use .NET sdk 5.0.400'
inputs:
- version: 5.0.400
+ packageType: 'sdk'
+ version: '5.0.400'
+ performMultiLevelLookup: '${{ variables.PerformMultiLevelLookup }}'
condition: and(succeeded(), contains('${{ parameters.framework }}', 'net5.'))
#- template: 'show-all-files.yml' # Uncomment for debugging
