') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [automated] Merge branch 'release/7.0-rc1' => 'release/7.0' by dotnet-maestro-bot · Pull Request #74920 · dotnet/runtime · GitHub
Skip to content

[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' - #74920

Merged
ViktorHofer merged 1 commit into
dotnet:release/7.0from
dotnet-maestro-bot:merge/release/7.0-rc1-to-release/7.0
Sep 1, 2022
Merged

[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'#74920
ViktorHofer merged 1 commit into
dotnet:release/7.0from
dotnet-maestro-bot:merge/release/7.0-rc1-to-release/7.0

Conversation

@dotnet-maestro-bot

@dotnet-maestro-botdotnet-maestro-bot commented Sep 1, 2022

Copy link
Copy Markdown
Contributor

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

This PR merges commits made on release/7.0-rc1 by the following committers:

  • alexperovich

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-rc1
git pull --ff-only
git checkout release/7.0
git pull --ff-only
git merge --no-ff release/7.0-rc1
# 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/runtime HEAD:merge/release/7.0-rc1-to-release/7.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/7.0-rc1-to-release/7.0

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-rc1-to-release/7.0'. 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-rc1-to-release/7.0 release/7.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/7.0-rc1-to-release/7.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/7.0-rc1-to-release/7.0
or if you are using SSH
git checkout -b merge/release/7.0-rc1-to-release/7.0 release/7.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/7.0-rc1-to-release/7.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/7.0-rc1-to-release/7.0

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.

@ghost

ghost commented Sep 1, 2022

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

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

This PR merges commits made on release/7.0-rc1 by the following committers:

  • alexperovich

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-rc1
git pull --ff-only
git checkout release/7.0
git pull --ff-only
git merge --no-ff release/7.0-rc1
# 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/runtime HEAD:merge/release/7.0-rc1-to-release/7.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/7.0-rc1-to-release/7.0

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-rc1-to-release/7.0'. 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-rc1-to-release/7.0 release/7.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/7.0-rc1-to-release/7.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/7.0-rc1-to-release/7.0
or if you are using SSH
git checkout -b merge/release/7.0-rc1-to-release/7.0 release/7.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/7.0-rc1-to-release/7.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/7.0-rc1-to-release/7.0

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.

Author:dotnet-maestro-bot
Assignees:-
Labels:

area-Infrastructure-libraries

Milestone:-

@carlossanlop

carlossanlop commented Sep 1, 2022

Copy link
Copy Markdown
Contributor

This is currently blocking the release/7.0 branch. I am unsure how long the coreclr outerloop legs will take to finish, but most legs already finished successfully, including the runtime-coreclr outerloop legs. @ViktorHofer any objections?

@ViktorHofer

ViktorHofer commented Sep 1, 2022

Copy link
Copy Markdown
Member

Yes I think it's safe to get this in.

@ViktorHofer
ViktorHofer merged commit 9ce88fc into dotnet:release/7.0Sep 1, 2022
@ghostghost locked as resolved and limited conversation to collaborators Oct 1, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes

Assignees

No one assigned

Labels

area-Infrastructure-libraries

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dotnet-maestro-bot@carlossanlop@ViktorHofer@alexperovich