[DO NOT MERGE] Validate dotnet/xharness PR #1597 (NativeAOT + Sim Commands fix)#129133
Draft
matouskozak wants to merge 2 commits into
Draft
[DO NOT MERGE] Validate dotnet/xharness PR #1597 (NativeAOT + Sim Commands fix)#129133matouskozak wants to merge 2 commits into
matouskozak wants to merge 2 commits into
Conversation
DO NOT MERGE. This is a throw-away branch to validate dotnet/xharness PR dotnet#1597 (NativeAOT POC + Sim Commands per-queue fix) against runtime CI before that PR is merged. Changes: - Drop 7 locally-packed xharness nupkgs from dotnet/xharness commit 1b5c7a70 (PR dotnet#1597 head) into eng/local-xharness/. - Add a local file feed to NuGet.config pointing at that folder. - Bump the 3 xharness deps in eng/Version.Details.{xml,props} from 11.0.0-prerelease.26279.1 -> 11.0.0-prerelease.26308.1 to pick the PR's nupkgs from the local feed instead of dotnet-eng. Once dotnet/xharness PR dotnet#1597 merges and the normal darc subscription flows the new versions, delete this branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR wires up a temporary local NuGet feed (eng/local-xharness/) and bumps the runtime repo’s XHarness package versions/SHA to validate an upstream dotnet/xharness PR against runtime mobile CI.
Changes:
- Adds a new local package source (
local-xharness-pr-1597) toNuGet.configpointing ateng/local-xharness. - Updates XHarness dependency versions + SHA in
eng/Version.Details.xmlandeng/Version.Details.propsto11.0.0-prerelease.26308.1/1b5c7a70.... - Adds an
eng/local-xharness/.gitignoreoverride to allow committing.nupkgfiles (and includes the local.nupkgpayload in that folder).
Reviewed changes
Copilot reviewed 4 out of 11 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| NuGet.config | Adds a local package source for the temporary XHarness validation feed. |
| eng/Version.Details.xml | Bumps XHarness dependency versions and SHA to the validation build. |
| eng/Version.Details.props | Updates XHarness package version properties to match the validation build. |
| eng/local-xharness/.gitignore | Un-ignores .nupkg files in the local feed directory so they can be committed. |
Comment on lines
+15
to
+17
| <!-- Local nupkgs for validating dotnet/xharness PR #1597 (NativeAOT POC). | ||
| Remove this entry and eng/local-xharness/ before merging. --> | ||
| <add key="local-xharness-pr-1597" value="eng/local-xharness" /> |
Comment on lines
+1
to
+3
| # Override the repo-wide *.nupkg ignore for this folder so the local feed | ||
| # nupkgs for the dotnet/xharness PR #1597 validation can be committed. | ||
| !*.nupkg |
The first attempt used a relative path 'eng/local-xharness'. The workload-testing SDK (src/mono/nuget/Microsoft.NET.Runtime.Workload Testing.Internal) generates a Restore.csproj at a deep nested path like artifacts/obj/workload-XXX/YYY/restore/, and when NuGet evaluates that generated nuget.config it re-resolves the relative source path against the GENERATED config's directory - so 'eng/local-xharness' becomes '.../restore/eng/local-xharness', which obviously doesn't exist and the restore fails with NU1301. Switch to %BUILD_SOURCESDIRECTORY% expansion (NuGet supports Windows- style %VAR% syntax in source paths). AzDO sets this env var on every agent to the workspace root (Linux: /__w/1/s, Windows: D:\a\1\s, macOS: /Users/runner/work/1/s), so the absolute path is correct for every queue. Verified locally that NuGet expands %VAR% before resolving the source path. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or 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
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.
Purpose
Throw-away PR. Validates dotnet/xharness#1597 (NativeAOT-published xharness + Sim Commands per-queue rework) against runtime CI before that PR is merged into dotnet/xharness:main.
What this PR does
1b5c7a70, the head of Add NativeAOT publish slice for Android + Apple and CI integration xharness#1597) intoeng/local-xharness/.NuGet.config.eng/Version.Details.{xml,props}from11.0.0-prerelease.26279.1->11.0.0-prerelease.26308.1so restore picks the PR's packages.What to look at
/azp run runtime-androidemulator,/azp run runtime-ioslikesimulator, etc.) and compare against the same pipelines on a clean main run.After
When dotnet/xharness#1597 merges, the normal darc "Update dependencies from dotnet/xharness" PR will flow these (and other) updates the proper way. This branch can be closed/deleted then.