[xtro] Fix xtro on dotnet. #14559
Merged
[xtro] Fix xtro on dotnet. #14559
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chamons
approved these changes
Mar 29, 2022
❌ [CI Build] Tests failed on VSTS: simulator tests iOS ❌Tests failed on VSTS: simulator tests iOS. Test results5 tests failed, 102 tests passed.Failed tests
Pipeline on Agent XAMBOT-1042.Monterey |
rolfbjarne
requested changes
Mar 30, 2022
| @@ -393,6 +393,9 @@ steps: | |||
|
|
|||
| echo "Rollback file contents:" | |||
| echo "$(cat $WORKLOAD_DST)" | |||
|
|
|||
| echo "##vso[task.setvariable variable=WorkloadVersion;]$IOS_NUGET_VERSION_FULL" | |||
There was a problem hiding this comment.
The versions are different between all platforms, you need to set a variable for each of them.
There was a problem hiding this comment.
I was hoping for the opposite. Probably I should do $(PLATFORM)_WORLOAD_VERSION. And change the loop or env def in the makefile
There was a problem hiding this comment.
Part 2:
Suggested change
| echo "##vso[task.setvariable variable=WorkloadVersion;]$IOS_NUGET_VERSION_FULL" | |
| echo "##vso[task.setvariable variable=iOSWorkloadVersion;]$IOS_NUGET_VERSION_FULL" |
needs to be expanded for all platforms.
rolfbjarne
requested changes
Mar 30, 2022
tests/xtro-sharpie/Makefile
Outdated
| @@ -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)/$(WORKLOAD_VERSION)/runtimes/$(X$(2)_RID)/lib/$(DOTNET_TFM)/$(DOTNET_$(2)_ASSEMBLY_NAME).dll | |||
There was a problem hiding this comment.
Part 1:
Suggested change
| X$(2)_DOTNET ?= $(DOTNET_DIR)/packs/Microsoft.$(1).Runtime.$(X$(2)_RID)/$(WORKLOAD_VERSION)/runtimes/$(X$(2)_RID)/lib/$(DOTNET_TFM)/$(DOTNET_$(2)_ASSEMBLY_NAME).dll | |
| 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 |
| @@ -74,6 +74,8 @@ stages: | |||
| # we need to have the pkgs built and the device sets to be ran, that is decided via the labels or type of build during the build_packages stage | |||
| condition: and(succeeded(), ${{ parameters.condition }}) | |||
|
|
|||
| variables: | |||
| WORKLOAD_VERSION: $[ stageDependencies.build_packages.build.outputs['workload_file.WorkloadVersion'] ] | |||
There was a problem hiding this comment.
Part 3:
Suggested change
| WORKLOAD_VERSION: $[ stageDependencies.build_packages.build.outputs['workload_file.WorkloadVersion'] ] | |
| IOS_WORKLOAD_VERSION: $[ stageDependencies.build_packages.build.outputs['workload_file.iOSWorkloadVersion'] ] |
needs to be expanded for all platforms.
| @@ -393,6 +393,9 @@ steps: | |||
|
|
|||
| echo "Rollback file contents:" | |||
| echo "$(cat $WORKLOAD_DST)" | |||
|
|
|||
| echo "##vso[task.setvariable variable=WorkloadVersion;]$IOS_NUGET_VERSION_FULL" | |||
There was a problem hiding this comment.
Part 2:
Suggested change
| echo "##vso[task.setvariable variable=WorkloadVersion;]$IOS_NUGET_VERSION_FULL" | |
| echo "##vso[task.setvariable variable=iOSWorkloadVersion;]$IOS_NUGET_VERSION_FULL" |
needs to be expanded for all platforms.
rolfbjarne
approved these changes
Mar 30, 2022
rolfbjarne
added
skip-all-tests
mandel-macaque
commented
Mar 30, 2022
dalexsoto
approved these changes
Mar 30, 2022
tj-devel709
approved these changes
Mar 30, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.