From 20b8dc1f2af30d7aab65a46ef1175520d370e290 Mon Sep 17 00:00:00 2001
From: Taritsyn <taritsyn@gmail.com>
Date: Fri, 17 Jul 2020 18:52:37 +0300
Subject: [PATCH] In BundleTransformer.TypeScript added support of the
 TypeScript version 3.9.7

---
 global.json                                                 | 2 +-
 .../BundleTransformer.TypeScript.csproj                     | 4 ++--
 .../Resources/typescript-combined.js                        | 6 ++++--
 src/BundleTransformer.TypeScript/readme.txt                 | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/global.json b/global.json
index 1c7ff31c2..38c91f265 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
 	"sdk": {
-		"version": "2.1.806"
+		"version": "2.1.808"
 	}
 }
\ No newline at end of file
diff --git a/src/BundleTransformer.TypeScript/BundleTransformer.TypeScript.csproj b/src/BundleTransformer.TypeScript/BundleTransformer.TypeScript.csproj
index 814ffe4b7..c7baaca2a 100644
--- a/src/BundleTransformer.TypeScript/BundleTransformer.TypeScript.csproj
+++ b/src/BundleTransformer.TypeScript/BundleTransformer.TypeScript.csproj
@@ -8,14 +8,14 @@
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<NoWarn>$(NoWarn);CS1591;NU5125</NoWarn>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<Description>BundleTransformer.TypeScript contains one translator-adapter - `TypeScriptTranslator` (supports the TypeScript (http://www.typescriptlang.org) version 3.9.6). This adapter makes translation of TypeScript code to JS code. Also contains the `TypeScriptAssetHandler` debugging HTTP handler, which is responsible for text output of translated TypeScript asset.
+		<Description>BundleTransformer.TypeScript contains one translator-adapter - `TypeScriptTranslator` (supports the TypeScript (http://www.typescriptlang.org) version 3.9.7). This adapter makes translation of TypeScript code to JS code. Also contains the `TypeScriptAssetHandler` debugging HTTP handler, which is responsible for text output of translated TypeScript asset.
 
 BundleTransformer.TypeScript does not support external modules (CommonJS, AMD, SystemJS, UMD and ES6 modules).
 
 As a JS engine is used the JavaScript Engine Switcher library (https://github.com/Taritsyn/JavaScriptEngineSwitcher). For correct working of this module, you need to install one of the following NuGet packages: JavaScriptEngineSwitcher.Msie (only in the Chakra “Edge” JsRT mode), JavaScriptEngineSwitcher.V8 or JavaScriptEngineSwitcher.ChakraCore.</Description>
 		<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/BundleTransformer/master/images/icons/128/BundleTransformer_TypeScript_Logo_128x128.png</PackageIconUrl>
 		<PackageTags>BundleTransformer;System.Web.Optimization;IBundleTransform;ASP.NET;JavaScript;JS;Bundling;TypeScript;Translation;Translator;Compilation;Compiler</PackageTags>
-		<PackageReleaseNotes>Added support of the TypeScript version 3.9.6.</PackageReleaseNotes>
+		<PackageReleaseNotes>Added support of the TypeScript version 3.9.7.</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />
diff --git a/src/BundleTransformer.TypeScript/Resources/typescript-combined.js b/src/BundleTransformer.TypeScript/Resources/typescript-combined.js
index b4ba7d40b..baa71b575 100644
--- a/src/BundleTransformer.TypeScript/Resources/typescript-combined.js
+++ b/src/BundleTransformer.TypeScript/Resources/typescript-combined.js
@@ -67,7 +67,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "3.9";
-    ts.version = "3.9.6";
+    ts.version = "3.9.7";
     function tryGetNativeMap() {
         return typeof Map !== "undefined" && "entries" in Map.prototype ? Map : undefined;
     }
@@ -2114,6 +2114,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var _a;
     var nullLogger = {
         logEvent: ts.noop,
         logErrEvent: ts.noop,
@@ -2138,7 +2139,8 @@ var ts;
     };/*BT-
     var etwModule;
     try {
-        etwModule = require("@microsoft/typescript-etw");
+        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
+        etwModule = require(etwModulePath);
     }
     catch (e) {
         etwModule = undefined;
diff --git a/src/BundleTransformer.TypeScript/readme.txt b/src/BundleTransformer.TypeScript/readme.txt
index 45044e068..4917cde0b 100644
--- a/src/BundleTransformer.TypeScript/readme.txt
+++ b/src/BundleTransformer.TypeScript/readme.txt
@@ -13,7 +13,7 @@
    ===========
    BundleTransformer.TypeScript contains one translator-adapter -
    `TypeScriptTranslator` (supports the TypeScript (http://www.typescriptlang.org)
-   version 3.9.6). This adapter makes translation of TypeScript code to JS code.
+   version 3.9.7). This adapter makes translation of TypeScript code to JS code.
    Also contains the `TypeScriptAssetHandler` debugging HTTP handler, which is
    responsible for text output of translated TypeScript asset.
 
@@ -26,7 +26,7 @@
    =============
    RELEASE NOTES
    =============
-   Added support of the TypeScript version 3.9.6.
+   Added support of the TypeScript version 3.9.7.
 
    ====================
    POST-INSTALL ACTIONS