Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions src/msbuild/NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,4 @@
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
<auditSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</auditSources>
</configuration>
2 changes: 1 addition & 1 deletion src/msbuild/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Project>
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
<PropertyGroup>
<VersionPrefix>18.0.3</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<VersionPrefix>18.0.5</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.14.8</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,7 @@ public NodeContext(
// We select a thread size empirically - for debug builds the minimum possible stack size was too small.
// The current size is reported to not have the issue.
_drainPacketQueueThread = new Thread(DrainPacketQueue, 0x30000);
_drainPacketQueueThread.Name = "DrainPacketQueueThread";
_drainPacketQueueThread.IsBackground = true;
_drainPacketQueueThread.Start(this);
}
Expand Down Expand Up @@ -850,10 +851,13 @@ private void DrainPacketQueue(object state)
serverToClientStream.Write(writeStreamBuffer, i, lengthToWrite);
}

if (IsExitPacket(packet))
if (packet is NodeBuildComplete)
{
context._exitPacketState = ExitPacketState.ExitPacketSent;
context._packetQueueDrainDelayCancellation.Cancel();
if (IsExitPacket(packet))
{
context._exitPacketState = ExitPacketState.ExitPacketSent;
context._packetQueueDrainDelayCancellation.Cancel();
}

return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/source-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
"commitSha": "fdb422958deeb2aa06de8290328d57d0cf9e3fd2"
},
{
"barId": 288469,
"barId": 290990,
"path": "msbuild",
"remoteUri": "https://github.com/dotnet/msbuild",
"commitSha": "149ded8b1c83b130ec8124cb2c52f628b7158a1e"
"commitSha": "e22287bf154ea3f7a145a18d21938b0d9c881754"
},
{
"barId": 286446,
Expand Down