-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[net10.0] Merge main to net10.0 #31792
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
bac2432
Separate snapshot diffs artifacts in CI (#31724)
jfversluis bb0668b
[create-pull-request] automated change (#31802)
github-actions[bot] 069238e
[ci] Fix branch classification (#31811)
rmarinho a53104a
[ci] Fix branch classification (#31816)
rmarinho accdb83
Separate snapshot diffs artifacts in CI (#31724)
jfversluis 0b8c5c6
[create-pull-request] automated change (#31802)
github-actions[bot] 7fd337f
[ci] Fix branch classification (#31816)
rmarinho 762c956
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] 3089870
Merge branch 'main' into merge-main
rmarinho File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| parameters: | ||
| platform: '' # The platform name for logging (e.g., 'Android', 'iOS', 'Windows', 'Mac') | ||
| artifactName: '' # The artifact name to publish (e.g., 'uitest-snapshot-results-android') | ||
|
|
||
| steps: | ||
| - task: PowerShell@2 | ||
| condition: always() | ||
| displayName: Check for ${{ parameters.platform }} snapshot diffs | ||
| name: Check${{ replace(parameters.platform, ' ', '') }}Snapshots # NOTE: This step name must match the variable reference in the condition below | ||
| inputs: | ||
| targetType: 'inline' | ||
| script: | | ||
| $snapshotDiffPath = "$(Build.ArtifactStagingDirectory)/Controls.TestCases.Shared.Tests/snapshots-diff" | ||
| Write-Host "Checking for ${{ parameters.platform }} snapshot diffs at: $snapshotDiffPath" | ||
|
|
||
| if (Test-Path $snapshotDiffPath) { | ||
| $diffFiles = Get-ChildItem $snapshotDiffPath -File -Recurse | ||
|
|
||
| if ($diffFiles.Count -gt 0) { | ||
| Write-Host "✅ Found $($diffFiles.Count) ${{ parameters.platform }} snapshot diff files in snapshots-diff directory" | ||
| Write-Host "##vso[task.setvariable variable=snapshotsExist;isOutput=true]true" | ||
| } else { | ||
| Write-Host "ℹ️ snapshots-diff directory exists but no ${{ parameters.platform }} diff files found" | ||
| Write-Host "##vso[task.setvariable variable=snapshotsExist;isOutput=true]false" | ||
| } | ||
| } else { | ||
| Write-Host "❌ No ${{ parameters.platform }} snapshots-diff directory found at: $snapshotDiffPath" | ||
| Write-Host "##vso[task.setvariable variable=snapshotsExist;isOutput=true]false" | ||
| } | ||
|
|
||
| - task: PublishPipelineArtifact@1 | ||
| condition: eq(variables['Check${{ replace(parameters.platform, ' ', '') }}Snapshots.snapshotsExist'], 'true') # NOTE: This variable reference must match the step name above | ||
|
||
| displayName: Publish ${{ parameters.platform }} snapshot diffs | ||
| inputs: | ||
| targetPath: $(Build.ArtifactStagingDirectory)/Controls.TestCases.Shared.Tests | ||
| artifact: ${{ parameters.artifactName }} | ||
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The step name generation using
replace(parameters.platform, ' ', '')creates potential naming conflicts and maintenance issues. Platform values like 'iOS CV2' and 'iOS CARV2' will generate step names 'CheckiOSCV2Snapshots' and 'CheckiOSCARV2Snapshots' which are not intuitive. Consider using a separate parameter for the step identifier or implementing a more robust naming strategy that handles special characters and ensures uniqueness.