Skip to content

[manual] Merge release/7.0-staging into release/7.0 #86296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 36 commits into from
May 16, 2023
Merged

[manual] Merge release/7.0-staging into release/7.0 #86296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b402106
[7.0-staging] Bump branding to 7.0.7 (#84597)
carlossanlop Apr 11, 2023
2165458
[release/7.0-staging] Update dependencies from dotnet/arcade dotnet/l…
dotnet-maestro[bot] Apr 12, 2023
70c91e2
Fix AwaitableSocketAsyncEventArgs reorderings on weaker memory models…
github-actions[bot] Apr 14, 2023
bc4b1f2
Merge pull request #84611 from dotnet-maestro-bot/merge/release/7.0-t…
carlossanlop Apr 19, 2023
6e3c5c7
Backport #78136 to .NET 7 (#84936)
jkoritzinsky Apr 21, 2023
b3793a9
Update dependencies from https://github.com/dotnet/icu build 20230418…
dotnet-maestro[bot] Apr 24, 2023
91c7793
Skip DllImportSearchPathsTest on wasm (#84735)
elinor-fung Apr 24, 2023
f61192d
[PERF] Remove pipeline dependencies and steps for running Maui Mobile…
LoopedBard3 Apr 24, 2023
7aa3f0c
Backport PR#77480 to 7.0. (#85309)
PeterSolMS Apr 25, 2023
f16c731
Add metadata update for overrides (#85259)
fanyang-mono Apr 26, 2023
fbd8c18
Caching settings.pause_mode to avoid deadlock (#84738)
github-actions[bot] Apr 26, 2023
86ce6a1
[release/7.0-staging] Update dependencies from dotnet/hotreload-utils…
dotnet-maestro[bot] Apr 27, 2023
06e5b35
[native-library] If a dllimport is specified with an absolute path, l…
github-actions[bot] Apr 27, 2023
3a80b29
Added the ability to specify a Spin Count Unit via a GC Configuration…
mrsharm Apr 27, 2023
12aaae4
Fix createdump arg parsing for signal-based exceptions (#85423)
github-actions[bot] Apr 28, 2023
693a3c6
define UNW_AARCH64 aliases conditionally (#84874)
VSadov May 3, 2023
98528ec
Merge pull request #85719 from dotnet-maestro-bot/merge/release/7.0-t…
carlossanlop May 3, 2023
7416d98
Add missing TarFile.CreateFromDirectoryAsync roundtrip tests. (#84856)
github-actions[bot] May 3, 2023
17d84d7
Add status code and exception info to System.Net.Http events (#84806)
MihaZupan May 3, 2023
47f52f1
[release/7.0-staging] Update dependencies from xharness, arcade (#85726)
dotnet-maestro[bot] May 4, 2023
c8ab0d3
[release/7.0-staging] Make WindowsServiceLifetime gracefully stop (#8…
ericstj May 4, 2023
5b71fde
Servicing docs improvements (#85731)
carlossanlop May 6, 2023
cd73b4f
Port perfmap work to 7 (#85072)
davmason May 8, 2023
bf47f0d
[Release/7.0] Port EventCounters multi session support to 7.0 (#84679)
davmason May 11, 2023
2b28c92
[release/7.0-staging] [browser] fix job queue timespan calculation (#…
github-actions[bot] May 12, 2023
e005374
Fix HTTP3 header decoder buffer allocation (#78862) (#85977)
ManickaP May 15, 2023
fb0bf59
Update dependencies from https://github.com/dotnet/emsdk build 202305…
dotnet-maestro[bot] May 15, 2023
bf7c094
Add linker flags to add fixup data to PDBs (#58417) (#84358)
github-actions[bot] May 15, 2023
6f9d91c
[release/7.0] Suppress clang-16 warnings (backport #81573) (#84444)
ayakael May 15, 2023
edef3b9
[release/7.0-staging] Microsoft.NETCore.Platforms: support adding rid…
github-actions[bot] May 16, 2023
b4a441a
add RID for Alpine 3.18 (#86280)
github-actions[bot] May 16, 2023
eb3160d
Add Ubuntu 22.10 kinetic kudu RIDs for .NET 7 (#84984)
dviererbe May 16, 2023
1182123
[7.0-staging] Reset OOB packages from 7.0.6 (#84600)
carlossanlop May 16, 2023
92f8090
Add Ubuntu 23.10 (Mantic Minotaur) RIDs to .NET 7 (#86306)
dviererbe May 16, 2023
a2fd545
Merge branch 'release/7.0' into release/7.0-staging
carlossanlop May 16, 2023
751fa8b
Revert "[7.0-staging] Reset OOB packages from 7.0.6 (#84600)"
carlossanlop May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[release/7.0-staging] [browser] fix job queue timespan calculation (#… 
…85784)

Co-authored-by: pavelsavara <[email protected]>
Co-authored-by: Ilona Tomkowicz <[email protected]>
  • Loading branch information
@github-actions @pavelsavara @ilonatommy
3 people authored May 12, 2023
commit 2b28c920d6cb1d0c91c70a6a1442b53c9c2f249f
6 changes: 3 additions & 3 deletions src/mono/System.Private.CoreLib/src/System/Threading/TimerQueue.Browser.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ private bool SetTimer(uint actualDuration)
// shortest time of all TimerQueues
private static void ReplaceNextSetTimeout(long shortestDueTimeMs, long currentTimeMs)
{
if (shortestDueTimeMs == int.MaxValue)
if (shortestDueTimeMs == long.MaxValue)
{
return;
}
Expand All @@ -85,7 +85,7 @@ private static long ShortestDueTime()
{
if (s_scheduledTimers == null)
{
return int.MaxValue;
return long.MaxValue;
}

long shortestDueTimeMs = long.MaxValue;
Expand All @@ -112,7 +112,7 @@ private static long PumpTimerQueue(long currentTimeMs)
List<TimerQueue> timersToFire = s_scheduledTimersToFire!;
List<TimerQueue> timers;
timers = s_scheduledTimers!;
long shortestDueTimeMs = int.MaxValue;
long shortestDueTimeMs = long.MaxValue;
for (int i = timers.Count - 1; i >= 0; --i)
{
TimerQueue timer = timers[i];
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/utils/mono-os-mutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#if !defined(HOST_WIN32)

#if !defined(CLOCK_MONOTONIC) || defined(HOST_DARWIN) || defined(HOST_WASM)
#if !defined(CLOCK_MONOTONIC) || defined(HOST_DARWIN) || defined(HOST_WASI)
#define BROKEN_CLOCK_SOURCE
#endif

Expand Down
5 changes: 3 additions & 2 deletions src/mono/mono/utils/mono-time.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ gint64
mono_msec_boottime (void)
{
/* clock_gettime () is found by configure on Apple builds, but its only present from ios 10, macos 10.12, tvos 10 and watchos 3 */
#if !defined (TARGET_WASM) && ((defined(HAVE_CLOCK_MONOTONIC_COARSE) || defined(HAVE_CLOCK_MONOTONIC)) && !(defined(TARGET_IOS) || defined(TARGET_OSX) || defined(TARGET_WATCHOS) || defined(TARGET_TVOS)))
#if ((defined(HAVE_CLOCK_MONOTONIC_COARSE) || defined(HAVE_CLOCK_MONOTONIC)) && !(defined(TARGET_IOS) || defined(TARGET_OSX) || defined(TARGET_WATCHOS) || defined(TARGET_TVOS)))
clockid_t clockType =
#if HAVE_CLOCK_MONOTONIC_COARSE
/* emscripten exposes CLOCK_MONOTONIC_COARSE but doesn't implement it */
#if defined(HAVE_CLOCK_MONOTONIC_COARSE) && !defined(TARGET_WASM)
CLOCK_MONOTONIC_COARSE; /* good enough resolution, fastest speed */
#else
CLOCK_MONOTONIC;
Expand Down