[manual] Merge branch 'release/7.0-staging' => 'release/7.0' - #84594

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

[manual] Merge branch 'release/7.0-staging' => 'release/7.0'#84594
carlossanlop merged 32 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

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 30 commits March 28, 2023 10:35
* [7.0] Update backport template and servicing docs
* fix template spacing
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
* disable NTLM tests on RedHat.7
* Package_Unsupported_NTLM
---------
Co-authored-by: wfurt <tweinfurt@yahoo.com>
…ity (#83557)
* Add comment in csprojs of dependencies of M.W.Compat.
* Adjust readme.
* Turn off M.W.C. (reset it), it was built last month.
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
…es (#83302)
* [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
…ringContent #81506 (#83425)
Co-authored-by: Simon Lovely <s.lovely@gmail.com>
…) (#83966)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
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>
* Do no test StartTime in GetProcessesByName test (#75334)
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)"
This reverts commit 6a533c1.
---------
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>
…3414) (#83462)
Backport of #83414 to release/7.0, fixes#83242
When checking that an inner array access is in bounds, we must ensure any outer
access is fully in bounds too. We were checking that `idx < array.Len` but not
that `idx >= 0`.
Use an unsigned compare for this check so we can do both sides with a single
instruction.
Fixes#83242.
)
* Ensure free buffer space when reading TLS messages
* Move buffer expansion outside of the loop to prevent unbounded grow
* Fix failing tests
The initial size is not enough to cover later TLS frames
* Remove unwanted changes
---------
Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
…x list containing many items (#83743)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
#83341)
We are seeing a gen0 region that's almost fully occupied (< 24 bytes free) with one giant plug (ie, no free objects at all in the region).
This causes allocate_in_condemned_generations to go into an infinite loop because in ephemeral generations we expect short plugs,
ie, we should be able to allocate a min free object in front of each plug. And normally we can because when we allocate objects in gen0
we make sure to break up the allocation contexts with min free objects and when we compact into gen1 we form short plugs.
We are in this situation when all of the following conditions are true -
+ we did a gen2 compacting GC that generates a pinned plug in a gen2 region almost as big as the whole region. my guess for the reason why there's this giant pinned plug is because that gen2 region was already really compact so when we called allocate_in_condemned_generations on the non pinned plugs that are next to some pinned plugs in it we discovered we can't move the non pinned plugs anyway so we artificially pinned them and formed a giant pinned plug. and during this GC those objects were no longer pinned so we have one giant non pinned plug.
+ this gen2 region needs to be the last region with pinned plugs;
+ this gen2 region hasn't been consumed by allocate_in_condemned_generations yet so it was processed by process_remaining_regions;
Then in process_remaining_regions we'll set the plan_gen_num for that gen2 region to 0 because we are doing
set_region_plan_gen_num_sip (current_region, current_plan_gen_num);
instead of going through the demotion logic to decide whether we should demote this region or not.
Co-authored-by: Maoni0 <maoni@microsoft.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>
* Fix.
* Applied @pavelsavara's review.
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---------
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>
* Use flag to initilize ilgen, instead of doing it lazily.
* Formatting.
* Improve variable naming.
* Fix condition.
* Updated name in .h file.
* Updated how wasm inits ilgen.
* Updated wasi driver.
---------
Co-authored-by: Nathan Ricci <naricc@microsoft.com>
…squic dotnet/runtime-assets dotnet/emsdk (#84145)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
* Update dependencies from https://github.com/dotnet/linker build 20230315.1
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.22423.4 -> To Version 7.0.100-1.23165.1
* Update dependencies from https://github.com/dotnet/msquic build 20220909.1
System.Net.MsQuic.Transport
From Version 7.0.0-alpha.1.22406.1 -> To Version 7.0.0-alpha.1.22459.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.6
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
From Version 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6
* Update dependencies from https://github.com/dotnet/emsdk build 20230405.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.5 -> To Version 7.0.6
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* 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
[manual] Merge branch 'release/7.0' => 'release/7.0-staging'
…in ClrVirtualAllocWithinRange() (#83958)
* Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange()
Fixes#83818
---------
Co-authored-by: Ilia K <ki.stfu@gmail.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
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>
dotnet-maestroBotand others added 2 commits April 10, 2023 17:48
…407.1 (#84486)
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
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 7.0.6 milestone Apr 11, 2023
@carlossanlopcarlossanlop self-assigned this Apr 11, 2023
@carlossanlop
carlossanlop merged commit a283bb9 into dotnet:release/7.0Apr 11, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch April 11, 2023 04:15
@ghostghost locked as resolved and limited conversation to collaborators May 11, 2023
@rbhandarbhanda modified the milestones: 7.0.6, 7.0.7Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@lambdageek@simonrozsival@AndyAyersMS@ilonatommy@ericstj@VSadov
, '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" + '
Skip to content

[manual] Merge branch 'release/7.0-staging' => 'release/7.0' - #84594

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

[manual] Merge branch 'release/7.0-staging' => 'release/7.0'#84594
carlossanlop merged 32 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

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 30 commits March 28, 2023 10:35
* [7.0] Update backport template and servicing docs
* fix template spacing
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
* disable NTLM tests on RedHat.7
* Package_Unsupported_NTLM
---------
Co-authored-by: wfurt <tweinfurt@yahoo.com>
…ity (#83557)
* Add comment in csprojs of dependencies of M.W.Compat.
* Adjust readme.
* Turn off M.W.C. (reset it), it was built last month.
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
…es (#83302)
* [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
…ringContent #81506 (#83425)
Co-authored-by: Simon Lovely <s.lovely@gmail.com>
…) (#83966)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
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>
* Do no test StartTime in GetProcessesByName test (#75334)
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)"
This reverts commit 6a533c1.
---------
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>
…3414) (#83462)
Backport of #83414 to release/7.0, fixes#83242
When checking that an inner array access is in bounds, we must ensure any outer
access is fully in bounds too. We were checking that `idx < array.Len` but not
that `idx >= 0`.
Use an unsigned compare for this check so we can do both sides with a single
instruction.
Fixes#83242.
)
* Ensure free buffer space when reading TLS messages
* Move buffer expansion outside of the loop to prevent unbounded grow
* Fix failing tests
The initial size is not enough to cover later TLS frames
* Remove unwanted changes
---------
Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
…x list containing many items (#83743)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
#83341)
We are seeing a gen0 region that's almost fully occupied (< 24 bytes free) with one giant plug (ie, no free objects at all in the region).
This causes allocate_in_condemned_generations to go into an infinite loop because in ephemeral generations we expect short plugs,
ie, we should be able to allocate a min free object in front of each plug. And normally we can because when we allocate objects in gen0
we make sure to break up the allocation contexts with min free objects and when we compact into gen1 we form short plugs.
We are in this situation when all of the following conditions are true -
+ we did a gen2 compacting GC that generates a pinned plug in a gen2 region almost as big as the whole region. my guess for the reason why there's this giant pinned plug is because that gen2 region was already really compact so when we called allocate_in_condemned_generations on the non pinned plugs that are next to some pinned plugs in it we discovered we can't move the non pinned plugs anyway so we artificially pinned them and formed a giant pinned plug. and during this GC those objects were no longer pinned so we have one giant non pinned plug.
+ this gen2 region needs to be the last region with pinned plugs;
+ this gen2 region hasn't been consumed by allocate_in_condemned_generations yet so it was processed by process_remaining_regions;
Then in process_remaining_regions we'll set the plan_gen_num for that gen2 region to 0 because we are doing
set_region_plan_gen_num_sip (current_region, current_plan_gen_num);
instead of going through the demotion logic to decide whether we should demote this region or not.
Co-authored-by: Maoni0 <maoni@microsoft.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>
* Fix.
* Applied @pavelsavara's review.
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---------
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>
* Use flag to initilize ilgen, instead of doing it lazily.
* Formatting.
* Improve variable naming.
* Fix condition.
* Updated name in .h file.
* Updated how wasm inits ilgen.
* Updated wasi driver.
---------
Co-authored-by: Nathan Ricci <naricc@microsoft.com>
…squic dotnet/runtime-assets dotnet/emsdk (#84145)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
* Update dependencies from https://github.com/dotnet/linker build 20230315.1
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.22423.4 -> To Version 7.0.100-1.23165.1
* Update dependencies from https://github.com/dotnet/msquic build 20220909.1
System.Net.MsQuic.Transport
From Version 7.0.0-alpha.1.22406.1 -> To Version 7.0.0-alpha.1.22459.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.6
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
From Version 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6
* Update dependencies from https://github.com/dotnet/emsdk build 20230405.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.5 -> To Version 7.0.6
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* 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
[manual] Merge branch 'release/7.0' => 'release/7.0-staging'
…in ClrVirtualAllocWithinRange() (#83958)
* Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange()
Fixes#83818
---------
Co-authored-by: Ilia K <ki.stfu@gmail.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
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>
dotnet-maestroBotand others added 2 commits April 10, 2023 17:48
…407.1 (#84486)
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
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 7.0.6 milestone Apr 11, 2023
@carlossanlopcarlossanlop self-assigned this Apr 11, 2023
@carlossanlop
carlossanlop merged commit a283bb9 into dotnet:release/7.0Apr 11, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch April 11, 2023 04:15
@ghostghost locked as resolved and limited conversation to collaborators May 11, 2023
@rbhandarbhanda modified the milestones: 7.0.6, 7.0.7Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@lambdageek@simonrozsival@AndyAyersMS@ilonatommy@ericstj@VSadov
, '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('^' + ".*" + '
Skip to content

[manual] Merge branch 'release/7.0-staging' => 'release/7.0' - #84594

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

[manual] Merge branch 'release/7.0-staging' => 'release/7.0'#84594
carlossanlop merged 32 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

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 30 commits March 28, 2023 10:35
* [7.0] Update backport template and servicing docs
* fix template spacing
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
* disable NTLM tests on RedHat.7
* Package_Unsupported_NTLM
---------
Co-authored-by: wfurt <tweinfurt@yahoo.com>
…ity (#83557)
* Add comment in csprojs of dependencies of M.W.Compat.
* Adjust readme.
* Turn off M.W.C. (reset it), it was built last month.
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
…es (#83302)
* [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
…ringContent #81506 (#83425)
Co-authored-by: Simon Lovely <s.lovely@gmail.com>
…) (#83966)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
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>
* Do no test StartTime in GetProcessesByName test (#75334)
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)"
This reverts commit 6a533c1.
---------
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>
…3414) (#83462)
Backport of #83414 to release/7.0, fixes#83242
When checking that an inner array access is in bounds, we must ensure any outer
access is fully in bounds too. We were checking that `idx < array.Len` but not
that `idx >= 0`.
Use an unsigned compare for this check so we can do both sides with a single
instruction.
Fixes#83242.
)
* Ensure free buffer space when reading TLS messages
* Move buffer expansion outside of the loop to prevent unbounded grow
* Fix failing tests
The initial size is not enough to cover later TLS frames
* Remove unwanted changes
---------
Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
…x list containing many items (#83743)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
#83341)
We are seeing a gen0 region that's almost fully occupied (< 24 bytes free) with one giant plug (ie, no free objects at all in the region).
This causes allocate_in_condemned_generations to go into an infinite loop because in ephemeral generations we expect short plugs,
ie, we should be able to allocate a min free object in front of each plug. And normally we can because when we allocate objects in gen0
we make sure to break up the allocation contexts with min free objects and when we compact into gen1 we form short plugs.
We are in this situation when all of the following conditions are true -
+ we did a gen2 compacting GC that generates a pinned plug in a gen2 region almost as big as the whole region. my guess for the reason why there's this giant pinned plug is because that gen2 region was already really compact so when we called allocate_in_condemned_generations on the non pinned plugs that are next to some pinned plugs in it we discovered we can't move the non pinned plugs anyway so we artificially pinned them and formed a giant pinned plug. and during this GC those objects were no longer pinned so we have one giant non pinned plug.
+ this gen2 region needs to be the last region with pinned plugs;
+ this gen2 region hasn't been consumed by allocate_in_condemned_generations yet so it was processed by process_remaining_regions;
Then in process_remaining_regions we'll set the plan_gen_num for that gen2 region to 0 because we are doing
set_region_plan_gen_num_sip (current_region, current_plan_gen_num);
instead of going through the demotion logic to decide whether we should demote this region or not.
Co-authored-by: Maoni0 <maoni@microsoft.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>
* Fix.
* Applied @pavelsavara's review.
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---------
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>
* Use flag to initilize ilgen, instead of doing it lazily.
* Formatting.
* Improve variable naming.
* Fix condition.
* Updated name in .h file.
* Updated how wasm inits ilgen.
* Updated wasi driver.
---------
Co-authored-by: Nathan Ricci <naricc@microsoft.com>
…squic dotnet/runtime-assets dotnet/emsdk (#84145)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
* Update dependencies from https://github.com/dotnet/linker build 20230315.1
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.22423.4 -> To Version 7.0.100-1.23165.1
* Update dependencies from https://github.com/dotnet/msquic build 20220909.1
System.Net.MsQuic.Transport
From Version 7.0.0-alpha.1.22406.1 -> To Version 7.0.0-alpha.1.22459.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.6
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
From Version 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6
* Update dependencies from https://github.com/dotnet/emsdk build 20230405.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.5 -> To Version 7.0.6
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* 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
[manual] Merge branch 'release/7.0' => 'release/7.0-staging'
…in ClrVirtualAllocWithinRange() (#83958)
* Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange()
Fixes#83818
---------
Co-authored-by: Ilia K <ki.stfu@gmail.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
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>
dotnet-maestroBotand others added 2 commits April 10, 2023 17:48
…407.1 (#84486)
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
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 7.0.6 milestone Apr 11, 2023
@carlossanlopcarlossanlop self-assigned this Apr 11, 2023
@carlossanlop
carlossanlop merged commit a283bb9 into dotnet:release/7.0Apr 11, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch April 11, 2023 04:15
@ghostghost locked as resolved and limited conversation to collaborators May 11, 2023
@rbhandarbhanda modified the milestones: 7.0.6, 7.0.7Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@lambdageek@simonrozsival@AndyAyersMS@ilonatommy@ericstj@VSadov
, '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('^' + ".*" + '
Skip to content

[manual] Merge branch 'release/7.0-staging' => 'release/7.0' - #84594

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

[manual] Merge branch 'release/7.0-staging' => 'release/7.0'#84594
carlossanlop merged 32 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

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 30 commits March 28, 2023 10:35
* [7.0] Update backport template and servicing docs
* fix template spacing
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
* disable NTLM tests on RedHat.7
* Package_Unsupported_NTLM
---------
Co-authored-by: wfurt <tweinfurt@yahoo.com>
…ity (#83557)
* Add comment in csprojs of dependencies of M.W.Compat.
* Adjust readme.
* Turn off M.W.C. (reset it), it was built last month.
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
…es (#83302)
* [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
…ringContent #81506 (#83425)
Co-authored-by: Simon Lovely <s.lovely@gmail.com>
…) (#83966)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
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>
* Do no test StartTime in GetProcessesByName test (#75334)
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)"
This reverts commit 6a533c1.
---------
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>
…3414) (#83462)
Backport of #83414 to release/7.0, fixes#83242
When checking that an inner array access is in bounds, we must ensure any outer
access is fully in bounds too. We were checking that `idx < array.Len` but not
that `idx >= 0`.
Use an unsigned compare for this check so we can do both sides with a single
instruction.
Fixes#83242.
)
* Ensure free buffer space when reading TLS messages
* Move buffer expansion outside of the loop to prevent unbounded grow
* Fix failing tests
The initial size is not enough to cover later TLS frames
* Remove unwanted changes
---------
Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
…x list containing many items (#83743)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
#83341)
We are seeing a gen0 region that's almost fully occupied (< 24 bytes free) with one giant plug (ie, no free objects at all in the region).
This causes allocate_in_condemned_generations to go into an infinite loop because in ephemeral generations we expect short plugs,
ie, we should be able to allocate a min free object in front of each plug. And normally we can because when we allocate objects in gen0
we make sure to break up the allocation contexts with min free objects and when we compact into gen1 we form short plugs.
We are in this situation when all of the following conditions are true -
+ we did a gen2 compacting GC that generates a pinned plug in a gen2 region almost as big as the whole region. my guess for the reason why there's this giant pinned plug is because that gen2 region was already really compact so when we called allocate_in_condemned_generations on the non pinned plugs that are next to some pinned plugs in it we discovered we can't move the non pinned plugs anyway so we artificially pinned them and formed a giant pinned plug. and during this GC those objects were no longer pinned so we have one giant non pinned plug.
+ this gen2 region needs to be the last region with pinned plugs;
+ this gen2 region hasn't been consumed by allocate_in_condemned_generations yet so it was processed by process_remaining_regions;
Then in process_remaining_regions we'll set the plan_gen_num for that gen2 region to 0 because we are doing
set_region_plan_gen_num_sip (current_region, current_plan_gen_num);
instead of going through the demotion logic to decide whether we should demote this region or not.
Co-authored-by: Maoni0 <maoni@microsoft.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>
* Fix.
* Applied @pavelsavara's review.
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---------
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>
* Use flag to initilize ilgen, instead of doing it lazily.
* Formatting.
* Improve variable naming.
* Fix condition.
* Updated name in .h file.
* Updated how wasm inits ilgen.
* Updated wasi driver.
---------
Co-authored-by: Nathan Ricci <naricc@microsoft.com>
…squic dotnet/runtime-assets dotnet/emsdk (#84145)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
* Update dependencies from https://github.com/dotnet/linker build 20230315.1
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.22423.4 -> To Version 7.0.100-1.23165.1
* Update dependencies from https://github.com/dotnet/msquic build 20220909.1
System.Net.MsQuic.Transport
From Version 7.0.0-alpha.1.22406.1 -> To Version 7.0.0-alpha.1.22459.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.6
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
From Version 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6
* Update dependencies from https://github.com/dotnet/emsdk build 20230405.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.5 -> To Version 7.0.6
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* 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
[manual] Merge branch 'release/7.0' => 'release/7.0-staging'
…in ClrVirtualAllocWithinRange() (#83958)
* Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange()
Fixes#83818
---------
Co-authored-by: Ilia K <ki.stfu@gmail.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
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>
dotnet-maestroBotand others added 2 commits April 10, 2023 17:48
…407.1 (#84486)
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
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 7.0.6 milestone Apr 11, 2023
@carlossanlopcarlossanlop self-assigned this Apr 11, 2023
@carlossanlop
carlossanlop merged commit a283bb9 into dotnet:release/7.0Apr 11, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch April 11, 2023 04:15
@ghostghost locked as resolved and limited conversation to collaborators May 11, 2023
@rbhandarbhanda modified the milestones: 7.0.6, 7.0.7Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@lambdageek@simonrozsival@AndyAyersMS@ilonatommy@ericstj@VSadov
, '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" + '
Skip to content

[manual] Merge branch 'release/7.0-staging' => 'release/7.0' - #84594

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

[manual] Merge branch 'release/7.0-staging' => 'release/7.0'#84594
carlossanlop merged 32 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

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 30 commits March 28, 2023 10:35
* [7.0] Update backport template and servicing docs
* fix template spacing
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
* disable NTLM tests on RedHat.7
* Package_Unsupported_NTLM
---------
Co-authored-by: wfurt <tweinfurt@yahoo.com>
…ity (#83557)
* Add comment in csprojs of dependencies of M.W.Compat.
* Adjust readme.
* Turn off M.W.C. (reset it), it was built last month.
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
…es (#83302)
* [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
…ringContent #81506 (#83425)
Co-authored-by: Simon Lovely <s.lovely@gmail.com>
…) (#83966)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
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>
* Do no test StartTime in GetProcessesByName test (#75334)
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)"
This reverts commit 6a533c1.
---------
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>
…3414) (#83462)
Backport of #83414 to release/7.0, fixes#83242
When checking that an inner array access is in bounds, we must ensure any outer
access is fully in bounds too. We were checking that `idx < array.Len` but not
that `idx >= 0`.
Use an unsigned compare for this check so we can do both sides with a single
instruction.
Fixes#83242.
)
* Ensure free buffer space when reading TLS messages
* Move buffer expansion outside of the loop to prevent unbounded grow
* Fix failing tests
The initial size is not enough to cover later TLS frames
* Remove unwanted changes
---------
Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
…x list containing many items (#83743)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
#83341)
We are seeing a gen0 region that's almost fully occupied (< 24 bytes free) with one giant plug (ie, no free objects at all in the region).
This causes allocate_in_condemned_generations to go into an infinite loop because in ephemeral generations we expect short plugs,
ie, we should be able to allocate a min free object in front of each plug. And normally we can because when we allocate objects in gen0
we make sure to break up the allocation contexts with min free objects and when we compact into gen1 we form short plugs.
We are in this situation when all of the following conditions are true -
+ we did a gen2 compacting GC that generates a pinned plug in a gen2 region almost as big as the whole region. my guess for the reason why there's this giant pinned plug is because that gen2 region was already really compact so when we called allocate_in_condemned_generations on the non pinned plugs that are next to some pinned plugs in it we discovered we can't move the non pinned plugs anyway so we artificially pinned them and formed a giant pinned plug. and during this GC those objects were no longer pinned so we have one giant non pinned plug.
+ this gen2 region needs to be the last region with pinned plugs;
+ this gen2 region hasn't been consumed by allocate_in_condemned_generations yet so it was processed by process_remaining_regions;
Then in process_remaining_regions we'll set the plan_gen_num for that gen2 region to 0 because we are doing
set_region_plan_gen_num_sip (current_region, current_plan_gen_num);
instead of going through the demotion logic to decide whether we should demote this region or not.
Co-authored-by: Maoni0 <maoni@microsoft.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>
* Fix.
* Applied @pavelsavara's review.
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---------
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>
* Use flag to initilize ilgen, instead of doing it lazily.
* Formatting.
* Improve variable naming.
* Fix condition.
* Updated name in .h file.
* Updated how wasm inits ilgen.
* Updated wasi driver.
---------
Co-authored-by: Nathan Ricci <naricc@microsoft.com>
…squic dotnet/runtime-assets dotnet/emsdk (#84145)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
* Update dependencies from https://github.com/dotnet/linker build 20230315.1
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.22423.4 -> To Version 7.0.100-1.23165.1
* Update dependencies from https://github.com/dotnet/msquic build 20220909.1
System.Net.MsQuic.Transport
From Version 7.0.0-alpha.1.22406.1 -> To Version 7.0.0-alpha.1.22459.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.6
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
From Version 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6
* Update dependencies from https://github.com/dotnet/emsdk build 20230405.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.5 -> To Version 7.0.6
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* 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
[manual] Merge branch 'release/7.0' => 'release/7.0-staging'
…in ClrVirtualAllocWithinRange() (#83958)
* Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange()
Fixes#83818
---------
Co-authored-by: Ilia K <ki.stfu@gmail.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
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>
dotnet-maestroBotand others added 2 commits April 10, 2023 17:48
…407.1 (#84486)
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
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 7.0.6 milestone Apr 11, 2023
@carlossanlopcarlossanlop self-assigned this Apr 11, 2023
@carlossanlop
carlossanlop merged commit a283bb9 into dotnet:release/7.0Apr 11, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch April 11, 2023 04:15
@ghostghost locked as resolved and limited conversation to collaborators May 11, 2023
@rbhandarbhanda modified the milestones: 7.0.6, 7.0.7Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@lambdageek@simonrozsival@AndyAyersMS@ilonatommy@ericstj@VSadov
, '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('^' + ".*" + '
Skip to content

[manual] Merge branch 'release/7.0-staging' => 'release/7.0' - #84594

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

[manual] Merge branch 'release/7.0-staging' => 'release/7.0'#84594
carlossanlop merged 32 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

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 30 commits March 28, 2023 10:35
* [7.0] Update backport template and servicing docs
* fix template spacing
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
* disable NTLM tests on RedHat.7
* Package_Unsupported_NTLM
---------
Co-authored-by: wfurt <tweinfurt@yahoo.com>
…ity (#83557)
* Add comment in csprojs of dependencies of M.W.Compat.
* Adjust readme.
* Turn off M.W.C. (reset it), it was built last month.
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
…es (#83302)
* [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
…ringContent #81506 (#83425)
Co-authored-by: Simon Lovely <s.lovely@gmail.com>
…) (#83966)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
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>
* Do no test StartTime in GetProcessesByName test (#75334)
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)"
This reverts commit 6a533c1.
---------
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>
…3414) (#83462)
Backport of #83414 to release/7.0, fixes#83242
When checking that an inner array access is in bounds, we must ensure any outer
access is fully in bounds too. We were checking that `idx < array.Len` but not
that `idx >= 0`.
Use an unsigned compare for this check so we can do both sides with a single
instruction.
Fixes#83242.
)
* Ensure free buffer space when reading TLS messages
* Move buffer expansion outside of the loop to prevent unbounded grow
* Fix failing tests
The initial size is not enough to cover later TLS frames
* Remove unwanted changes
---------
Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
…x list containing many items (#83743)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
#83341)
We are seeing a gen0 region that's almost fully occupied (< 24 bytes free) with one giant plug (ie, no free objects at all in the region).
This causes allocate_in_condemned_generations to go into an infinite loop because in ephemeral generations we expect short plugs,
ie, we should be able to allocate a min free object in front of each plug. And normally we can because when we allocate objects in gen0
we make sure to break up the allocation contexts with min free objects and when we compact into gen1 we form short plugs.
We are in this situation when all of the following conditions are true -
+ we did a gen2 compacting GC that generates a pinned plug in a gen2 region almost as big as the whole region. my guess for the reason why there's this giant pinned plug is because that gen2 region was already really compact so when we called allocate_in_condemned_generations on the non pinned plugs that are next to some pinned plugs in it we discovered we can't move the non pinned plugs anyway so we artificially pinned them and formed a giant pinned plug. and during this GC those objects were no longer pinned so we have one giant non pinned plug.
+ this gen2 region needs to be the last region with pinned plugs;
+ this gen2 region hasn't been consumed by allocate_in_condemned_generations yet so it was processed by process_remaining_regions;
Then in process_remaining_regions we'll set the plan_gen_num for that gen2 region to 0 because we are doing
set_region_plan_gen_num_sip (current_region, current_plan_gen_num);
instead of going through the demotion logic to decide whether we should demote this region or not.
Co-authored-by: Maoni0 <maoni@microsoft.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>
* Fix.
* Applied @pavelsavara's review.
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---------
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>
* Use flag to initilize ilgen, instead of doing it lazily.
* Formatting.
* Improve variable naming.
* Fix condition.
* Updated name in .h file.
* Updated how wasm inits ilgen.
* Updated wasi driver.
---------
Co-authored-by: Nathan Ricci <naricc@microsoft.com>
…squic dotnet/runtime-assets dotnet/emsdk (#84145)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
* Update dependencies from https://github.com/dotnet/linker build 20230315.1
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.22423.4 -> To Version 7.0.100-1.23165.1
* Update dependencies from https://github.com/dotnet/msquic build 20220909.1
System.Net.MsQuic.Transport
From Version 7.0.0-alpha.1.22406.1 -> To Version 7.0.0-alpha.1.22459.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.6
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
From Version 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6
* Update dependencies from https://github.com/dotnet/emsdk build 20230405.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.5 -> To Version 7.0.6
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* 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
[manual] Merge branch 'release/7.0' => 'release/7.0-staging'
…in ClrVirtualAllocWithinRange() (#83958)
* Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange()
Fixes#83818
---------
Co-authored-by: Ilia K <ki.stfu@gmail.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
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>
dotnet-maestroBotand others added 2 commits April 10, 2023 17:48
…407.1 (#84486)
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
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 7.0.6 milestone Apr 11, 2023
@carlossanlopcarlossanlop self-assigned this Apr 11, 2023
@carlossanlop
carlossanlop merged commit a283bb9 into dotnet:release/7.0Apr 11, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch April 11, 2023 04:15
@ghostghost locked as resolved and limited conversation to collaborators May 11, 2023
@rbhandarbhanda modified the milestones: 7.0.6, 7.0.7Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@lambdageek@simonrozsival@AndyAyersMS@ilonatommy@ericstj@VSadov
, '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('^' + ".*" + '
Skip to content

[manual] Merge branch 'release/7.0-staging' => 'release/7.0' - #84594

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

[manual] Merge branch 'release/7.0-staging' => 'release/7.0'#84594
carlossanlop merged 32 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

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 30 commits March 28, 2023 10:35
* [7.0] Update backport template and servicing docs
* fix template spacing
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
* disable NTLM tests on RedHat.7
* Package_Unsupported_NTLM
---------
Co-authored-by: wfurt <tweinfurt@yahoo.com>
…ity (#83557)
* Add comment in csprojs of dependencies of M.W.Compat.
* Adjust readme.
* Turn off M.W.C. (reset it), it was built last month.
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
…es (#83302)
* [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
…ringContent #81506 (#83425)
Co-authored-by: Simon Lovely <s.lovely@gmail.com>
…) (#83966)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
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>
* Do no test StartTime in GetProcessesByName test (#75334)
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)"
This reverts commit 6a533c1.
---------
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>
…3414) (#83462)
Backport of #83414 to release/7.0, fixes#83242
When checking that an inner array access is in bounds, we must ensure any outer
access is fully in bounds too. We were checking that `idx < array.Len` but not
that `idx >= 0`.
Use an unsigned compare for this check so we can do both sides with a single
instruction.
Fixes#83242.
)
* Ensure free buffer space when reading TLS messages
* Move buffer expansion outside of the loop to prevent unbounded grow
* Fix failing tests
The initial size is not enough to cover later TLS frames
* Remove unwanted changes
---------
Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
…x list containing many items (#83743)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
#83341)
We are seeing a gen0 region that's almost fully occupied (< 24 bytes free) with one giant plug (ie, no free objects at all in the region).
This causes allocate_in_condemned_generations to go into an infinite loop because in ephemeral generations we expect short plugs,
ie, we should be able to allocate a min free object in front of each plug. And normally we can because when we allocate objects in gen0
we make sure to break up the allocation contexts with min free objects and when we compact into gen1 we form short plugs.
We are in this situation when all of the following conditions are true -
+ we did a gen2 compacting GC that generates a pinned plug in a gen2 region almost as big as the whole region. my guess for the reason why there's this giant pinned plug is because that gen2 region was already really compact so when we called allocate_in_condemned_generations on the non pinned plugs that are next to some pinned plugs in it we discovered we can't move the non pinned plugs anyway so we artificially pinned them and formed a giant pinned plug. and during this GC those objects were no longer pinned so we have one giant non pinned plug.
+ this gen2 region needs to be the last region with pinned plugs;
+ this gen2 region hasn't been consumed by allocate_in_condemned_generations yet so it was processed by process_remaining_regions;
Then in process_remaining_regions we'll set the plan_gen_num for that gen2 region to 0 because we are doing
set_region_plan_gen_num_sip (current_region, current_plan_gen_num);
instead of going through the demotion logic to decide whether we should demote this region or not.
Co-authored-by: Maoni0 <maoni@microsoft.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>
* Fix.
* Applied @pavelsavara's review.
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---------
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>
* Use flag to initilize ilgen, instead of doing it lazily.
* Formatting.
* Improve variable naming.
* Fix condition.
* Updated name in .h file.
* Updated how wasm inits ilgen.
* Updated wasi driver.
---------
Co-authored-by: Nathan Ricci <naricc@microsoft.com>
…squic dotnet/runtime-assets dotnet/emsdk (#84145)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
* Update dependencies from https://github.com/dotnet/linker build 20230315.1
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.22423.4 -> To Version 7.0.100-1.23165.1
* Update dependencies from https://github.com/dotnet/msquic build 20220909.1
System.Net.MsQuic.Transport
From Version 7.0.0-alpha.1.22406.1 -> To Version 7.0.0-alpha.1.22459.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.6
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
From Version 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6
* Update dependencies from https://github.com/dotnet/emsdk build 20230405.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.5 -> To Version 7.0.6
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* 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
[manual] Merge branch 'release/7.0' => 'release/7.0-staging'
…in ClrVirtualAllocWithinRange() (#83958)
* Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange()
Fixes#83818
---------
Co-authored-by: Ilia K <ki.stfu@gmail.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
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>
dotnet-maestroBotand others added 2 commits April 10, 2023 17:48
…407.1 (#84486)
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
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 7.0.6 milestone Apr 11, 2023
@carlossanlopcarlossanlop self-assigned this Apr 11, 2023
@carlossanlop
carlossanlop merged commit a283bb9 into dotnet:release/7.0Apr 11, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch April 11, 2023 04:15
@ghostghost locked as resolved and limited conversation to collaborators May 11, 2023
@rbhandarbhanda modified the milestones: 7.0.6, 7.0.7Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@lambdageek@simonrozsival@AndyAyersMS@ilonatommy@ericstj@VSadov
, '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); } })(); })();
Skip to content

[manual] Merge branch 'release/7.0-staging' => 'release/7.0' - #84594

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

[manual] Merge branch 'release/7.0-staging' => 'release/7.0'#84594
carlossanlop merged 32 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

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 30 commits March 28, 2023 10:35
* [7.0] Update backport template and servicing docs
* fix template spacing
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
* disable NTLM tests on RedHat.7
* Package_Unsupported_NTLM
---------
Co-authored-by: wfurt <tweinfurt@yahoo.com>
…ity (#83557)
* Add comment in csprojs of dependencies of M.W.Compat.
* Adjust readme.
* Turn off M.W.C. (reset it), it was built last month.
---------
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
…es (#83302)
* [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
…ringContent #81506 (#83425)
Co-authored-by: Simon Lovely <s.lovely@gmail.com>
…) (#83966)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
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>
* Do no test StartTime in GetProcessesByName test (#75334)
* Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)"
This reverts commit 6a533c1.
---------
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>
…3414) (#83462)
Backport of #83414 to release/7.0, fixes#83242
When checking that an inner array access is in bounds, we must ensure any outer
access is fully in bounds too. We were checking that `idx < array.Len` but not
that `idx >= 0`.
Use an unsigned compare for this check so we can do both sides with a single
instruction.
Fixes#83242.
)
* Ensure free buffer space when reading TLS messages
* Move buffer expansion outside of the loop to prevent unbounded grow
* Fix failing tests
The initial size is not enough to cover later TLS frames
* Remove unwanted changes
---------
Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
…x list containing many items (#83743)
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
#83341)
We are seeing a gen0 region that's almost fully occupied (< 24 bytes free) with one giant plug (ie, no free objects at all in the region).
This causes allocate_in_condemned_generations to go into an infinite loop because in ephemeral generations we expect short plugs,
ie, we should be able to allocate a min free object in front of each plug. And normally we can because when we allocate objects in gen0
we make sure to break up the allocation contexts with min free objects and when we compact into gen1 we form short plugs.
We are in this situation when all of the following conditions are true -
+ we did a gen2 compacting GC that generates a pinned plug in a gen2 region almost as big as the whole region. my guess for the reason why there's this giant pinned plug is because that gen2 region was already really compact so when we called allocate_in_condemned_generations on the non pinned plugs that are next to some pinned plugs in it we discovered we can't move the non pinned plugs anyway so we artificially pinned them and formed a giant pinned plug. and during this GC those objects were no longer pinned so we have one giant non pinned plug.
+ this gen2 region needs to be the last region with pinned plugs;
+ this gen2 region hasn't been consumed by allocate_in_condemned_generations yet so it was processed by process_remaining_regions;
Then in process_remaining_regions we'll set the plan_gen_num for that gen2 region to 0 because we are doing
set_region_plan_gen_num_sip (current_region, current_plan_gen_num);
instead of going through the demotion logic to decide whether we should demote this region or not.
Co-authored-by: Maoni0 <maoni@microsoft.com>
Co-authored-by: Andrew Au <andrewau@microsoft.com>
* Fix.
* Applied @pavelsavara's review.
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860)
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---------
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>
* Use flag to initilize ilgen, instead of doing it lazily.
* Formatting.
* Improve variable naming.
* Fix condition.
* Updated name in .h file.
* Updated how wasm inits ilgen.
* Updated wasi driver.
---------
Co-authored-by: Nathan Ricci <naricc@microsoft.com>
…squic dotnet/runtime-assets dotnet/emsdk (#84145)
* Update dependencies from https://github.com/dotnet/emsdk build 20230323.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.4 -> To Version 7.0.5
* Update dependencies from https://github.com/dotnet/linker build 20230315.1
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.22423.4 -> To Version 7.0.100-1.23165.1
* Update dependencies from https://github.com/dotnet/msquic build 20220909.1
System.Net.MsQuic.Transport
From Version 7.0.0-alpha.1.22406.1 -> To Version 7.0.0-alpha.1.22459.1
* Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.6
Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
From Version 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6
* Update dependencies from https://github.com/dotnet/emsdk build 20230405.1
Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.5 -> To Version 7.0.6
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* 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
[manual] Merge branch 'release/7.0' => 'release/7.0-staging'
…in ClrVirtualAllocWithinRange() (#83958)
* Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange()
Fixes#83818
---------
Co-authored-by: Ilia K <ki.stfu@gmail.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
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>
dotnet-maestroBotand others added 2 commits April 10, 2023 17:48
…407.1 (#84486)
Microsoft.NET.ILLink.Tasks
From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
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 7.0.6 milestone Apr 11, 2023
@carlossanlopcarlossanlop self-assigned this Apr 11, 2023
@carlossanlop
carlossanlop merged commit a283bb9 into dotnet:release/7.0Apr 11, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch April 11, 2023 04:15
@ghostghost locked as resolved and limited conversation to collaborators May 11, 2023
@rbhandarbhanda modified the milestones: 7.0.6, 7.0.7Jun 1, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflowServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@carlossanlop@hoyosjs@rbhanda@steveisok@lambdageek@simonrozsival@AndyAyersMS@ilonatommy@ericstj@VSadov