Skip to content

Brand release/6.0-maui branch appropriately - #61792

Merged
steveisok merged 10 commits into
dotnet:release/6.0-mauifrom
directhex:brand-maui-branch
Nov 24, 2021
Merged

Brand release/6.0-maui branch appropriately#61792
steveisok merged 10 commits into
dotnet:release/6.0-mauifrom
directhex:brand-maui-branch

Conversation

@directhex

Copy link
Copy Markdown
Contributor

Update branch used for maui previews and get it building

@ghost

Copy link
Copy Markdown

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@directhexdirecthex mentioned this pull request Nov 18, 2021
4 tasks
@directhex
directhex marked this pull request as ready for review November 22, 2021 12:27
Comment threadeng/Versions.props

@mmitchemmitche left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Aside from the StabilizePackageVersions issue, I think this is correct.

@safernsafern left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You also want to remove all instances of ServicingVersion and GeneratePackageOnBuild

<ServicingVersion>1</ServicingVersion>
those should be added until you want to service that specific package.

Comment threadeng/packaging.targets Outdated
@safern

Copy link
Copy Markdown
Member

GeneratePackageOnBuild

Well the transport packages should keep that if you need to service those.

Comment threadeng/Versions.props
Comment threadeng/packaging.targets
@directhex

directhex commented Nov 23, 2021

Copy link
Copy Markdown
ContributorAuthor

Failing because _PackageVersion is empty but I don't see why - it should be populated by $(PackageVersion) in https://github.com/directhex/runtime/blob/brand-maui-branch/src/libraries/workloads-testing.targets#L5 as far as I can see, and PackageVersion is not empty as I read the binlogs

@steveisok

steveisok commented Nov 23, 2021

Copy link
Copy Markdown
Member

Failing because _PackageVersion is empty but I don't see why - it should be populated by $(PackageVersion) in https://github.com/directhex/runtime/blob/brand-maui-branch/src/libraries/workloads-testing.targets#L5 as far as I can see, and PackageVersion is not empty as I read the binlogs

@radical can you provide any insight?

@directhex

Copy link
Copy Markdown
ContributorAuthor

Seems more likely related to changes by @mmitche to the version handling in that file

@safern

Copy link
Copy Markdown
Member

I see what's going on and I hit this on main when porting these changes to main. PackageVersion is not set at this point when this property group is evaluated, so that it is why its value is empty. In order to fix this, we need to move the PropertyGroup that sets _PackageVersion inside the target, so that the property value is assigned when the target is executed and therefore PackageVersion will already be evaluated and assigned. See: https://github.com/dotnet/runtime/blob/main/eng/testing/workloads-testing.targets#L96-L97

@directhex

Copy link
Copy Markdown
ContributorAuthor

@safern@mmitche any objections? We're green

@steveisok
steveisok merged commit 30c3091 into dotnet:release/6.0-mauiNov 24, 2021
@ghostghost locked as resolved and limited conversation to collaborators Dec 25, 2021
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@directhex@safern@steveisok@akoeplinger@mmitche