Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[xtro] Fix xtro on dotnet. #14559

Merged
merged 3 commits into from
Mar 30, 2022
Merged

[xtro] Fix xtro on dotnet. #14559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b2df41
[xtro] Fix xtro on dotnet.
mandel-macaque Mar 29, 2022
3060f15
Use the workload json as the source of the versions and use a var per…
mandel-macaque Mar 30, 2022
7d7e4ef
Update tools/devops/automation/templates/tests/run-tests.yml
mandel-macaque Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tests/xtro-sharpie/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) > $$@
Expand Down
1 change: 1 addition & 0 deletions tools/devops/automation/templates/build/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions tools/devops/automation/templates/tests/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,23 @@ steps:
displayName: Boostrap 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
Expand Down