[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.
dotnet · Mar 30, 2022 · e5b8b19 · e5b8b19 · vs-mobiletools-engineering-service2 · Mar 30, 2022
1 parent 3b28219
commit e5b8b19
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/tests/xtro-sharpie/Makefile b/tests/xtro-sharpie/Makefile
@@ -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) > $$@

diff --git a/tools/devops/automation/templates/build/build.yml b/tools/devops/automation/templates/build/build.yml
@@ -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

diff --git a/tools/devops/automation/templates/tests/run-tests.yml b/tools/devops/automation/templates/tests/run-tests.yml
@@ -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