Skip to content

dotnet 6.0.102#95339

Closed
cho-m wants to merge 1 commit into
Homebrew:masterfrom
cho-m:dotnet-6.0.102
Closed

dotnet 6.0.102#95339
cho-m wants to merge 1 commit into
Homebrew:masterfrom
cho-m:dotnet-6.0.102

Conversation

@cho-m

@cho-m cho-m commented Feb 18, 2022

Copy link
Copy Markdown
Member
  • Have you followed the guidelines for contributing?
  • Have you ensured that your commits follow the commit style guide?
  • Have you checked that there aren't other open pull requests for the same formula update/change?
  • Have you built your formula locally with brew install --build-from-source <formula>, where <formula> is the name of the formula you're submitting?
  • Is your test running fine brew test <formula>, where <formula> is the name of the formula you're submitting?
  • Does your build pass brew audit --strict <formula> (after doing brew install --build-from-source <formula>)? If this is a new formula, does it pass brew audit --new <formula>?

Re-attempting v6.0.102. Originally tried in #92991 but hit some issues.

do not merge as need to check with upstream on workaround added.

Odd tag name due to: dotnet/source-build#2761

@cho-m cho-m added do not merge in progress Stale bot should stay away CI-linux-self-hosted Build on Linux self-hosted runner long build Set a long timeout for formula testing labels Feb 18, 2022
@cho-m cho-m mentioned this pull request Feb 18, 2022
Closed
6 tasks
cho-m
cho-m commented Feb 18, 2022
View reviewed changes
Comment thread Formula/dotnet.rb
@cho-m cho-m added CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. and removed CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. labels Feb 19, 2022
cho-m
cho-m commented Feb 20, 2022
View reviewed changes
Comment thread Formula/dotnet.rb
Comment on lines +62 to +64
inreplace Dir["src/installer.*/src/redist/targets/GenerateLayout.targets"].first,
"$(MicrosoftAspNetCoreAppRuntimePackageVersion)",
"$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)"

@cho-m cho-m Feb 20, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Before merge, main thing to check upstream is why MicrosoftAspNetCoreAppRuntimePackageVersion is using 6.0.0 and failing.

MicrosoftAspNetCoreAppRuntimewinx64PackageVersion is set to 6.0.2 and it looks like build is supposed to use MicrosoftAspNetCoreAppRuntimePackageVersion = MicrosoftAspNetCoreAppRuntimewinx64PackageVersion

@cho-m cho-m mentioned this pull request Mar 9, 2022
Closed
5 tasks
@cho-m cho-m added ready to merge PR can be merged once CI is green and removed do not merge in progress Stale bot should stay away labels Mar 9, 2022
@cho-m

cho-m commented Mar 9, 2022

Copy link
Copy Markdown
Member Author

I think this can be merged as is for now. I created upstream issue dotnet/source-build#2795 to track our patches/workarounds and find out how to fix upstream.

Only odd thing is new workaround where MicrosoftAspNetCoreAppRuntimePackageVersion is not properly set. For now, workaround works.

I believe the values are supposed to be the same based on https://github.com/dotnet/installer/blob/v6.0.102-source-build/eng/Versions.props#L86-L93

  <PropertyGroup>
    <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64    -->
    <!-- version above and create aliases without the winx64 here for clarity elsewhere. -->
    <MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
    <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
    <MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
    <MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
  </PropertyGroup>

@Bo98

Bo98 commented Mar 9, 2022 •
edited
Loading

Copy link
Copy Markdown
Member

Fine for me. Did the just released 6.0.103 change anything?

(6.0.201 isn't yet supported for source build)

@cho-m

cho-m commented Mar 9, 2022 •
edited
Loading

Copy link
Copy Markdown
Member Author

I didn't take a look at release notes yet.

I had problems building locally where build stalled. May try again or just run on CI.

The :DATA patches are still necessary, but need to be rebased for new release

@Bo98

Bo98 commented Mar 9, 2022

Copy link
Copy Markdown
Member

(For future reference of why 6.0.201 won't work: https://github.com/dotnet/source-build#support)

@BrewTestBot

BrewTestBot commented Mar 9, 2022

Copy link
Copy Markdown
Contributor

🤖 A scheduled task has triggered a merge.

@cho-m cho-m deleted the dotnet-6.0.102 branch March 9, 2022 22:49
@github-actions github-actions Bot added the outdated PR was locked due to age label Apr 9, 2022
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 9, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@SMillerDev SMillerDev SMillerDev approved these changes

Assignees

No one assigned

Labels

CI-linux-self-hosted Build on Linux self-hosted runner long build Set a long timeout for formula testing outdated PR was locked due to age ready to merge PR can be merged once CI is green

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@cho-m @Bo98 @BrewTestBot @SMillerDev