Wait for GetAssetsAsync before returning

sharwell · sharwell · commit c020fe868d7e · 2020-09-29T23:25:31.000-07:00
diff --git a/src/Workspaces/Remote/Core/SolutionAssetProvider.cs b/src/Workspaces/Remote/Core/SolutionAssetProvider.cs
@@ -59,7 +59,7 @@ public async ValueTask GetAssetsAsync(PipeWriter pipeWriter, int scopeId, Checks
             // (non-contiguous) memory allocated for the underlying buffers. The amount of memory is bounded by the total size of the serialized assets.
             var localPipe = new Pipe(RemoteHostAssetSerialization.PipeOptionsWithUnlimitedWriterBuffer);
 
-            Task.Run(() =>
+            var task1 = Task.Run(() =>
             {
                 try
                 {
@@ -71,12 +71,14 @@ public async ValueTask GetAssetsAsync(PipeWriter pipeWriter, int scopeId, Checks
                 {
                     // no-op
                 }
-            }, cancellationToken).Forget();
+            }, cancellationToken);
 
             // Complete RPC once we send the initial piece of data and start waiting for the writer to send more,
             // so the client can start reading from the stream. Once CopyPipeDataAsync completes the pipeWriter
             // the corresponding client-side pipeReader will complete and the data transfer will be finished.
-            CopyPipeDataAsync().Forget();
+            var task2 = CopyPipeDataAsync();
+
+            await Task.WhenAll(task1, task2).ConfigureAwait(false);
 
             async Task CopyPipeDataAsync()
             {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public async ValueTask GetAssetsAsync(PipeWriter pipeWriter, int scopeId, Checks`
`59`	`59`	`// (non-contiguous) memory allocated for the underlying buffers. The amount of memory is bounded by the total size of the serialized assets.`
`60`	`60`	`var localPipe = new Pipe(RemoteHostAssetSerialization.PipeOptionsWithUnlimitedWriterBuffer);`
`61`	`61`
`62`		`- Task.Run(() =>`
	`62`	`+ var task1 = Task.Run(() =>`
`63`	`63`	`{`
`64`	`64`	`try`
`65`	`65`	`{`
`@@ -71,12 +71,14 @@ public async ValueTask GetAssetsAsync(PipeWriter pipeWriter, int scopeId, Checks`
`71`	`71`	`{`
`72`	`72`	`// no-op`
`73`	`73`	`}`
`74`		`- }, cancellationToken).Forget();`
	`74`	`+ }, cancellationToken);`
`75`	`75`
`76`	`76`	`// Complete RPC once we send the initial piece of data and start waiting for the writer to send more,`
`77`	`77`	`// so the client can start reading from the stream. Once CopyPipeDataAsync completes the pipeWriter`
`78`	`78`	`// the corresponding client-side pipeReader will complete and the data transfer will be finished.`
`79`		`- CopyPipeDataAsync().Forget();`
	`79`	`+ var task2 = CopyPipeDataAsync();`
	`80`	`+`
	`81`	`+ await Task.WhenAll(task1, task2).ConfigureAwait(false);`
`80`	`82`
`81`	`83`	`async Task CopyPipeDataAsync()`
`82`	`84`	`{`