[release/10.0.3xx] Apply locally run backflow from dotnet/dotnet#53070
[release/10.0.3xx] Apply locally run backflow from dotnet/dotnet#53070adamzip wants to merge 1 commit intodotnet:release/10.0.3xxfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This pull request performs a backflow from the dotnet/dotnet repository (build 302311, SHA d346a57), updating dependency versions and modernizing build infrastructure. The changes primarily involve version bumps for build tooling, template engine packages, and CI/CD infrastructure updates.
Changes:
- Updates Arcade SDK and Helix SDK from version 10.0.0-beta.26103.116 to 10.0.0-beta.26118.105
- Updates Template Engine packages from 10.0.200-preview.26103.116 to 10.0.300-preview.26118.105
- Updates NuGet packages from 7.4.0-rc.10416 to 7.5.0-rc.11905
- Modernizes CI/CD pool images (VS2019 → VS2022, Ubuntu → Azure Linux)
- Simplifies prerelease version labeling logic in eng/Versions.props
- Refactors workload version suffix calculation in Directory.Build.props
Reviewed changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/Workloads/Manifests/Directory.Build.props | Splits workload version suffix calculation into two statements to conditionally append iteration number |
| global.json | Updates Arcade and Helix SDK versions to 10.0.0-beta.26118.105 |
| eng/common/tools.ps1 | Adds defensive null checks when accessing global.json VS requirements |
| eng/common/templates/variables/pool-providers.yml | Updates example image reference from VS2019 to VS2022 |
| eng/common/core-templates/post-build/post-build.yml | Migrates pool image from windows.vs2019.amd64 to windows.vs2022.amd64 |
| eng/common/core-templates/job/source-build.yml | Migrates Ubuntu pools to Azure Linux 3 for source-build jobs |
| eng/common/core-templates/job/publish-build-assets.yml | Updates publishing pool image to windows.vs2022.amd64 |
| eng/Versions.props | Simplifies PreReleaseVersionLabel to always be "preview" and clears iteration; removes unused restore feed properties |
| eng/Version.Details.xml | Updates all dependency SHAs and versions to match dotnet/dotnet build 302311 |
| eng/Version.Details.props | Updates package version properties to match Version.Details.xml dependencies |
| '$(PrereleaseVersionLabel)' != 'rtm' and | ||
| '$(PrereleaseVersionLabel)' != 'servicing'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</_workloadVersionSuffix> | ||
| '$(PrereleaseVersionLabel)' != 'servicing'">-$(PreReleaseVersionLabel)</_workloadVersionSuffix> |
There was a problem hiding this comment.
Inconsistent casing used for property name. Line 20 uses 'PrereleaseVersionLabel' (lowercase 'r') in the condition check, but line 21 uses 'PreReleaseVersionLabel' (uppercase 'R') in the value reference. MSBuild property names are case-insensitive, but for consistency and maintainability, the casing should match throughout the file. The property is defined in eng/Versions.props as 'PreReleaseVersionLabel' with uppercase 'R'.
adamzip
changed the title
|
Seems to be some conflicts. Closing this PR in favor for the newly flowed #53090 |
dotnet/arcade-services#5955 (comment)