Skip to content

[manual] Merge branch 'release/6.0-staging' => 'release/6.0' - #84593

Merged
carlossanlop merged 19 commits into
dotnet:release/6.0from
carlossanlop:release/6.0-staging
Apr 11, 2023
Merged

[manual] Merge branch 'release/6.0-staging' => 'release/6.0'#84593
carlossanlop merged 19 commits into
dotnet:release/6.0from
carlossanlop:release/6.0-staging

Conversation

@carlossanlop

@carlossanlopcarlossanlop commented Apr 11, 2023

Copy link
Copy Markdown
Contributor

Important: Use Merge commit.

Snapped from my fork to prevent unexpected merges in staging branch to flow here.

carlossanlopand others added 19 commits March 28, 2023 11:18
@carlossanlop
[6.0] Update backport template and servicing docs (#84008)
2abcd03
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
Create action to check service label (#84045)
b0597d9
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
[6.0] Avoid using spanish helix queues (#83748)
5ebd798
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@steveisokSteve Pfister
[release/6.0] Bump to new OSX 13 AppleTV queue (#83728)
e0f49f8
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@steveisokSteve Pfister
[release/6.0] Disable more unsupported runtime tests (#83731)
f32611f
These tests require precise GC, which mono does not support. Upstream disabled them, so following up here.
Contributes to #83424
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop@tarekgh
Fix Iran time zone test case (#84057)
dfa540c
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@github-actions@hoyosjs
Update check-service-labels to trigger on branch edit (#84107)
fc32833
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
@github-actions@lambdageek
[release/6.0] [mono] Use unsigned char when computing UTF8 string has…
0254cce
…hes (#83303)
* [mono] Use `unsigned char` when computing UTF8 string hashes
The C standard does not specify whether `char` is signed or unsigned,
it is implementation defined.
Apparently Android aarch64 makes a different choice than other
platforms (at least macOS arm64 and Windows x64 give different
results).
Mono uses `mono_metadata_str_hash` in the AOT compiler and AOT runtime
to optimize class name lookup. As a result, classes whose names
include UTF-8 continuation bytes (with the high bit = 1) will hash
differently in the AOT compiler and on the device.
Fixes#82187Fixes#78638
* Add regression test
---------
Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
@simonrozsival@dotnet-maestro
@am11@adamsitnik@jeffhandley
[release/6.0] Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589…
cfa7b27
…) (#83965)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589)
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>
* Replace LibraryImport with DllImport in .NET 6.0
* Fix backport
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)"
This reverts commit f2db6d6.
* Define TARGET_LINUX
---------
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/emsdk dotnet/ic…
0061000
…u dotnet/msquic dotnet/runtime-assets (#84146)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
* Update dependencies from https://github.com/dotnet/icu build 20230320.3
Microsoft.NETCore.Runtime.ICU.Transport
From Version 6.0.0-rtm.22108.1 -> To Version 6.0.0-rtm.23170.3
* Update dependencies from https://github.com/dotnet/msquic build 20220405.1
System.Net.MsQuic.Transport
From Version 6.0.0-preview.7.21417.1 -> To Version 6.0.0-servicing.22205.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.5
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
From Version 6.0.0-beta.21518.1 -> To Version 6.0.0-beta.23179.5
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@cston@ericstj
[release/6.0] SyntaxValueProvider: avoid performance issue with synta…
2b36dbe
…x list containing many items (#83742)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/emsdkbuild 202304…
ac2bdf7
…05.2 (#84359)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.16 -> To Version 6.0.17
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@tarekgh
[release/6.0-staging] Fix Ordinal Ignore Case string compare (#84386)
d619619
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@ericstj
[release/6.0] Fix pinned assembly version 6.0 (#84357)
3c935ba
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing.
As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect.
Please find the full list of impacted assemblies below:
- System.ComponentModel.Composition
- System.DirectoryServices
- System.DirectoryServices.AccountManagement
- System.DirectoryServices.Protocols
- System.Management
- System.Reflection.Context
- System.Runtime.Caching
- System.Speech
For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing.
* Enable System.Management and System.DirectoryServices.Protocols in servicing
* Address feedback
@carlossanlop
Merge branch 'release/6.0-staging' into release60
ce8b485
@carlossanlop
Merge pull request#84460from carlossanlop/release60
b412149
[manual] Merge branch 'release/6.0' => 'release/6.0-staging'
@kotlarmilos
Disable failing tests (#84475)
c885ca4
Disables the failing tests for hardware intrinsics on Mono llvmaot linux arm64.
@steveisokSteve Pfister
[release/6.0][Android] Free up more disk space on CI builds (#84568)
5601390
backport of #84354
The android builds are running out of disk space when building the library test apps. This change tries to recoup some of that space by deleting artifacts after each test was built.
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop
[6.0] Reset OOB packages from 6.0.16 (#84342)
3824c52
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlopcarlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Apr 11, 2023
@carlossanlopcarlossanlop added this to the 6.0.16 milestone Apr 11, 2023
@carlossanlopcarlossanlop self-assigned this Apr 11, 2023
@carlossanlopcarlossanlop modified the milestones: 6.0.16, 6.0.17Apr 11, 2023
This was referenced Apr 11, 2023
Open
Closed
@carlossanlop

carlossanlop commented Apr 11, 2023

Copy link
Copy Markdown
ContributorAuthor

All failures known.

@carlossanlop
carlossanlop merged commit 300ceb8 into dotnet:release/6.0Apr 11, 2023
@carlossanlop
carlossanlop deleted the release/6.0-staging branch April 11, 2023 04:14
@ghostghost locked as resolved and limited conversation to collaborators May 11, 2023
@rbhandarbhanda modified the milestones: 6.0.17, 6.0.18Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@hoyosjshoyosjshoyosjs approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok
@jeffhandleyjeffhandleyAwaiting requested review from jeffhandley
@mmitchemmitcheAwaiting requested review from mmitche
@vargazvargazAwaiting requested review from vargaz
@lambdageeklambdageekAwaiting requested review from lambdageeklambdageek is a code owner
@thaystgthaystgAwaiting requested review from thaystgthaystg is a code owner
@stevehartersteveharterAwaiting requested review from steveharter
@layomialayomiaAwaiting requested review from layomia
@eiriktsarpaliseiriktsarpalisAwaiting requested review from eiriktsarpaliseiriktsarpalis is a code owner

Assignees

@carlossanlopcarlossanlop

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects

None yet

Milestone

6.0.18

Development

Successfully merging this pull request may close these issues.

7 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@simonrozsival@ericstj@kotlarmilos
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' by carlossanlop · Pull Request #84593 · dotnet/runtime · GitHub
Skip to content
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' - #84593
Merged
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Apr 11, 2023
Merged
[manual] Merge branch 'release/6.0-staging' => 'release/6.0'#84593
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Conversation
@carlossanlop
@carlossanlopcarlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

Contributor
Important: Use Merge commit.
Snapped from my fork to prevent unexpected merges in staging branch to flow here.
carlossanlopand others
added 19 commits
March 28, 2023 11:18
@carlossanlop
[6.0] Update backport template and servicing docs (#84008)
2abcd03
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
Create action to check service label (#84045)
b0597d9
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
[6.0] Avoid using spanish helix queues (#83748)
5ebd798
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@steveisokSteve Pfister
[release/6.0] Bump to new OSX 13 AppleTV queue (#83728)
e0f49f8
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@steveisokSteve Pfister
[release/6.0] Disable more unsupported runtime tests (#83731)
f32611f
These tests require precise GC, which mono does not support. Upstream disabled them, so following up here.
Contributes to #83424
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop@tarekgh
Fix Iran time zone test case (#84057)
dfa540c
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@github-actions@hoyosjs
Update check-service-labels to trigger on branch edit (#84107)
fc32833
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
@github-actions@lambdageek
[release/6.0] [mono] Use unsigned char when computing UTF8 string has…
0254cce
…hes (#83303)
* [mono] Use `unsigned char` when computing UTF8 string hashes
The C standard does not specify whether `char` is signed or unsigned,
it is implementation defined.
Apparently Android aarch64 makes a different choice than other
platforms (at least macOS arm64 and Windows x64 give different
results).
Mono uses `mono_metadata_str_hash` in the AOT compiler and AOT runtime
to optimize class name lookup. As a result, classes whose names
include UTF-8 continuation bytes (with the high bit = 1) will hash
differently in the AOT compiler and on the device.
Fixes#82187Fixes#78638
* Add regression test
---------
Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
@simonrozsival@dotnet-maestro
@am11@adamsitnik@jeffhandley
[release/6.0] Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589…
cfa7b27
…) (#83965)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589)
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>
* Replace LibraryImport with DllImport in .NET 6.0
* Fix backport
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)"
This reverts commit f2db6d6.
* Define TARGET_LINUX
---------
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/emsdk dotnet/ic…
0061000
…u dotnet/msquic dotnet/runtime-assets (#84146)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
* Update dependencies from https://github.com/dotnet/icu build 20230320.3
Microsoft.NETCore.Runtime.ICU.Transport
From Version 6.0.0-rtm.22108.1 -> To Version 6.0.0-rtm.23170.3
* Update dependencies from https://github.com/dotnet/msquic build 20220405.1
System.Net.MsQuic.Transport
From Version 6.0.0-preview.7.21417.1 -> To Version 6.0.0-servicing.22205.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.5
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
From Version 6.0.0-beta.21518.1 -> To Version 6.0.0-beta.23179.5
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@cston@ericstj
[release/6.0] SyntaxValueProvider: avoid performance issue with synta…
2b36dbe
…x list containing many items (#83742)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/emsdkbuild 202304…
ac2bdf7
…05.2 (#84359)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.16 -> To Version 6.0.17
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@tarekgh
[release/6.0-staging] Fix Ordinal Ignore Case string compare (#84386)
d619619
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@ericstj
[release/6.0] Fix pinned assembly version 6.0 (#84357)
3c935ba
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing.
As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect.
Please find the full list of impacted assemblies below:
- System.ComponentModel.Composition
- System.DirectoryServices
- System.DirectoryServices.AccountManagement
- System.DirectoryServices.Protocols
- System.Management
- System.Reflection.Context
- System.Runtime.Caching
- System.Speech
For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing.
* Enable System.Management and System.DirectoryServices.Protocols in servicing
* Address feedback
@carlossanlop
Merge branch 'release/6.0-staging' into release60
ce8b485
@carlossanlop
Merge pull request#84460from carlossanlop/release60
b412149
[manual] Merge branch 'release/6.0' => 'release/6.0-staging'
@kotlarmilos
Disable failing tests (#84475)
c885ca4
Disables the failing tests for hardware intrinsics on Mono llvmaot linux arm64.
@steveisokSteve Pfister
[release/6.0][Android] Free up more disk space on CI builds (#84568)
5601390
backport of #84354
The android builds are running out of disk space when building the library test apps. This change tries to recoup some of that space by deleting artifacts after each test was built.
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop
[6.0] Reset OOB packages from 6.0.16 (#84342)
3824c52
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlopcarlossanlop
added

Servicing-approved
Approved for servicing release
area-codeflow
for labeling automated codeflow
labels
Apr 11, 2023
@carlossanlopcarlossanlop
added this to the 6.0.16 milestone
Apr 11, 2023
@carlossanlopcarlossanlop
self-assigned this
Apr 11, 2023
@carlossanlopcarlossanlop
modified the milestones:
6.0.16, 6.0.17Apr 11, 2023

This was referenced Apr 11, 2023

Open


Closed

@carlossanlop
carlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

ContributorAuthor
All failures known.
@carlossanlop
carlossanlop
merged commit 300ceb8
into
dotnet:release/6.0Apr 11, 2023
@carlossanlop
carlossanlop
deleted the

release/6.0-staging

branch
April 11, 2023 04:14
@ghostghost
locked as resolved and limited conversation to collaborators
May 11, 2023
@rbhandarbhanda
modified the milestones:
6.0.17, 6.0.18Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@hoyosjshoyosjshoyosjs approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok
@jeffhandleyjeffhandleyAwaiting requested review from jeffhandley
@mmitchemmitcheAwaiting requested review from mmitche
@vargazvargazAwaiting requested review from vargaz
@lambdageeklambdageekAwaiting requested review from lambdageeklambdageek is a code owner
@thaystgthaystgAwaiting requested review from thaystgthaystg is a code owner
@stevehartersteveharterAwaiting requested review from steveharter
@layomialayomiaAwaiting requested review from layomia
@eiriktsarpaliseiriktsarpalisAwaiting requested review from eiriktsarpaliseiriktsarpalis is a code owner

Assignees

@carlossanlopcarlossanlop

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects


None yet


Milestone

6.0.18

Development

Successfully merging this pull request may close these issues.

7 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@simonrozsival@ericstj@kotlarmilos

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' by carlossanlop · Pull Request #84593 · dotnet/runtime · GitHub
Skip to content
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' - #84593
Merged
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Apr 11, 2023
Merged
[manual] Merge branch 'release/6.0-staging' => 'release/6.0'#84593
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Conversation
@carlossanlop
@carlossanlopcarlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

Contributor
Important: Use Merge commit.
Snapped from my fork to prevent unexpected merges in staging branch to flow here.
carlossanlopand others
added 19 commits
March 28, 2023 11:18
@carlossanlop
[6.0] Update backport template and servicing docs (#84008)
2abcd03
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
Create action to check service label (#84045)
b0597d9
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
[6.0] Avoid using spanish helix queues (#83748)
5ebd798
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@steveisokSteve Pfister
[release/6.0] Bump to new OSX 13 AppleTV queue (#83728)
e0f49f8
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@steveisokSteve Pfister
[release/6.0] Disable more unsupported runtime tests (#83731)
f32611f
These tests require precise GC, which mono does not support. Upstream disabled them, so following up here.
Contributes to #83424
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop@tarekgh
Fix Iran time zone test case (#84057)
dfa540c
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@github-actions@hoyosjs
Update check-service-labels to trigger on branch edit (#84107)
fc32833
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
@github-actions@lambdageek
[release/6.0] [mono] Use unsigned char when computing UTF8 string has…
0254cce
…hes (#83303)
* [mono] Use `unsigned char` when computing UTF8 string hashes
The C standard does not specify whether `char` is signed or unsigned,
it is implementation defined.
Apparently Android aarch64 makes a different choice than other
platforms (at least macOS arm64 and Windows x64 give different
results).
Mono uses `mono_metadata_str_hash` in the AOT compiler and AOT runtime
to optimize class name lookup. As a result, classes whose names
include UTF-8 continuation bytes (with the high bit = 1) will hash
differently in the AOT compiler and on the device.
Fixes#82187Fixes#78638
* Add regression test
---------
Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
@simonrozsival@dotnet-maestro
@am11@adamsitnik@jeffhandley
[release/6.0] Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589…
cfa7b27
…) (#83965)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589)
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>
* Replace LibraryImport with DllImport in .NET 6.0
* Fix backport
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)"
This reverts commit f2db6d6.
* Define TARGET_LINUX
---------
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/emsdk dotnet/ic…
0061000
…u dotnet/msquic dotnet/runtime-assets (#84146)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
* Update dependencies from https://github.com/dotnet/icu build 20230320.3
Microsoft.NETCore.Runtime.ICU.Transport
From Version 6.0.0-rtm.22108.1 -> To Version 6.0.0-rtm.23170.3
* Update dependencies from https://github.com/dotnet/msquic build 20220405.1
System.Net.MsQuic.Transport
From Version 6.0.0-preview.7.21417.1 -> To Version 6.0.0-servicing.22205.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.5
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
From Version 6.0.0-beta.21518.1 -> To Version 6.0.0-beta.23179.5
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@cston@ericstj
[release/6.0] SyntaxValueProvider: avoid performance issue with synta…
2b36dbe
…x list containing many items (#83742)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/emsdkbuild 202304…
ac2bdf7
…05.2 (#84359)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.16 -> To Version 6.0.17
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@tarekgh
[release/6.0-staging] Fix Ordinal Ignore Case string compare (#84386)
d619619
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@ericstj
[release/6.0] Fix pinned assembly version 6.0 (#84357)
3c935ba
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing.
As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect.
Please find the full list of impacted assemblies below:
- System.ComponentModel.Composition
- System.DirectoryServices
- System.DirectoryServices.AccountManagement
- System.DirectoryServices.Protocols
- System.Management
- System.Reflection.Context
- System.Runtime.Caching
- System.Speech
For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing.
* Enable System.Management and System.DirectoryServices.Protocols in servicing
* Address feedback
@carlossanlop
Merge branch 'release/6.0-staging' into release60
ce8b485
@carlossanlop
Merge pull request#84460from carlossanlop/release60
b412149
[manual] Merge branch 'release/6.0' => 'release/6.0-staging'
@kotlarmilos
Disable failing tests (#84475)
c885ca4
Disables the failing tests for hardware intrinsics on Mono llvmaot linux arm64.
@steveisokSteve Pfister
[release/6.0][Android] Free up more disk space on CI builds (#84568)
5601390
backport of #84354
The android builds are running out of disk space when building the library test apps. This change tries to recoup some of that space by deleting artifacts after each test was built.
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop
[6.0] Reset OOB packages from 6.0.16 (#84342)
3824c52
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlopcarlossanlop
added

Servicing-approved
Approved for servicing release
area-codeflow
for labeling automated codeflow
labels
Apr 11, 2023
@carlossanlopcarlossanlop
added this to the 6.0.16 milestone
Apr 11, 2023
@carlossanlopcarlossanlop
self-assigned this
Apr 11, 2023
@carlossanlopcarlossanlop
modified the milestones:
6.0.16, 6.0.17Apr 11, 2023

This was referenced Apr 11, 2023

Open


Closed

@carlossanlop
carlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

ContributorAuthor
All failures known.
@carlossanlop
carlossanlop
merged commit 300ceb8
into
dotnet:release/6.0Apr 11, 2023
@carlossanlop
carlossanlop
deleted the

release/6.0-staging

branch
April 11, 2023 04:14
@ghostghost
locked as resolved and limited conversation to collaborators
May 11, 2023
@rbhandarbhanda
modified the milestones:
6.0.17, 6.0.18Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@hoyosjshoyosjshoyosjs approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok
@jeffhandleyjeffhandleyAwaiting requested review from jeffhandley
@mmitchemmitcheAwaiting requested review from mmitche
@vargazvargazAwaiting requested review from vargaz
@lambdageeklambdageekAwaiting requested review from lambdageeklambdageek is a code owner
@thaystgthaystgAwaiting requested review from thaystgthaystg is a code owner
@stevehartersteveharterAwaiting requested review from steveharter
@layomialayomiaAwaiting requested review from layomia
@eiriktsarpaliseiriktsarpalisAwaiting requested review from eiriktsarpaliseiriktsarpalis is a code owner

Assignees

@carlossanlopcarlossanlop

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects


None yet


Milestone

6.0.18

Development

Successfully merging this pull request may close these issues.

7 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@simonrozsival@ericstj@kotlarmilos

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', '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('^' + ".*" + '
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' by carlossanlop · Pull Request #84593 · dotnet/runtime · GitHub
Skip to content
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' - #84593
Merged
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Apr 11, 2023
Merged
[manual] Merge branch 'release/6.0-staging' => 'release/6.0'#84593
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Conversation
@carlossanlop
@carlossanlopcarlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

Contributor
Important: Use Merge commit.
Snapped from my fork to prevent unexpected merges in staging branch to flow here.
carlossanlopand others
added 19 commits
March 28, 2023 11:18
@carlossanlop
[6.0] Update backport template and servicing docs (#84008)
2abcd03
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
Create action to check service label (#84045)
b0597d9
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
[6.0] Avoid using spanish helix queues (#83748)
5ebd798
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@steveisokSteve Pfister
[release/6.0] Bump to new OSX 13 AppleTV queue (#83728)
e0f49f8
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@steveisokSteve Pfister
[release/6.0] Disable more unsupported runtime tests (#83731)
f32611f
These tests require precise GC, which mono does not support. Upstream disabled them, so following up here.
Contributes to #83424
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop@tarekgh
Fix Iran time zone test case (#84057)
dfa540c
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@github-actions@hoyosjs
Update check-service-labels to trigger on branch edit (#84107)
fc32833
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
@github-actions@lambdageek
[release/6.0] [mono] Use unsigned char when computing UTF8 string has…
0254cce
…hes (#83303)
* [mono] Use `unsigned char` when computing UTF8 string hashes
The C standard does not specify whether `char` is signed or unsigned,
it is implementation defined.
Apparently Android aarch64 makes a different choice than other
platforms (at least macOS arm64 and Windows x64 give different
results).
Mono uses `mono_metadata_str_hash` in the AOT compiler and AOT runtime
to optimize class name lookup. As a result, classes whose names
include UTF-8 continuation bytes (with the high bit = 1) will hash
differently in the AOT compiler and on the device.
Fixes#82187Fixes#78638
* Add regression test
---------
Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
@simonrozsival@dotnet-maestro
@am11@adamsitnik@jeffhandley
[release/6.0] Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589…
cfa7b27
…) (#83965)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589)
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>
* Replace LibraryImport with DllImport in .NET 6.0
* Fix backport
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)"
This reverts commit f2db6d6.
* Define TARGET_LINUX
---------
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/emsdk dotnet/ic…
0061000
…u dotnet/msquic dotnet/runtime-assets (#84146)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
* Update dependencies from https://github.com/dotnet/icu build 20230320.3
Microsoft.NETCore.Runtime.ICU.Transport
From Version 6.0.0-rtm.22108.1 -> To Version 6.0.0-rtm.23170.3
* Update dependencies from https://github.com/dotnet/msquic build 20220405.1
System.Net.MsQuic.Transport
From Version 6.0.0-preview.7.21417.1 -> To Version 6.0.0-servicing.22205.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.5
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
From Version 6.0.0-beta.21518.1 -> To Version 6.0.0-beta.23179.5
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@cston@ericstj
[release/6.0] SyntaxValueProvider: avoid performance issue with synta…
2b36dbe
…x list containing many items (#83742)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/emsdkbuild 202304…
ac2bdf7
…05.2 (#84359)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.16 -> To Version 6.0.17
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@tarekgh
[release/6.0-staging] Fix Ordinal Ignore Case string compare (#84386)
d619619
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@ericstj
[release/6.0] Fix pinned assembly version 6.0 (#84357)
3c935ba
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing.
As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect.
Please find the full list of impacted assemblies below:
- System.ComponentModel.Composition
- System.DirectoryServices
- System.DirectoryServices.AccountManagement
- System.DirectoryServices.Protocols
- System.Management
- System.Reflection.Context
- System.Runtime.Caching
- System.Speech
For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing.
* Enable System.Management and System.DirectoryServices.Protocols in servicing
* Address feedback
@carlossanlop
Merge branch 'release/6.0-staging' into release60
ce8b485
@carlossanlop
Merge pull request#84460from carlossanlop/release60
b412149
[manual] Merge branch 'release/6.0' => 'release/6.0-staging'
@kotlarmilos
Disable failing tests (#84475)
c885ca4
Disables the failing tests for hardware intrinsics on Mono llvmaot linux arm64.
@steveisokSteve Pfister
[release/6.0][Android] Free up more disk space on CI builds (#84568)
5601390
backport of #84354
The android builds are running out of disk space when building the library test apps. This change tries to recoup some of that space by deleting artifacts after each test was built.
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop
[6.0] Reset OOB packages from 6.0.16 (#84342)
3824c52
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlopcarlossanlop
added

Servicing-approved
Approved for servicing release
area-codeflow
for labeling automated codeflow
labels
Apr 11, 2023
@carlossanlopcarlossanlop
added this to the 6.0.16 milestone
Apr 11, 2023
@carlossanlopcarlossanlop
self-assigned this
Apr 11, 2023
@carlossanlopcarlossanlop
modified the milestones:
6.0.16, 6.0.17Apr 11, 2023

This was referenced Apr 11, 2023

Open


Closed

@carlossanlop
carlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

ContributorAuthor
All failures known.
@carlossanlop
carlossanlop
merged commit 300ceb8
into
dotnet:release/6.0Apr 11, 2023
@carlossanlop
carlossanlop
deleted the

release/6.0-staging

branch
April 11, 2023 04:14
@ghostghost
locked as resolved and limited conversation to collaborators
May 11, 2023
@rbhandarbhanda
modified the milestones:
6.0.17, 6.0.18Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@hoyosjshoyosjshoyosjs approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok
@jeffhandleyjeffhandleyAwaiting requested review from jeffhandley
@mmitchemmitcheAwaiting requested review from mmitche
@vargazvargazAwaiting requested review from vargaz
@lambdageeklambdageekAwaiting requested review from lambdageeklambdageek is a code owner
@thaystgthaystgAwaiting requested review from thaystgthaystg is a code owner
@stevehartersteveharterAwaiting requested review from steveharter
@layomialayomiaAwaiting requested review from layomia
@eiriktsarpaliseiriktsarpalisAwaiting requested review from eiriktsarpaliseiriktsarpalis is a code owner

Assignees

@carlossanlopcarlossanlop

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects


None yet


Milestone

6.0.18

Development

Successfully merging this pull request may close these issues.

7 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@simonrozsival@ericstj@kotlarmilos

, '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" + '
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' by carlossanlop · Pull Request #84593 · dotnet/runtime · GitHub
Skip to content
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' - #84593
Merged
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Apr 11, 2023
Merged
[manual] Merge branch 'release/6.0-staging' => 'release/6.0'#84593
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Conversation
@carlossanlop
@carlossanlopcarlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

Contributor
Important: Use Merge commit.
Snapped from my fork to prevent unexpected merges in staging branch to flow here.
carlossanlopand others
added 19 commits
March 28, 2023 11:18
@carlossanlop
[6.0] Update backport template and servicing docs (#84008)
2abcd03
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
Create action to check service label (#84045)
b0597d9
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
[6.0] Avoid using spanish helix queues (#83748)
5ebd798
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@steveisokSteve Pfister
[release/6.0] Bump to new OSX 13 AppleTV queue (#83728)
e0f49f8
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@steveisokSteve Pfister
[release/6.0] Disable more unsupported runtime tests (#83731)
f32611f
These tests require precise GC, which mono does not support. Upstream disabled them, so following up here.
Contributes to #83424
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop@tarekgh
Fix Iran time zone test case (#84057)
dfa540c
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@github-actions@hoyosjs
Update check-service-labels to trigger on branch edit (#84107)
fc32833
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
@github-actions@lambdageek
[release/6.0] [mono] Use unsigned char when computing UTF8 string has…
0254cce
…hes (#83303)
* [mono] Use `unsigned char` when computing UTF8 string hashes
The C standard does not specify whether `char` is signed or unsigned,
it is implementation defined.
Apparently Android aarch64 makes a different choice than other
platforms (at least macOS arm64 and Windows x64 give different
results).
Mono uses `mono_metadata_str_hash` in the AOT compiler and AOT runtime
to optimize class name lookup. As a result, classes whose names
include UTF-8 continuation bytes (with the high bit = 1) will hash
differently in the AOT compiler and on the device.
Fixes#82187Fixes#78638
* Add regression test
---------
Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
@simonrozsival@dotnet-maestro
@am11@adamsitnik@jeffhandley
[release/6.0] Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589…
cfa7b27
…) (#83965)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589)
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>
* Replace LibraryImport with DllImport in .NET 6.0
* Fix backport
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)"
This reverts commit f2db6d6.
* Define TARGET_LINUX
---------
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/emsdk dotnet/ic…
0061000
…u dotnet/msquic dotnet/runtime-assets (#84146)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
* Update dependencies from https://github.com/dotnet/icu build 20230320.3
Microsoft.NETCore.Runtime.ICU.Transport
From Version 6.0.0-rtm.22108.1 -> To Version 6.0.0-rtm.23170.3
* Update dependencies from https://github.com/dotnet/msquic build 20220405.1
System.Net.MsQuic.Transport
From Version 6.0.0-preview.7.21417.1 -> To Version 6.0.0-servicing.22205.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.5
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
From Version 6.0.0-beta.21518.1 -> To Version 6.0.0-beta.23179.5
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@cston@ericstj
[release/6.0] SyntaxValueProvider: avoid performance issue with synta…
2b36dbe
…x list containing many items (#83742)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/emsdkbuild 202304…
ac2bdf7
…05.2 (#84359)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.16 -> To Version 6.0.17
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@tarekgh
[release/6.0-staging] Fix Ordinal Ignore Case string compare (#84386)
d619619
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@ericstj
[release/6.0] Fix pinned assembly version 6.0 (#84357)
3c935ba
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing.
As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect.
Please find the full list of impacted assemblies below:
- System.ComponentModel.Composition
- System.DirectoryServices
- System.DirectoryServices.AccountManagement
- System.DirectoryServices.Protocols
- System.Management
- System.Reflection.Context
- System.Runtime.Caching
- System.Speech
For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing.
* Enable System.Management and System.DirectoryServices.Protocols in servicing
* Address feedback
@carlossanlop
Merge branch 'release/6.0-staging' into release60
ce8b485
@carlossanlop
Merge pull request#84460from carlossanlop/release60
b412149
[manual] Merge branch 'release/6.0' => 'release/6.0-staging'
@kotlarmilos
Disable failing tests (#84475)
c885ca4
Disables the failing tests for hardware intrinsics on Mono llvmaot linux arm64.
@steveisokSteve Pfister
[release/6.0][Android] Free up more disk space on CI builds (#84568)
5601390
backport of #84354
The android builds are running out of disk space when building the library test apps. This change tries to recoup some of that space by deleting artifacts after each test was built.
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop
[6.0] Reset OOB packages from 6.0.16 (#84342)
3824c52
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlopcarlossanlop
added

Servicing-approved
Approved for servicing release
area-codeflow
for labeling automated codeflow
labels
Apr 11, 2023
@carlossanlopcarlossanlop
added this to the 6.0.16 milestone
Apr 11, 2023
@carlossanlopcarlossanlop
self-assigned this
Apr 11, 2023
@carlossanlopcarlossanlop
modified the milestones:
6.0.16, 6.0.17Apr 11, 2023

This was referenced Apr 11, 2023

Open


Closed

@carlossanlop
carlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

ContributorAuthor
All failures known.
@carlossanlop
carlossanlop
merged commit 300ceb8
into
dotnet:release/6.0Apr 11, 2023
@carlossanlop
carlossanlop
deleted the

release/6.0-staging

branch
April 11, 2023 04:14
@ghostghost
locked as resolved and limited conversation to collaborators
May 11, 2023
@rbhandarbhanda
modified the milestones:
6.0.17, 6.0.18Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@hoyosjshoyosjshoyosjs approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok
@jeffhandleyjeffhandleyAwaiting requested review from jeffhandley
@mmitchemmitcheAwaiting requested review from mmitche
@vargazvargazAwaiting requested review from vargaz
@lambdageeklambdageekAwaiting requested review from lambdageeklambdageek is a code owner
@thaystgthaystgAwaiting requested review from thaystgthaystg is a code owner
@stevehartersteveharterAwaiting requested review from steveharter
@layomialayomiaAwaiting requested review from layomia
@eiriktsarpaliseiriktsarpalisAwaiting requested review from eiriktsarpaliseiriktsarpalis is a code owner

Assignees

@carlossanlopcarlossanlop

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects


None yet


Milestone

6.0.18

Development

Successfully merging this pull request may close these issues.

7 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@simonrozsival@ericstj@kotlarmilos

, '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('^' + ".*" + '
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' by carlossanlop · Pull Request #84593 · dotnet/runtime · GitHub
Skip to content
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' - #84593
Merged
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Apr 11, 2023
Merged
[manual] Merge branch 'release/6.0-staging' => 'release/6.0'#84593
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Conversation
@carlossanlop
@carlossanlopcarlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

Contributor
Important: Use Merge commit.
Snapped from my fork to prevent unexpected merges in staging branch to flow here.
carlossanlopand others
added 19 commits
March 28, 2023 11:18
@carlossanlop
[6.0] Update backport template and servicing docs (#84008)
2abcd03
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
Create action to check service label (#84045)
b0597d9
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
[6.0] Avoid using spanish helix queues (#83748)
5ebd798
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@steveisokSteve Pfister
[release/6.0] Bump to new OSX 13 AppleTV queue (#83728)
e0f49f8
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@steveisokSteve Pfister
[release/6.0] Disable more unsupported runtime tests (#83731)
f32611f
These tests require precise GC, which mono does not support. Upstream disabled them, so following up here.
Contributes to #83424
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop@tarekgh
Fix Iran time zone test case (#84057)
dfa540c
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@github-actions@hoyosjs
Update check-service-labels to trigger on branch edit (#84107)
fc32833
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
@github-actions@lambdageek
[release/6.0] [mono] Use unsigned char when computing UTF8 string has…
0254cce
…hes (#83303)
* [mono] Use `unsigned char` when computing UTF8 string hashes
The C standard does not specify whether `char` is signed or unsigned,
it is implementation defined.
Apparently Android aarch64 makes a different choice than other
platforms (at least macOS arm64 and Windows x64 give different
results).
Mono uses `mono_metadata_str_hash` in the AOT compiler and AOT runtime
to optimize class name lookup. As a result, classes whose names
include UTF-8 continuation bytes (with the high bit = 1) will hash
differently in the AOT compiler and on the device.
Fixes#82187Fixes#78638
* Add regression test
---------
Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
@simonrozsival@dotnet-maestro
@am11@adamsitnik@jeffhandley
[release/6.0] Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589…
cfa7b27
…) (#83965)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589)
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>
* Replace LibraryImport with DllImport in .NET 6.0
* Fix backport
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)"
This reverts commit f2db6d6.
* Define TARGET_LINUX
---------
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/emsdk dotnet/ic…
0061000
…u dotnet/msquic dotnet/runtime-assets (#84146)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
* Update dependencies from https://github.com/dotnet/icu build 20230320.3
Microsoft.NETCore.Runtime.ICU.Transport
From Version 6.0.0-rtm.22108.1 -> To Version 6.0.0-rtm.23170.3
* Update dependencies from https://github.com/dotnet/msquic build 20220405.1
System.Net.MsQuic.Transport
From Version 6.0.0-preview.7.21417.1 -> To Version 6.0.0-servicing.22205.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.5
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
From Version 6.0.0-beta.21518.1 -> To Version 6.0.0-beta.23179.5
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@cston@ericstj
[release/6.0] SyntaxValueProvider: avoid performance issue with synta…
2b36dbe
…x list containing many items (#83742)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/emsdkbuild 202304…
ac2bdf7
…05.2 (#84359)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.16 -> To Version 6.0.17
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@tarekgh
[release/6.0-staging] Fix Ordinal Ignore Case string compare (#84386)
d619619
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@ericstj
[release/6.0] Fix pinned assembly version 6.0 (#84357)
3c935ba
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing.
As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect.
Please find the full list of impacted assemblies below:
- System.ComponentModel.Composition
- System.DirectoryServices
- System.DirectoryServices.AccountManagement
- System.DirectoryServices.Protocols
- System.Management
- System.Reflection.Context
- System.Runtime.Caching
- System.Speech
For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing.
* Enable System.Management and System.DirectoryServices.Protocols in servicing
* Address feedback
@carlossanlop
Merge branch 'release/6.0-staging' into release60
ce8b485
@carlossanlop
Merge pull request#84460from carlossanlop/release60
b412149
[manual] Merge branch 'release/6.0' => 'release/6.0-staging'
@kotlarmilos
Disable failing tests (#84475)
c885ca4
Disables the failing tests for hardware intrinsics on Mono llvmaot linux arm64.
@steveisokSteve Pfister
[release/6.0][Android] Free up more disk space on CI builds (#84568)
5601390
backport of #84354
The android builds are running out of disk space when building the library test apps. This change tries to recoup some of that space by deleting artifacts after each test was built.
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop
[6.0] Reset OOB packages from 6.0.16 (#84342)
3824c52
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlopcarlossanlop
added

Servicing-approved
Approved for servicing release
area-codeflow
for labeling automated codeflow
labels
Apr 11, 2023
@carlossanlopcarlossanlop
added this to the 6.0.16 milestone
Apr 11, 2023
@carlossanlopcarlossanlop
self-assigned this
Apr 11, 2023
@carlossanlopcarlossanlop
modified the milestones:
6.0.16, 6.0.17Apr 11, 2023

This was referenced Apr 11, 2023

Open


Closed

@carlossanlop
carlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

ContributorAuthor
All failures known.
@carlossanlop
carlossanlop
merged commit 300ceb8
into
dotnet:release/6.0Apr 11, 2023
@carlossanlop
carlossanlop
deleted the

release/6.0-staging

branch
April 11, 2023 04:14
@ghostghost
locked as resolved and limited conversation to collaborators
May 11, 2023
@rbhandarbhanda
modified the milestones:
6.0.17, 6.0.18Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@hoyosjshoyosjshoyosjs approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok
@jeffhandleyjeffhandleyAwaiting requested review from jeffhandley
@mmitchemmitcheAwaiting requested review from mmitche
@vargazvargazAwaiting requested review from vargaz
@lambdageeklambdageekAwaiting requested review from lambdageeklambdageek is a code owner
@thaystgthaystgAwaiting requested review from thaystgthaystg is a code owner
@stevehartersteveharterAwaiting requested review from steveharter
@layomialayomiaAwaiting requested review from layomia
@eiriktsarpaliseiriktsarpalisAwaiting requested review from eiriktsarpaliseiriktsarpalis is a code owner

Assignees

@carlossanlopcarlossanlop

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects


None yet


Milestone

6.0.18

Development

Successfully merging this pull request may close these issues.

7 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@simonrozsival@ericstj@kotlarmilos

, '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); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' by carlossanlop · Pull Request #84593 · dotnet/runtime · GitHub
Skip to content
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' - #84593
Merged
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Apr 11, 2023
Merged
[manual] Merge branch 'release/6.0-staging' => 'release/6.0'#84593
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Conversation
@carlossanlop
@carlossanlopcarlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

Contributor
Important: Use Merge commit.
Snapped from my fork to prevent unexpected merges in staging branch to flow here.
carlossanlopand others
added 19 commits
March 28, 2023 11:18
@carlossanlop
[6.0] Update backport template and servicing docs (#84008)
2abcd03
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
Create action to check service label (#84045)
b0597d9
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
[6.0] Avoid using spanish helix queues (#83748)
5ebd798
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@steveisokSteve Pfister
[release/6.0] Bump to new OSX 13 AppleTV queue (#83728)
e0f49f8
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@steveisokSteve Pfister
[release/6.0] Disable more unsupported runtime tests (#83731)
f32611f
These tests require precise GC, which mono does not support. Upstream disabled them, so following up here.
Contributes to #83424
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop@tarekgh
Fix Iran time zone test case (#84057)
dfa540c
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@github-actions@hoyosjs
Update check-service-labels to trigger on branch edit (#84107)
fc32833
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
@github-actions@lambdageek
[release/6.0] [mono] Use unsigned char when computing UTF8 string has…
0254cce
…hes (#83303)
* [mono] Use `unsigned char` when computing UTF8 string hashes
The C standard does not specify whether `char` is signed or unsigned,
it is implementation defined.
Apparently Android aarch64 makes a different choice than other
platforms (at least macOS arm64 and Windows x64 give different
results).
Mono uses `mono_metadata_str_hash` in the AOT compiler and AOT runtime
to optimize class name lookup. As a result, classes whose names
include UTF-8 continuation bytes (with the high bit = 1) will hash
differently in the AOT compiler and on the device.
Fixes#82187Fixes#78638
* Add regression test
---------
Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
@simonrozsival@dotnet-maestro
@am11@adamsitnik@jeffhandley
[release/6.0] Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589…
cfa7b27
…) (#83965)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589)
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>
* Replace LibraryImport with DllImport in .NET 6.0
* Fix backport
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)"
This reverts commit f2db6d6.
* Define TARGET_LINUX
---------
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/emsdk dotnet/ic…
0061000
…u dotnet/msquic dotnet/runtime-assets (#84146)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
* Update dependencies from https://github.com/dotnet/icu build 20230320.3
Microsoft.NETCore.Runtime.ICU.Transport
From Version 6.0.0-rtm.22108.1 -> To Version 6.0.0-rtm.23170.3
* Update dependencies from https://github.com/dotnet/msquic build 20220405.1
System.Net.MsQuic.Transport
From Version 6.0.0-preview.7.21417.1 -> To Version 6.0.0-servicing.22205.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.5
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
From Version 6.0.0-beta.21518.1 -> To Version 6.0.0-beta.23179.5
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@cston@ericstj
[release/6.0] SyntaxValueProvider: avoid performance issue with synta…
2b36dbe
…x list containing many items (#83742)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/emsdkbuild 202304…
ac2bdf7
…05.2 (#84359)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.16 -> To Version 6.0.17
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@tarekgh
[release/6.0-staging] Fix Ordinal Ignore Case string compare (#84386)
d619619
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@ericstj
[release/6.0] Fix pinned assembly version 6.0 (#84357)
3c935ba
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing.
As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect.
Please find the full list of impacted assemblies below:
- System.ComponentModel.Composition
- System.DirectoryServices
- System.DirectoryServices.AccountManagement
- System.DirectoryServices.Protocols
- System.Management
- System.Reflection.Context
- System.Runtime.Caching
- System.Speech
For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing.
* Enable System.Management and System.DirectoryServices.Protocols in servicing
* Address feedback
@carlossanlop
Merge branch 'release/6.0-staging' into release60
ce8b485
@carlossanlop
Merge pull request#84460from carlossanlop/release60
b412149
[manual] Merge branch 'release/6.0' => 'release/6.0-staging'
@kotlarmilos
Disable failing tests (#84475)
c885ca4
Disables the failing tests for hardware intrinsics on Mono llvmaot linux arm64.
@steveisokSteve Pfister
[release/6.0][Android] Free up more disk space on CI builds (#84568)
5601390
backport of #84354
The android builds are running out of disk space when building the library test apps. This change tries to recoup some of that space by deleting artifacts after each test was built.
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop
[6.0] Reset OOB packages from 6.0.16 (#84342)
3824c52
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlopcarlossanlop
added

Servicing-approved
Approved for servicing release
area-codeflow
for labeling automated codeflow
labels
Apr 11, 2023
@carlossanlopcarlossanlop
added this to the 6.0.16 milestone
Apr 11, 2023
@carlossanlopcarlossanlop
self-assigned this
Apr 11, 2023
@carlossanlopcarlossanlop
modified the milestones:
6.0.16, 6.0.17Apr 11, 2023

This was referenced Apr 11, 2023

Open


Closed

@carlossanlop
carlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

ContributorAuthor
All failures known.
@carlossanlop
carlossanlop
merged commit 300ceb8
into
dotnet:release/6.0Apr 11, 2023
@carlossanlop
carlossanlop
deleted the

release/6.0-staging

branch
April 11, 2023 04:14
@ghostghost
locked as resolved and limited conversation to collaborators
May 11, 2023
@rbhandarbhanda
modified the milestones:
6.0.17, 6.0.18Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@hoyosjshoyosjshoyosjs approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok
@jeffhandleyjeffhandleyAwaiting requested review from jeffhandley
@mmitchemmitcheAwaiting requested review from mmitche
@vargazvargazAwaiting requested review from vargaz
@lambdageeklambdageekAwaiting requested review from lambdageeklambdageek is a code owner
@thaystgthaystgAwaiting requested review from thaystgthaystg is a code owner
@stevehartersteveharterAwaiting requested review from steveharter
@layomialayomiaAwaiting requested review from layomia
@eiriktsarpaliseiriktsarpalisAwaiting requested review from eiriktsarpaliseiriktsarpalis is a code owner

Assignees

@carlossanlopcarlossanlop

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects


None yet


Milestone

6.0.18

Development

Successfully merging this pull request may close these issues.

7 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@simonrozsival@ericstj@kotlarmilos

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' by carlossanlop · Pull Request #84593 · dotnet/runtime · GitHub
Skip to content
[manual] Merge branch 'release/6.0-staging' => 'release/6.0' - #84593
Merged
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Apr 11, 2023
Merged
[manual] Merge branch 'release/6.0-staging' => 'release/6.0'#84593
carlossanlop merged 19 commits into
dotnet:release/6.0from 
carlossanlop:release/6.0-staging
Conversation
@carlossanlop
@carlossanlopcarlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

Contributor
Important: Use Merge commit.
Snapped from my fork to prevent unexpected merges in staging branch to flow here.
carlossanlopand others
added 19 commits
March 28, 2023 11:18
@carlossanlop
[6.0] Update backport template and servicing docs (#84008)
2abcd03
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
Create action to check service label (#84045)
b0597d9
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlop
[6.0] Avoid using spanish helix queues (#83748)
5ebd798
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@steveisokSteve Pfister
[release/6.0] Bump to new OSX 13 AppleTV queue (#83728)
e0f49f8
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@steveisokSteve Pfister
[release/6.0] Disable more unsupported runtime tests (#83731)
f32611f
These tests require precise GC, which mono does not support. Upstream disabled them, so following up here.
Contributes to #83424
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop@tarekgh
Fix Iran time zone test case (#84057)
dfa540c
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@github-actions@hoyosjs
Update check-service-labels to trigger on branch edit (#84107)
fc32833
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
@github-actions@lambdageek
[release/6.0] [mono] Use unsigned char when computing UTF8 string has…
0254cce
…hes (#83303)
* [mono] Use `unsigned char` when computing UTF8 string hashes
The C standard does not specify whether `char` is signed or unsigned,
it is implementation defined.
Apparently Android aarch64 makes a different choice than other
platforms (at least macOS arm64 and Windows x64 give different
results).
Mono uses `mono_metadata_str_hash` in the AOT compiler and AOT runtime
to optimize class name lookup. As a result, classes whose names
include UTF-8 continuation bytes (with the high bit = 1) will hash
differently in the AOT compiler and on the device.
Fixes#82187Fixes#78638
* Add regression test
---------
Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
@simonrozsival@dotnet-maestro
@am11@adamsitnik@jeffhandley
[release/6.0] Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589…
cfa7b27
…) (#83965)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Use CLOCK_BOOTTIME to calculate BootTime on linux (#67589)
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>
* Replace LibraryImport with DllImport in .NET 6.0
* Fix backport
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857)"
This reverts commit f2db6d6.
* Define TARGET_LINUX
---------
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/emsdk dotnet/ic…
0061000
…u dotnet/msquic dotnet/runtime-assets (#84146)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.2
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.15 -> To Version 6.0.16
* Update dependencies from https://github.com/dotnet/icu build 20230320.3
Microsoft.NETCore.Runtime.ICU.Transport
From Version 6.0.0-rtm.22108.1 -> To Version 6.0.0-rtm.23170.3
* Update dependencies from https://github.com/dotnet/msquic build 20220405.1
System.Net.MsQuic.Transport
From Version 6.0.0-preview.7.21417.1 -> To Version 6.0.0-servicing.22205.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.5
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData
From Version 6.0.0-beta.21518.1 -> To Version 6.0.0-beta.23179.5
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@cston@ericstj
[release/6.0] SyntaxValueProvider: avoid performance issue with synta…
2b36dbe
…x list containing many items (#83742)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dotnet-maestro
Update dependencies fromhttps://github.com/dotnet/emsdkbuild 202304…
ac2bdf7
…05.2 (#84359)
Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
From Version 6.0.16 -> To Version 6.0.17
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions@tarekgh
[release/6.0-staging] Fix Ordinal Ignore Case string compare (#84386)
d619619
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
@ericstj
[release/6.0] Fix pinned assembly version 6.0 (#84357)
3c935ba
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing.
As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect.
Please find the full list of impacted assemblies below:
- System.ComponentModel.Composition
- System.DirectoryServices
- System.DirectoryServices.AccountManagement
- System.DirectoryServices.Protocols
- System.Management
- System.Reflection.Context
- System.Runtime.Caching
- System.Speech
For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing.
* Enable System.Management and System.DirectoryServices.Protocols in servicing
* Address feedback
@carlossanlop
Merge branch 'release/6.0-staging' into release60
ce8b485
@carlossanlop
Merge pull request#84460from carlossanlop/release60
b412149
[manual] Merge branch 'release/6.0' => 'release/6.0-staging'
@kotlarmilos
Disable failing tests (#84475)
c885ca4
Disables the failing tests for hardware intrinsics on Mono llvmaot linux arm64.
@steveisokSteve Pfister
[release/6.0][Android] Free up more disk space on CI builds (#84568)
5601390
backport of #84354
The android builds are running out of disk space when building the library test apps. This change tries to recoup some of that space by deleting artifacts after each test was built.
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@carlossanlop
[6.0] Reset OOB packages from 6.0.16 (#84342)
3824c52
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
@carlossanlopcarlossanlop
added

Servicing-approved
Approved for servicing release
area-codeflow
for labeling automated codeflow
labels
Apr 11, 2023
@carlossanlopcarlossanlop
added this to the 6.0.16 milestone
Apr 11, 2023
@carlossanlopcarlossanlop
self-assigned this
Apr 11, 2023
@carlossanlopcarlossanlop
modified the milestones:
6.0.16, 6.0.17Apr 11, 2023

This was referenced Apr 11, 2023

Open


Closed

@carlossanlop
carlossanlop
commented
Apr 11, 2023

Copy link


Copy Markdown

ContributorAuthor
All failures known.
@carlossanlop
carlossanlop
merged commit 300ceb8
into
dotnet:release/6.0Apr 11, 2023
@carlossanlop
carlossanlop
deleted the

release/6.0-staging

branch
April 11, 2023 04:14
@ghostghost
locked as resolved and limited conversation to collaborators
May 11, 2023
@rbhandarbhanda
modified the milestones:
6.0.17, 6.0.18Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@hoyosjshoyosjshoyosjs approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok
@jeffhandleyjeffhandleyAwaiting requested review from jeffhandley
@mmitchemmitcheAwaiting requested review from mmitche
@vargazvargazAwaiting requested review from vargaz
@lambdageeklambdageekAwaiting requested review from lambdageeklambdageek is a code owner
@thaystgthaystgAwaiting requested review from thaystgthaystg is a code owner
@stevehartersteveharterAwaiting requested review from steveharter
@layomialayomiaAwaiting requested review from layomia
@eiriktsarpaliseiriktsarpalisAwaiting requested review from eiriktsarpaliseiriktsarpalis is a code owner

Assignees

@carlossanlopcarlossanlop

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects


None yet


Milestone

6.0.18

Development

Successfully merging this pull request may close these issues.

7 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@simonrozsival@ericstj@kotlarmilos