[xtro] Fix xtro on dotnet. (#14559)
Use the workloads versions to point to the correct dll path when running in a diff bot than the one were the build was done.
This commit is contained in:
Родитель
3b282198a0
Коммит
e5b8b196f7
|
@ -126,7 +126,11 @@ $(XMACCATALYST_PCH): .stamp-check-sharpie
|
|||
$(CORETELEPHONY_HEADERS) \
|
||||
|
||||
define DotNetAssembly
|
||||
ifdef TESTS_USE_SYSTEM
|
||||
X$(2)_DOTNET ?= $(DOTNET_DIR)/packs/Microsoft.$(1).Runtime.$(X$(2)_RID)/$($(2)_WORKLOAD_VERSION)/runtimes/$(X$(2)_RID)/lib/$(DOTNET_TFM)/$(DOTNET_$(2)_ASSEMBLY_NAME).dll
|
||||
else
|
||||
X$(2)_DOTNET ?= $(DOTNET_DESTDIR)/Microsoft.$(1).Runtime.$(X$(2)_RID)/runtimes/$(X$(2)_RID)/lib/$(DOTNET_TFM)/$(DOTNET_$(2)_ASSEMBLY_NAME).dll
|
||||
endif
|
||||
|
||||
dotnet-$(1)-$($(2)_SDK_VERSION).g.cs: .stamp-check-sharpie
|
||||
$$(SHARPIE) query -bind $$(X$(2)_PCH) > $$@
|
||||
|
|
|
@ -393,6 +393,7 @@ steps:
|
|||
|
||||
echo "Rollback file contents:"
|
||||
echo "$(cat $WORKLOAD_DST)"
|
||||
name: workload_file
|
||||
displayName: 'Generate "WorkloadRollback.json'
|
||||
|
||||
# upload each of the pkgs into the pipeline artifacts
|
||||
|
|
|
@ -100,6 +100,23 @@ steps:
|
|||
displayName: Bootstrap dotnet
|
||||
timeoutInMinutes: 30
|
||||
|
||||
- pwsh: |
|
||||
$workloadPath = "$(Build.SourcesDirectory)/artifacts/package-internal/WorkloadRollback.json"
|
||||
$versionData = Get-Content $workloadPath | ConvertFrom-Json
|
||||
# could be done in a loop, but we don't want to be smart just yet
|
||||
$iOSVersion = $versionData | Select-Object -ExpandProperty "microsoft.net.sdk.ios"
|
||||
Write-Host "##vso[task.setvariable variable=IOS_WORKLOAD_VERSION;]$iOSVersion"
|
||||
|
||||
$tvOSVersion = $versionData | Select-Object -ExpandProperty "microsoft.net.sdk.tvos"
|
||||
Write-Host "##vso[task.setvariable variable=TVOS_WORKLOAD_VERSION;]$tvOSVersion"
|
||||
|
||||
$macVersion = $versionData | Select-Object -ExpandProperty "microsoft.net.sdk.macos"
|
||||
Write-Host "##vso[task.setvariable variable=MACOS_WORKLOAD_VERSION;]$macVersion"
|
||||
|
||||
$catalystVersion = $versionData | Select-Object -ExpandProperty "microsoft.net.sdk.maccatalyst"
|
||||
Write-Host "##vso[task.setvariable variable=MACCATALYST_WORKLOAD_VERSION;]$catalystVersion"
|
||||
displayName: 'Set workload versions for xtro'
|
||||
|
||||
- bash: |
|
||||
set -x
|
||||
set -e
|
||||
|
|
Загрузка…
Ссылка в новой задаче