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

Enable installer in VMR build #18632

Merged
merged 16 commits into from
Feb 26, 2024
Merged

Enable installer in VMR build #18632

merged 16 commits into from
Feb 26, 2024

Conversation

mmitche
Copy link
Member

@mmitche mmitche commented Feb 12, 2024

  • Unified build control update
  • Gather installers in VMR output
  • Write out the windows desktop package version before building installer
  • Rework GenerateLayout a bit to avoid duplication of some property patterns and excessive sprinkling of DotNetBuild conditions.
    • Aspnetcore is still downloaded in VMR non-source-only builds
    • The alternate apphost msis, generated in other builds, are also downloaded rather than pulled from the upstream runtime build.
  • Do not pass an OSName override unless not building portable. If OSName is specified on windows via the repo project file, it ends up as "windows". This ends up used in the installer repo to build the names of various packages (e.g. crossgen), as well as other uses that implicitly assume that "win" is what OSName will be. This is typically because OSName is derived from the target rid.
  • Don't create the internal sdk zip files (still creates the installers)

- Unified build control update
- Gather installers in VMR output
- Write out the windows desktop package version before building installer
- Rework GenerateLayout a bit to avoid duplication of some property patterns and excessive sprinkling of DotNetBuild conditions.
  - Aspnetcore is still downloaded in VMR non-source-only builds
  - The alternate apphost msis, generated in other builds, are also downloaded rather than pulled from the upstream runtime build.
- Do not pass an OSName override unless not building portable. If OSName is specified on windows via the repo project file, it ends up as "windows". This ends up used in the installer repo to build the names of various packages (e.g. crossgen), as well as other uses that implicitly assume that "win" is what OSName will be. This is typically because OSName is derived from the target rid.
- Don't create the internal sdk zip files (still creates the installers)
@mmitche mmitche requested a review from a team as a code owner February 12, 2024 23:36
@MiYanni
Copy link
Member

MiYanni commented Feb 13, 2024

@mmitche You'll likely have many conflicts after the changes in my large PR gets merged. It is the changes I've done in the effort for moving this repo into the SDK repo. #17959

@mmitche
Copy link
Member Author

mmitche commented Feb 13, 2024

That's fine. When are you planning on merging this? Have all the supporting changes been done?

@MiYanni
Copy link
Member

MiYanni commented Feb 13, 2024

@mmitche

That's fine. When are you planning on merging this? Have all the supporting changes been done?

Preferably, as soon as my team gets some reviews on it. The syncing process (making sure all changes make it into my SDK repo branch) should only take a few hours. So, I'd update my PR to be synced with main, and then it should be mergeable.

That PR is just cleanup/consolidation/refactoring I've done since working on this Installer -> SDK merge. It shouldn't change the way this repo currently functions, so there shouldn't be any supporting changes necessary. If there are, I'm not aware of them. I ran the branch against our public and private CI pipelines.

@mmitche mmitche enabled auto-merge (squash) February 15, 2024 01:18
@mmitche
Copy link
Member Author

mmitche commented Feb 15, 2024

/azp run installer-unified-build-full

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mmitche
Copy link
Member Author

mmitche commented Feb 15, 2024

Passed, running full build to check up on osx.

@mmitche
Copy link
Member Author

mmitche commented Feb 15, 2024

/azp run installer-unified-build-full

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mmitche
Copy link
Member Author

mmitche commented Feb 15, 2024

/azp run installer-unified-build-full

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mmitche
Copy link
Member Author

mmitche commented Feb 15, 2024

It looks like we're not actually passing the architectures properly....

@mmitche
Copy link
Member Author

mmitche commented Feb 16, 2024

/azp run installer-unified-build-full

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mmitche
Copy link
Member Author

mmitche commented Feb 16, 2024

/azp run installer-unified-build-full

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mmitche mmitche changed the title Enable installer and SDK repos in VMR build Enable installer in VMR build Feb 21, 2024
@mmitche
Copy link
Member Author

mmitche commented Feb 21, 2024

/azp run installer-unified-build-full

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mmitche
Copy link
Member Author

mmitche commented Feb 21, 2024

I think this is ready to go, as soon as @mthalman's changes go in so that I don't stomp him accidentally. The failures are present in mainline right now, and are related to the inner-command warning format change.

@mmitche mmitche merged commit d070660 into dotnet:main Feb 26, 2024
22 checks passed
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.

3 participants