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

[automated] Merge branch 'release/7.0.2xx' => 'main' #29980

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/7.0.2xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/7.0.2xx by the following committers:

  • marcpopMSFT
  • dsplaisted
  • v-wuzhai
  • nagilson
  • tmds
  • dotnet-maestro[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/7.0.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/7.0.2xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/7.0.2xx-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/7.0.2xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/7.0.2xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/7.0.2xx-to-main main
git pull https://github.com/dotnet-maestro-bot/sdk merge/release/7.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/7.0.2xx-to-main
or if you are using SSH
git checkout -b merge/release/7.0.2xx-to-main main
git pull git@github.com:dotnet-maestro-bot/sdk merge/release/7.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/7.0.2xx-to-main

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

@v-wuzhai v-wuzhai force-pushed the merge/release/7.0.2xx-to-main branch from d6b4de9 to 4a5769a Compare January 18, 2023 08:07
@v-wuzhai
Copy link
Member

@tmds would you be able to review these changes please? Thanks!

@@ -4,5 +4,7 @@
<BundledSdk Include="Microsoft.NET.Sdk.WindowsDesktop" Version="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<BundledSdk Include="FSharp.NET.Sdk" Version="1.0.4-bundled-0100" />
<BundledSdk Include="Microsoft.Docker.Sdk" Version="1.1.0" />
<BundledSdk Include="Microsoft.NET.ILLink.Tasks" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
<BundledSdk Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerPackageVersion)" Condition="'$(NativeAotSupported)' != 'false'" />
Copy link
Member

Choose a reason for hiding this comment

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

#28690 removed this BundledSdk. We shouldn't add it back.
It invalidates #28674.

I think we shouldn't include anything from #28674, except maybe reserving AotNotSupported/NETSDK1196 as as an identifer, and the updated text for AotNoValidRuntimePackageError.

We can do a separate PR against main to make PublishAot an optional feature for the Mono-based builds.

cc @sbomer @dsplaisted @agocke @crummel @omajid

@v-wuzhai
Copy link
Member

Superceded by #29990

@YuliiaKovalova YuliiaKovalova requested a review from a team as a code owner January 18, 2023 14:07
@ViktorHofer
Copy link
Member

Closing in favor of #29990

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants