Merge branch 'merge/release/2.2-to-master'

build/dependencies.props

@@ -25,6 +25,6 @@
     <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
     <SystemThreadingTasksDataflowPackageVersion>4.10.0-preview1-26831-06</SystemThreadingTasksDataflowPackageVersion>
   </PropertyGroup>
-  <PropertyGroup Label="Package Versions: Pinned" />
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
+  <PropertyGroup Label="Package Versions: Pinned" />
 </Project>

scripts/Regenerate-JSFiles.ps1

@@ -0,0 +1,28 @@
+[cmdletbinding(SupportsShouldProcess = $true)]
+param(
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2
+
+Push-Location "src"
+try {
+    $dirs = Get-ChildItem -Directory
+    foreach($dir in $dirs)
+    {
+        Push-Location $dir
+        try{
+            if(Test-Path -Path "package.json")
+            {
+                npm install
+                npm run build
+            }
+        }
+        finally{
+            Pop-Location
+        }
+    }
+}
+finally {
+    Pop-Location
+}

src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts

@@ -27,7 +27,7 @@ export class VirtualConnection extends Duplex {
 
     public _write(chunk: Buffer | string, encodingIfString: string, callback: EndWriteCallback) {
         if (typeof chunk === 'string') {
-            chunk = new Buffer(chunk as string, encodingIfString);
+            chunk = Buffer.from(chunk as string, encodingIfString);
         }
 
         this._beginWriteCallback(chunk as Buffer, callback);

src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts

@@ -113,7 +113,7 @@ class VirtualConnectionsCollection {
         newVirtualConnection.on('finish', () => {
             // The virtual connection was closed locally. Clean up locally, and notify the remote that we're done.
             this._onVirtualConnectionWasClosed(header.connectionIdString);
-            this._sendFrame(header.connectionIdBinary, new Buffer(0));
+            this._sendFrame(header.connectionIdBinary, Buffer.alloc(0));
         });
 
         this._virtualConnections[header.connectionIdString] = newVirtualConnection;
@@ -180,7 +180,7 @@ class VirtualConnectionsCollection {
      * Sends a number serialized in the correct format for .NET to receive as a System.Int32
      */
     private _sendInt32LE(value: number, callback?: EndWriteCallback) {
-        const buf = new Buffer(4);
+        const buf = Buffer.alloc(4);
         buf.writeInt32LE(value, 0);
         this._socket.write(buf, callback);
     }