Skip to content

Use TargetArchitecture and TargetRid properties #47977

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 3 commits into from
Mar 31, 2025

Conversation

ViktorHofer
Copy link
Member

@ViktorHofer ViktorHofer commented Mar 28, 2025

Fixes #47950

By renaming Architecture to TargetArchitecture, the RID specific publishing logic works correctly.

Architecture -> TargetArchitecture
Rid -> TargetRid

Unrelated changes:

  • Remove unused CLIBUILD_SKIP_TESTS property / env var
  • Consolidate PublishVersionFile and GenerateVersionFile targets

Fixes #47950

Architecture -> TargetArchitecture
Rid -> TargetRid

Unrelated changes:
- Remove unused CLIBUILD_SKIP_TESTS property / env var
- Consolidate PublishVersionFile and GenerateVersionFile targets
@Copilot Copilot AI review requested due to automatic review settings March 28, 2025 12:32
@ViktorHofer ViktorHofer requested review from a team as code owners March 28, 2025 12:32
@ghost ghost added Area-Infrastructure untriaged Request triage from a team member labels Mar 28, 2025
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR renames pipeline properties from Architecture to TargetArchitecture and from Rid to TargetRid while removing an unused property and consolidating version file targets.

  • Renames property references in SDK job and build pipeline templates.
  • Updates command-line parameters for MSBuild to use the new property names.
  • Removes references to the unused CLIBUILD_SKIP_TESTS property in the CI pipeline.

Reviewed Changes

Copilot reviewed 3 out of 13 changed files in this pull request and generated no comments.

File Description
eng/pipelines/templates/jobs/sdk-job-matrix.yml Updated property name from buildArchitecture to targetArchitecture
eng/pipelines/templates/jobs/sdk-build.yml Replaced buildArchitecture and Rid with targetArchitecture and TargetRid in names and command-line arguments
.vsts-ci.yml Removed unused CLIBUILD_SKIP_TESTS property from publishArgument
Files not reviewed (10)
  • Directory.Build.props: Language not supported
  • eng/Badge.proj: Language not supported
  • eng/Build.props: Language not supported
  • src/Layout/Directory.Build.props: Language not supported
  • src/Layout/pkg/dotnet-sdk.proj: Language not supported
  • src/Layout/redist/targets/GenerateBundledVersions.targets: Language not supported
  • src/Layout/redist/targets/GenerateLayout.targets: Language not supported
  • src/Layout/redist/targets/RestoreLayout.targets: Language not supported
  • src/Layout/redist/tools/tool_fsc.csproj: Language not supported
  • src/SourceBuild/content/repo-projects/sdk.proj: Language not supported

@ViktorHofer
Copy link
Member Author

This one is now ready

@ViktorHofer ViktorHofer merged commit e6ec23d into main Mar 31, 2025
39 checks passed
@ViktorHofer ViktorHofer deleted the UseTargetArchitectureAndTargetRidAndCleanup branch March 31, 2025 07:38
ShreyaLaxminarayan added a commit to ShreyaLaxminarayan/dotnet-s390x that referenced this pull request Jun 10, 2025
-Switching to using dotnet/dotnet repository for SDK versions greater than 10.0.0-preview.4
-Updated the source for dependent repository commits: now retrieved from src/manifest.json instead of productCommit-linux-x64.txt.

Changes in dotnet-build:
- The build parameter /p:MicrosoftNETCoreAppRuntimeVersion in build_aspnetcore has been changed to /p:MicrosoftNETCoreAppRefVersion.
  Refer to the supporting pr:dotnet/aspnetcore#61860
- The build parameter /p:Architecture in build_sdk has been renamed to /p:TargetArchitecture.
  Refer to the pr: dotnet/sdk#47977
- The architecture specific property values has been changed in build_sdk
  Refer to pr: dotnet/sdk#49017
ShreyaLaxminarayan added a commit to ShreyaLaxminarayan/dotnet-s390x that referenced this pull request Jun 10, 2025
-Switching to using dotnet/dotnet repository for SDK versions greater than 10.0.0-preview.4
-Updated the source for dependent repository commits: now retrieved from src/manifest.json instead of productCommit-linux-x64.txt.

Changes in dotnet-build:
- The build parameter /p:MicrosoftNETCoreAppRuntimeVersion in build_aspnetcore has been changed to /p:MicrosoftNETCoreAppRefVersion.
  Refer to the supporting pr:dotnet/aspnetcore#61860
- The build parameter /p:Architecture in build_sdk has been renamed to /p:TargetArchitecture.
  Refer to the pr: dotnet/sdk#47977
- The architecture specific property values has been changed in build_sdk
  Refer to pr: dotnet/sdk#49017

Signed-off-by: shreya <[email protected]>
ShreyaLaxminarayan added a commit to ShreyaLaxminarayan/dotnet-s390x that referenced this pull request Jun 24, 2025
-Switching to using dotnet/dotnet repository for SDK versions greater than 10.0.0-preview.4
-Updated the source for dependent repository commits: now retrieved from src/manifest.json instead of productCommit-linux-x64.txt.

Changes in dotnet-build:
- The build parameter /p:MicrosoftNETCoreAppRuntimeVersion in build_aspnetcore has been changed to /p:MicrosoftNETCoreAppRefVersion.
  Refer to the supporting pr:dotnet/aspnetcore#61860
- The build parameter /p:Architecture in build_sdk has been renamed to /p:TargetArchitecture.
  Refer to the pr: dotnet/sdk#47977
- The architecture specific property values has been changed in build_sdk
  Refer to pr: dotnet/sdk#49017

Signed-off-by: shreya <[email protected]>
giritrivedi pushed a commit to IBM/dotnet-s390x that referenced this pull request Jun 24, 2025
-Switching to using dotnet/dotnet repository for SDK versions greater than 10.0.0-preview.4
-Updated the source for dependent repository commits: now retrieved from src/manifest.json instead of productCommit-linux-x64.txt.

Changes in dotnet-build:
- The build parameter /p:MicrosoftNETCoreAppRuntimeVersion in build_aspnetcore has been changed to /p:MicrosoftNETCoreAppRefVersion.
  Refer to the supporting pr:dotnet/aspnetcore#61860
- The build parameter /p:Architecture in build_sdk has been renamed to /p:TargetArchitecture.
  Refer to the pr: dotnet/sdk#47977
- The architecture specific property values has been changed in build_sdk
  Refer to pr: dotnet/sdk#49017

Signed-off-by: shreya <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing VS.Redist.* packages from SDK build
2 participants