Skip to content

Enable unified build #54084

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 12 commits into from
Mar 18, 2024
Merged

Enable unified build #54084

merged 12 commits into from
Mar 18, 2024

Conversation

mmitche
Copy link
Member

@mmitche mmitche commented Feb 16, 2024

No description provided.

@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Feb 16, 2024
@mmitche mmitche marked this pull request as draft February 16, 2024 22:55
@mmitche
Copy link
Member Author

mmitche commented Feb 16, 2024

@wtgodbe First draft of support for UB in aspnetcore. The goals here are that aspentcore builds a vertical (generally Target Arch+OS) in the VMR. Source build infra is used, but switches aren't.

There are definitely some rough edges here and further work is required. I've annotated the PR.

<ExcludeFromSourceBuild
Condition="'$(ExcludeFromSourceBuild)' == '' and
'$(DotNetBuildFromSource)' == 'true' and
<ExcludeFromSourceOnlyBuild
Copy link
Member Author

Choose a reason for hiding this comment

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

Much of this is just updates to the controls names to use the new UB names and meanings.

eng/build.ps1 Outdated
@@ -12,6 +12,9 @@ build projects, run tests, and generate code.
.PARAMETER CI
Sets up CI specific settings and variables.

.PARAMETER PrepareMachine
Prepare machine for a CI run, and clean up afterwards.
Copy link
Member Author

Choose a reason for hiding this comment

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

These are the same changes from #54081

if [ "${DotNetBuildFromSource:-false}" = false ]; then
use_installed_dotnet_cli="false"
fi
use_installed_dotnet_cli="false"
Copy link
Member Author

Choose a reason for hiding this comment

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

My hunch is that this is no longer required.

@mmitche
Copy link
Member Author

mmitche commented Feb 16, 2024

Covers dotnet/source-build#4022 and #43637 with caveats.

@mmitche mmitche marked this pull request as ready for review March 1, 2024 22:39
@mmitche
Copy link
Member Author

mmitche commented Mar 1, 2024

Testing this in a CI build now

@mkArtakMSFT mkArtakMSFT removed this from the 9.0-preview2 milestone Mar 4, 2024
@dotnet-policy-service dotnet-policy-service bot added the pending-ci-rerun When assigned to a PR indicates that the CI checks should be rerun label Mar 12, 2024
@mmitche
Copy link
Member Author

mmitche commented Mar 15, 2024

I think this is ready to go. May need additional tweaks but this should allow us to enable aspnet

@mmitche
Copy link
Member Author

mmitche commented Mar 18, 2024

Ready to go

eng/build.ps1 Outdated
@@ -199,6 +199,8 @@ param(
Set-StrictMode -Version 2
$ErrorActionPreference = 'Stop'

echo "Building All: $All"
Copy link
Member

Choose a reason for hiding this comment

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

Was this just for debugging?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh yes, let me revert

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework pending-ci-rerun When assigned to a PR indicates that the CI checks should be rerun
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants