Merge branch 'v2.3' into v2.4

microsoft · Apr 24, 2020 · b666a41 · b666a41
2 parents c116dc2 + 94c2cc6
commit b666a41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -13,6 +13,6 @@
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [
-		
+
 	]
-}
+}
diff --git a/src/StreamJsonRpc/StreamJsonRpc.csproj b/src/StreamJsonRpc/StreamJsonRpc.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.6.13" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.6.13" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" PrivateAssets="compile" />
-    <PackageReference Include="Nerdbank.Streams" Version="2.4.67" />
+    <PackageReference Include="Nerdbank.Streams" Version="2.4.73" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="2.9.7" PrivateAssets="all" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,6 @@ @@
     	],
     	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
     	"unwantedRecommendations": [
     	]
-    }
+    }