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.

Sign up for GitHub

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

Jump to bottom

[release/6.0] Build ProjectTemplates in Source-Build #40840

Merged
merged 6 commits into from
Apr 5, 2022
Merged

[release/6.0] Build ProjectTemplates in Source-Build #40840

merged 6 commits into from
Apr 5, 2022

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented Mar 23, 2022 •
edited
Loading

Reverts #40805 & disables use of the yarn.msbuild SDK in source-build so that it's not considered a prebuilt

@wtgodbe wtgodbe requested a review from Pilchie as a code owner March 23, 2022 16:12
@wtgodbe wtgodbe requested a review from a team as a code owner March 23, 2022 16:12
@wtgodbe wtgodbe requested review from MichaelSimons and a team March 23, 2022 16:13
@wtgodbe wtgodbe added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode labels Mar 23, 2022
@wtgodbe wtgodbe added this to the 6.0.5 milestone Mar 23, 2022
@wtgodbe wtgodbe changed the title Revert "Revert "[release/6.0] Build ProjectTemplates in Source-Build"" [release/6.0] Build ProjectTemplates in Source-Build Mar 23, 2022
@wtgodbe
Copy link
Member Author

wtgodbe commented Mar 23, 2022

@MichaelSimons could you confirm if the same issue is present in main?

@ghost ghost modified the milestones: 6.0.5, 6.0.x Mar 23, 2022
@ghost
Copy link

ghost commented Mar 23, 2022

Hi @wtgodbe. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the servicing process document.
Otherwise, please add tell-mode label.

dougbu
dougbu approved these changes Mar 23, 2022
View reviewed changes
...ponents/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj Outdated
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<Sdk Name="Yarn.MSBuild" />
<Sdk Name="Yarn.MSBuild" Condition=" '$(DotNetBuildFromSource)' != 'true'" />
Copy link
Member

Choose a reason for hiding this comment

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

nit: Might want to add an <Error /> in one of the $(ResolveStaticWebAssetsInputsDependsOn) targets if '$(DotNetBuildFromSource)' == 'true' because the failure to find yarn or Yarn.MSBuild will likely be slightly obscure. Same in src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj

Copy link
Member Author

Choose a reason for hiding this comment

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

You mean in case we ever turn these on for SourceBuild?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, fast failure sounds good for that eventuality

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated

@MichaelSimons
Copy link
Member

@MichaelSimons could you confirm if the same issue is present in main?

I expect it is. I cannot confirm because source-build is not building in main. This work is scheduled for preview-4.

@MichaelSimons
Copy link
Member

I will kick-off a full tarball build to ensure there are no-prebuilts before I sign-off.

@MichaelSimons MichaelSimons mentioned this pull request Mar 23, 2022
Merged
@MichaelSimons
Copy link
Member

With this change Yarn.MSBuild is still getting loaded. Here is a binlog from dotnet/installer#13459 CI - https://artprodcus3.artifacts.visualstudio.com/Ab55de4ed-4b5a-4215-a8e4-0a0a5f71e7d8/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2RuY2VuZy9wcm9qZWN0SWQvOWVlNmQ0NzgtZDI4OC00N2Y3LWFhY2MtZjZlNmQwODJhZTZkL2J1aWxkSWQvMTY3ODY5OC9hcnRpZmFjdE5hbWUvQnVpbGQrVGFyYmFsbCtDZW50T1M3LU9mZmxpbmVfQnVpbGRMb2dzX0F0dGVtcHQx0/content?format=file&subPath=%2Fsrc%2Faspnetcore.c911002ab43b7b989ed67090f2a48d9073d5118d%2Fartifacts%2Fsource-build%2Fself%2Fsrc%2Fartifacts%2Fsourcebuild.binlog

@wtgodbe
Copy link
Member Author

wtgodbe commented Mar 24, 2022

Looking

MichaelSimons
MichaelSimons approved these changes Mar 24, 2022
View reviewed changes
Copy link
Member

@MichaelSimons MichaelSimons left a comment

Choose a reason for hiding this comment

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

Offline E2E source-build passed - dotnet/installer#13459

Thanks for fixing this for source-build.

@wtgodbe
Copy link
Member Author

wtgodbe commented Apr 1, 2022

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@dougbu dougbu merged commit bcac6ee into release/6.0 Apr 5, 2022
@dougbu dougbu deleted the revert-40805-revert-40650-backport/pr-40643-to-release/6.0 branch April 5, 2022 22:59
@dougbu dougbu modified the milestones: 6.0.x, 6.0.5 Apr 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougbu dougbu dougbu approved these changes

@MichaelSimons MichaelSimons MichaelSimons approved these changes

@Pilchie Pilchie Awaiting requested review from Pilchie

Assignees
No one assigned
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode
Projects
None yet
Milestone
6.0.5
Development

Successfully merging this pull request may close these issues.
3 participants
@wtgodbe @MichaelSimons @dougbu