Skip to content
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

Use Windows Artifact Format #571

Merged
merged 8 commits into from
Jun 26, 2024
Merged

Use Windows Artifact Format #571

merged 8 commits into from
Jun 26, 2024

Conversation

nibanks
Copy link
Member

@nibanks nibanks commented Jun 24, 2024

This updated XDP to use the Windows artifact directory format (i.e., arm64chk or amd64fre), which is needed for internal build alignment.

Future changes may further refactor the project files to use /~https://github.com/microsoft/undocked instead of manually doing parts of this.

@nibanks nibanks requested a review from a team as a code owner June 24, 2024 22:40
@nibanks
Copy link
Member Author

nibanks commented Jun 25, 2024

This passed an internal build and produces the right artifacts.

<WiXPackagePath>$(SolutionDir)packages\wix.3.14.1\</WiXPackagePath>
<WntPackagePath>$(SolutionDir)packages\win-net-test.0.5.2\</WntPackagePath>
<!-- Configuration properties to match Windows -->
<WinConfig Condition="'$(Configuration)' == 'Release'">fre</WinConfig>
Copy link
Contributor

Choose a reason for hiding this comment

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

is this because all the scripts invoke the build as debug/release instead of fre/chk, and so on?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. Those are unchanged.

[string]$Arch
)

# Convert to Windows format
Copy link
Contributor

Choose a reason for hiding this comment

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

i saw more conversions in the xdp.props file:

    <WinPlat Condition="'$(Platform)' == 'Win32'">x86</WinPlat>
    <WinPlat Condition="'$(Platform)' == 'x64'">amd64</WinPlat>
    <WinPlat Condition="'$(Platform)' == 'ARM64'">arm64</WinPlat>
    <WinPlat Condition="'$(Platform)' == 'ARM64EC'">arm64ec</WinPlat>

should we transform all of those here, too?

Copy link
Member Author

Choose a reason for hiding this comment

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

Since we don't support anything else in the project, I think it's fine as is for now.

@nibanks nibanks enabled auto-merge (squash) June 26, 2024 19:43
@nibanks nibanks merged commit 9622a03 into main Jun 26, 2024
29 checks passed
@nibanks nibanks deleted the win-output-format branch June 26, 2024 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants