') + ')', '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); } })(); })(); [release/6.0] add missing RIDs by wfurt · Pull Request #82120 · dotnet/runtime · GitHub
Skip to content

[release/6.0] add missing RIDs - #82120

Merged
carlossanlop merged 4 commits into
dotnet:release/6.0from
wfurt:rid6
Feb 15, 2023
Merged

[release/6.0] add missing RIDs#82120
carlossanlop merged 4 commits into
dotnet:release/6.0from
wfurt:rid6

Conversation

@wfurt

Copy link
Copy Markdown
Member

This brings it closer to current main. The changes are

  • macOS 13
  • Android 32
  • Ubuntu 23.04

It is not clear to my why we see big difference in Alpine. It was no touch this tome so perhaps it was not properly generated before.

@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.

@ghostghost assigned wfurtFeb 14, 2023

@carlossanlopcarlossanlop left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

OOB package changes look good. Seems most of the json changes are just sections moved alphabetically. The actual new items are android.32, osx.13 and ubuntu.23.04.

cc @mmitche@rbhanda this is PR 1/2 that we need to wait for. THe other one is for 7.0.

@ghost

Copy link
Copy Markdown

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

Issue Details

This brings it closer to current main. The changes are

  • macOS 13
  • Android 32
  • Ubuntu 23.04

It is not clear to my why we see big difference in Alpine. It was no touch this tome so perhaps it was not properly generated before.

Author:wfurt
Assignees:wfurt
Labels:

area-Infrastructure

Milestone:-

@carlossanlop

carlossanlop commented Feb 14, 2023

Copy link
Copy Markdown
Contributor

@wfurt the failures are related to the change. Can you please take a look?

===========================================================================================================
C:\h\w\B0670976\w\A75408EC\e>xunit.console.exe Microsoft.NETCore.Platforms.Tests.dll -xml testResults.xml -nologo -nocolor -notrait category=IgnoreForCI -notrait category=OuterLoop -notrait category=failing Discovering: Microsoft.NETCore.Platforms.Tests (app domain = on [no shadow copy], method display = ClassAndMethod, method display options = None)
Discovered: Microsoft.NETCore.Platforms.Tests (found 18 test cases)
Starting: Microsoft.NETCore.Platforms.Tests (parallel test collections = on, max threads = 2)
Microsoft.NETCore.Platforms.BuildTasks.Tests.GenerateRuntimeGraphTests.CanAddArchitectureAndVersionToExistingGroups [FAIL]
Assert.Equal() Failure
Expected: RuntimeGraph { Runtimes = [[alpine, (alpine: (#imports: linux-musl); )], [alpine-arm, (alpine-arm: (#imports: alpine,linux-musl-arm); )], [alpine-arm64, (alpine-arm64: (#imports: alpine,linux-musl-arm64); )], [alpine-s390x, (alpine-s390x: (#imports: alpine,linux-musl-s390x); )], [alpine-x64, (alpine-x64: (#imports: alpine,linux-musl-x64); )], ...], Supports = [] }
Actual: RuntimeGraph { Runtimes = [[alpine, (alpine: (#imports: linux-musl); )], [alpine-arm, (alpine-arm: (#imports: alpine,linux-musl-arm); )], [alpine-arm64, (alpine-arm64: (#imports: alpine,linux-musl-arm64); )], [alpine-s390x, (alpine-s390x: (#imports: alpine,linux-musl-s390x); )], [alpine-x64, (alpine-x64: (#imports: alpine,linux-musl-x64); )], ...], Supports = [] }
Stack Trace:
/_/src/libraries/Microsoft.NETCore.Platforms/tests/GenerateRuntimeGraphTests.cs(120,0): at Microsoft.NETCore.Platforms.BuildTasks.Tests.GenerateRuntimeGraphTests.AssertRuntimeGraphAdditions(String[] additionalRIDs, RuntimeDescription[] expectedAdditions, String additionalRIDParent, String runtimeFilePrefix)
/_/src/libraries/Microsoft.NETCore.Platforms/tests/GenerateRuntimeGraphTests.cs(220,0): at Microsoft.NETCore.Platforms.BuildTasks.Tests.GenerateRuntimeGraphTests.CanAddArchitectureAndVersionToExistingGroups()
Finished: Microsoft.NETCore.Platforms.Tests
=== TEST EXECUTION SUMMARY ===
Microsoft.NETCore.Platforms.Tests Total: 102, Errors: 0, Failed: 1, Skipped: 0, Time: 1.740s
----- end Tue 02/14/2023 20:05:57.25 ----- exit code 1 ----------------------------------------------------------

@wfurt

Copy link
Copy Markdown
MemberAuthor

let me check.

@wfurt

Copy link
Copy Markdown
MemberAuthor

it seems like the test was updated as part of #75371
I opportunistically pushed update and I'll do more tests once my full build is done.

@carlossanlop

Copy link
Copy Markdown
Contributor

CI passed.

@carlossanlop
carlossanlop merged commit 6dcd04a into dotnet:release/6.0Feb 15, 2023
@ghostghost locked as resolved and limited conversation to collaborators Mar 17, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wfurt@carlossanlop