Merge pull request #1320 from nagilson/nagilson-171-release

Increase Timeout Time, Change File, 1.7.1 Release

Documentation/troubleshooting-runtime.md

@@ -2,7 +2,7 @@
 
 ## Install Script Timeouts
 
-Please note that, depending on your network speed, installing the .NET Core runtime might take some time. By default, the installation terminates unsuccessfully if it takes longer than 2 minutes to finish. If you believe this is too little (or too much) time to allow for the download, you can change the timeout value by setting `dotnetAcquisitionExtension.installTimeoutValue` to a custom value.
+Please note that, depending on your network speed, installing the .NET Core runtime might take some time. By default, the installation terminates unsuccessfully if it takes longer than 10 minutes to finish. If you believe this is too little (or too much) time to allow for the download, you can change the timeout value by setting `dotnetAcquisitionExtension.installTimeoutValue` to a custom value.
 
 Learn more about configuring Visual Studio Code settings [here](https://code.visualstudio.com/docs/getstarted/settings) and see below for an example of a custom timeout in a `settings.json` file. In this example the custom timeout value is 180 seconds, or 3 minutes.
 

Documentation/troubleshooting-sdk.md

@@ -20,7 +20,7 @@ To manually set the PATH, edit your `.bash_profile` file to include the followin
 
 ## Install Script Timeouts
 
-Please note that, depending on your network speed, installing the .NET SDK might take some time. By default, the installation terminates unsuccessfully if it takes longer than 4 minutes to finish. If you believe this is too little (or too much) time to allow for the download, you can change the timeout value by setting `dotnetSDKAcquisitionExtension.installTimeoutValue` to a custom value.
+Please note that, depending on your network speed, installing the .NET SDK might take some time. By default, the installation terminates unsuccessfully if it takes longer than 10 minutes to finish. If you believe this is too little (or too much) time to allow for the download, you can change the timeout value by setting `dotnetSDKAcquisitionExtension.installTimeoutValue` to a custom value.
 
 Learn more about configuring Visual Studio Code settings [here](https://code.visualstudio.com/docs/getstarted/settings) and see below for an example of a custom timeout in a `settings.json` file. In this example the custom timeout value is 300 seconds, or 5 minutes.
 

vscode-dotnet-runtime-extension/CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [1.7.1] - 2023-08-14
+
+This is a small release that changes the error handling and issue reporting experience to make it easier to submit issues with the information we need to properly triage them. It also updates some package dependencies and increases timeout time.
 
 ## [1.7.0] - 2023-08-14
 

vscode-dotnet-runtime-extension/package.json

@@ -13,7 +13,7 @@
 	"description": "This extension installs and manages different versions of the .NET Runtime.",
 	"appInsightsKey": "02dc18e0-7494-43b2-b2a3-18ada5fcb522",
 	"icon": "images/dotnetIcon.png",
-	"version": "1.7.0",
+	"version": "1.7.1",
 	"publisher": "ms-dotnettools",
 	"engines": {
 		"vscode": "^1.72.0"
@@ -61,7 +61,7 @@
 				},
 				"dotnetAcquisitionExtension.installTimeoutValue": {
 					"type": "number",
-					"default": 300,
+					"default": 600,
 					"description": "Timeout for installing .NET in seconds."
 				},
 				"dotnetAcquisitionExtension.existingDotnetPath": {
@@ -101,13 +101,13 @@
 		"yarn": "^1.22.19"
 	},
 	"devDependencies": {
-		"@types/chai": "4.2.22",
+		"@types/chai": "^4.3.5",
 		"@types/mocha": "^9.0.0",
 		"@types/node": "16.11.7",
 		"@types/rimraf": "3.0.2",
 		"@types/vscode": "1.62.0",
 		"copy-webpack-plugin": "9.0.1",
-		"webpack": "5.63.0",
+		"webpack": "5.88.2",
 		"webpack-cli": "4.9.1"
 	},
 	"__metadata": {
@@ -116,4 +116,4 @@
 		"publisherId": "d05e23de-3974-4ff0-8d47-23ee77830092",
 		"isPreReleaseVersion": false
 	}
-}
+}

vscode-dotnet-runtime-extension/src/extension.ts

@@ -60,7 +60,7 @@ namespace commandKeys {
 const commandPrefix = 'dotnet';
 const configPrefix = 'dotnetAcquisitionExtension';
 const displayChannelName = '.NET Runtime';
-const defaultTimeoutValue = 300;
+const defaultTimeoutValue = 600;
 const moreInfoUrl = 'https://github.com/dotnet/vscode-dotnet-runtime/blob/main/Documentation/troubleshooting-runtime.md';
 
 export function activate(context: vscode.ExtensionContext, extensionContext?: IExtensionContext) {

vscode-dotnet-runtime-extension/src/test/functional/DotnetCoreAcquisitionExtension.test.ts

@@ -17,7 +17,7 @@ import {
   MockWindowDisplayWorker,
 } from 'vscode-dotnet-runtime-library';
 import * as extension from '../../extension';
-const assert = chai.assert;
+const assert : any = chai.assert;
 /* tslint:disable:no-any */
 
 suite('DotnetCoreAcquisitionExtension End to End', function() {
@@ -131,7 +131,7 @@ suite('DotnetCoreAcquisitionExtension End to End', function() {
     const context: IDotnetAcquireContext = { version: 'foo', requestingExtensionId };
     try {
       await vscode.commands.executeCommand<IDotnetAcquireResult>('dotnet.acquire', context);
-      assert(false); // An error should have been thrown
+      assert.isTrue(false); // An error should have been thrown
     } catch (error) {
       const versionError = MockTelemetryReporter.telemetryEvents.find((event: ITelemetryEvent) => event.eventName === '[ERROR]:DotnetVersionResolutionError');
       assert.exists(versionError);