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/Content/Node/entrypoint-socket.js

@@ -8,13 +8,15 @@
 /******/ 		// Check if module is in cache
 /******/ 		if (installedModules[moduleId]) {
 /******/ 			return installedModules[moduleId].exports;
-/******/ 		}
+            /******/
+        }
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = installedModules[moduleId] = {
 /******/ 			i: moduleId,
 /******/ 			l: false,
 /******/ 			exports: {}
-/******/ 		};
+            /******/
+        };
 /******/
 /******/ 		// Execute the module function
 /******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
@@ -24,7 +26,8 @@
 /******/
 /******/ 		// Return the exports of the module
 /******/ 		return module.exports;
-/******/ 	}
+        /******/
+    }
 /******/
 /******/
 /******/ 	// expose the modules object (__webpack_modules__)
@@ -37,16 +40,20 @@
 /******/ 	__webpack_require__.d = function (exports, name, getter) {
 /******/ 		if (!__webpack_require__.o(exports, name)) {
 /******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
+            /******/
-/******/ 	};
+        }
+        /******/
+    };
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function (exports) {
 /******/ 		if (typeof Symbol !== 'undefined' && Symbol.toStringTag) {
 /******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
+            /******/
+        }
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
+        /******/
+    };
 /******/
 /******/ 	// create a fake namespace object
 /******/ 	// mode & 1: value is a module id, require it
@@ -62,7 +69,8 @@
 /******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
 /******/ 		if (mode & 2 && typeof value != 'string') for (var key in value) __webpack_require__.d(ns, key, function (key) { return value[key]; }.bind(null, key));
 /******/ 		return ns;
-/******/ 	};
+        /******/
+    };
 /******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function (module) {
@@ -71,7 +79,8 @@
 /******/ 			function getModuleExports() { return module; };
 /******/ 		__webpack_require__.d(getter, 'a', getter);
 /******/ 		return getter;
-/******/ 	};
+        /******/
+    };
 /******/
 /******/ 	// Object.prototype.hasOwnProperty.call
 /******/ 	__webpack_require__.o = function (object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
@@ -82,7 +91,8 @@
 /******/
 /******/ 	// Load entry module and return exports
 /******/ 	return __webpack_require__(__webpack_require__.s = 0);
-/******/ })
+    /******/
+})
 /************************************************************************/
 /******/([
 /* 0 */
@@ -91,7 +101,8 @@
             module.exports = __webpack_require__(1);
 
 
-/***/ }),
+            /***/
+        }),
 /* 1 */
 /***/ (function (module, exports, __webpack_require__) {
 
@@ -164,7 +175,8 @@ server.listen(listenAddress);
             ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid), /* ignoreSigint */ true);
 
 
-/***/ }),
+            /***/
+        }),
 /* 2 */
 /***/ (function (module, exports) {
 
@@ -205,25 +217,29 @@ function encodeNewlinesInString(str) {
             }
 
 
-/***/ }),
+            /***/
+        }),
 /* 3 */
 /***/ (function (module, exports) {
 
             module.exports = require("net");
 
-/***/ }),
+            /***/
+        }),
 /* 4 */
 /***/ (function (module, exports) {
 
             module.exports = require("path");
 
-/***/ }),
+            /***/
+        }),
 /* 5 */
 /***/ (function (module, exports) {
 
             module.exports = require("readline");
 
-/***/ }),
+            /***/
+        }),
 /* 6 */
 /***/ (function (module, exports, __webpack_require__) {
 
@@ -251,7 +267,8 @@ function parseArgs(args) {
             exports.parseArgs = parseArgs;
 
 
-/***/ }),
+            /***/
+        }),
 /* 7 */
 /***/ (function (module, exports, __webpack_require__) {
 
@@ -338,7 +355,8 @@ function processExists(pid) {
             }
 
 
-/***/ }),
+            /***/
+        }),
 /* 8 */
 /***/ (function (module, exports, __webpack_require__) {
 
@@ -452,7 +470,7 @@ var VirtualConnectionsCollection = /** @class */ (function () {
                     newVirtualConnection.on('finish', function () {
                         // 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;
                     this._onVirtualConnectionCallback(newVirtualConnection);
@@ -514,7 +532,7 @@ var VirtualConnectionsCollection = /** @class */ (function () {
                  * Sends a number serialized in the correct format for .NET to receive as a System.Int32
                  */
                 VirtualConnectionsCollection.prototype._sendInt32LE = function (value, callback) {
-        var buf = new Buffer(4);
+                    var buf = Buffer.alloc(4);
                     buf.writeInt32LE(value, 0);
                     this._socket.write(buf, callback);
                 };
@@ -527,13 +545,15 @@ var VirtualConnectionsCollection = /** @class */ (function () {
             }());
 
 
-/***/ }),
+            /***/
+        }),
 /* 9 */
 /***/ (function (module, exports) {
 
             module.exports = require("events");
 
-/***/ }),
+            /***/
+        }),
 /* 10 */
 /***/ (function (module, exports, __webpack_require__) {
 
@@ -577,7 +597,7 @@ var VirtualConnection = /** @class */ (function (_super) {
                 };
                 VirtualConnection.prototype._write = function (chunk, encodingIfString, callback) {
                     if (typeof chunk === 'string') {
-            chunk = new Buffer(chunk, encodingIfString);
+                        chunk = Buffer.from(chunk, encodingIfString);
                     }
                     this._beginWriteCallback(chunk, callback);
                 };
@@ -594,11 +614,13 @@ var VirtualConnection = /** @class */ (function (_super) {
             exports.VirtualConnection = VirtualConnection;
 
 
-/***/ }),
+            /***/
+        }),
 /* 11 */
 /***/ (function (module, exports) {
 
             module.exports = require("stream");
 
-/***/ })
+            /***/
+        })
 /******/])));

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);
     }