Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
081bb4e
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Apr 1, 2022
bbb54ba
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Apr 1, 2022
ccd828f
Update dependencies from https://github.com/dotnet/msquic build 20220…
dotnet-maestro[bot] Apr 1, 2022
cd17f2d
Update dependencies from https://github.com/dotnet/emsdk build 202204…
dotnet-maestro[bot] Apr 1, 2022
bec50ed
Bump tools version to .NET 7
hoyosjs Apr 2, 2022
8a961be
Move non-netfx tasks to 7.0
hoyosjs Apr 2, 2022
b4a931f
Merge remote-tracking branch 'upstream/main' into darc-main-e8f262cb-…
agocke Apr 3, 2022
9f29dac
Also change the TFM for the tasks
agocke Apr 4, 2022
be679a2
Merge branch 'darc-main-e8f262cb-ba2a-48ad-af27-9f469127294b' of gith…
agocke Apr 4, 2022
fbcdfb9
Also update wasm
agocke Apr 4, 2022
4f78ef5
Update AssemblyStripper.csproj
agocke Apr 4, 2022
f11f9a4
Fix build for net7.0
radical Apr 5, 2022
91f871d
Update src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblySt…
jkotas Apr 5, 2022
60ead9b
Populate target framework versions for tasks, and generated nugets based
radical Apr 5, 2022
6fe6d9b
Version substitution for MonoTargets nuget
radical Apr 5, 2022
07d50d3
Version substitution for MonoAOTCompiler nuget
radical Apr 5, 2022
848c39b
sendhelixhelp.proj: Ensure that DotNetCliVersion gets overridden, as
radical Apr 5, 2022
d4d81e3
Merge remote-tracking branch 'origin/main' into darc-main-e8f262cb-ba…
radical Apr 5, 2022
c5e4535
Merge branch 'main' into darc-main-e8f262cb-ba2a-48ad-af27-9f469127294b
lewing Apr 7, 2022
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
Fix build for net7.0
Fails with:
```
src/tests/tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcSocket.cs(27,35): error CS0108: 'IpcSocket.AcceptAsync(CancellationToken)' hides inherited member 'Socket.AcceptAsync(CancellationToken)'. Use the new keyword if hiding was intended. [/__w/1/s/src/tests/tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj]
```
  • Loading branch information
radical authored Apr 5, 2022
commit f11f9a4aeb4e60abda32d40dc7181a8d5e3c351c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public IpcSocket(AddressFamily addressFamily, SocketType socketType, ProtocolTyp
}

// .NET 6 implements this method directly on Socket, but for earlier runtimes we need a polyfill
#if !NET6_0
#if !NET6_0_OR_GREATER
public async Task<Socket> AcceptAsync(CancellationToken token)
{
using (token.Register(() => Close(0)))
Expand Down Expand Up @@ -63,7 +63,7 @@ public virtual void Connect(EndPoint remoteEP, TimeSpan timeout)
}

// .NET 6 implements this method directly on Socket, but for earlier runtimes we need a polyfill
#if !NET6_0
#if !NET6_0_OR_GREATER
public async Task ConnectAsync(EndPoint remoteEP, CancellationToken token)
{
using (token.Register(() => Close(0)))
Expand Down