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/8.0.3xx' => 'release/8.0.4xx' #20250

Merged
merged 78 commits into from
Nov 22, 2024

Conversation

github-actions[bot]
Copy link

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

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

  • v-wuzhai
  • marcpopMSFT
  • mthalman
  • NikolaMilosavljevic
  • dotnet-maestro[bot]
  • dotnet-sb-bot
  • vseanreesermsft
  • manodasanW
  • dotnet-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/8.0.3xx
git pull --ff-only
git checkout release/8.0.4xx
git pull --ff-only
git merge --no-ff release/8.0.3xx

# 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/installer HEAD:merge/release/8.0.3xx-to-release/8.0.4xx
or if you are using SSH
git push git@github.com:dotnet/installer HEAD:merge/release/8.0.3xx-to-release/8.0.4xx

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/8.0.3xx-to-release/8.0.4xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/8.0.3xx-to-release/8.0.4xx origin/release/8.0.4xx
git pull https://github.com/dotnet/installer merge/release/8.0.3xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/installer HEAD:merge/release/8.0.3xx-to-release/8.0.4xx
or if you are using SSH
git fetch
git checkout -b merge/release/8.0.3xx-to-release/8.0.4xx origin/release/8.0.4xx
git pull git@github.com:dotnet/installer merge/release/8.0.3xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/installer HEAD:merge/release/8.0.3xx-to-release/8.0.4xx

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

Mirroring added 30 commits October 2, 2024 22:06
NikolaMilosavljevic and others added 26 commits October 23, 2024 15:21
Update emsdk to 8.0.11

This fixes the source-build issue - most tests failing, meaning the product is broken without this fix.

Internal validation of this change was successful: https://dev.azure.com/dnceng/internal/_build/results?buildId=2566927&view=results

----
#### AI description  (iteration 1)
#### PR Classification
Version update.

#### PR Summary
This pull request updates the Emscripten SDK to version 8.0.11.

- `eng/Version.Details.xml`: Updated Emscripten SDK version and corresponding SHA values.
- `eng/Versions.props`: Updated Emscripten SDK version reference.
… flow

- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Add back the coherency dependency and resync runtime flow

----
#### AI description  (iteration 1)
#### PR Classification
Dependency update and runtime flow synchronization.

#### PR Summary
This pull request updates dependencies and resynchronizes the runtime flow to ensure coherency.
- `/eng/Version.Details.xml`: Updated `Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100` and `Microsoft.SourceBuild.Intermediate.emsdk` dependencies to version 8.0.11.
- `/NuGet.config`: Updated package source keys for `dotnet-emsdk` to reflect the new SHA.
- `/eng/Versions.props`: Updated `MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion` to 8.0.11.
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Update to the 6.0.36 emsdk build

----
#### AI description  (iteration 1)
#### PR Classification
Dependency update

#### PR Summary
This pull request updates the Emscripten SDK to version 6.0.36 and modifies related package configurations.
- `NuGet.config`: Updated package sources for `dotnet-emsdk` and added new sources for `dotnet-windowsdesktop`.
- `eng/Version.Details.xml`: Updated the version and SHA for `Microsoft.NET.Workload.Emscripten.Manifest-6.0.400`.
- `eng/Versions.props`: Updated the `MicrosoftNETWorkloadEmscriptenManifest60400Version` to 6.0.36.
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@v-wuzhai v-wuzhai requested a review from mthalman November 21, 2024 06:17
@v-wuzhai v-wuzhai merged commit 0af72f3 into release/8.0.4xx Nov 22, 2024
15 checks passed
@v-wuzhai v-wuzhai deleted the merge/release/8.0.3xx-to-release/8.0.4xx branch November 22, 2024 06:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants