Skip to content

Commit e17e399

Browse files
authored
Merge pull request #1320 from nagilson/nagilson-171-release
Increase Timeout Time, Change File, 1.7.1 Release
2 parents d063e14 + 104ba2b commit e17e399

File tree

16 files changed

+8254
-7887
lines changed

16 files changed

+8254
-7887
lines changed

Documentation/troubleshooting-runtime.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Install Script Timeouts
44

5-
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.
5+
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.
66

77
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.
88

Documentation/troubleshooting-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To manually set the PATH, edit your `.bash_profile` file to include the followin
2020

2121
## Install Script Timeouts
2222

23-
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.
23+
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.
2424

2525
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.
2626

sample/yarn.lock

Lines changed: 813 additions & 813 deletions
Large diffs are not rendered by default.

vscode-dotnet-runtime-extension/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning].
77

88
## [Unreleased]
99

10+
## [1.7.1] - 2023-08-14
11+
12+
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.
1013

1114
## [1.7.0] - 2023-08-14
1215

vscode-dotnet-runtime-extension/package-lock.json

Lines changed: 607 additions & 419 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vscode-dotnet-runtime-extension/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"description": "This extension installs and manages different versions of the .NET Runtime.",
1414
"appInsightsKey": "02dc18e0-7494-43b2-b2a3-18ada5fcb522",
1515
"icon": "images/dotnetIcon.png",
16-
"version": "1.7.0",
16+
"version": "1.7.1",
1717
"publisher": "ms-dotnettools",
1818
"engines": {
1919
"vscode": "^1.72.0"
@@ -61,7 +61,7 @@
6161
},
6262
"dotnetAcquisitionExtension.installTimeoutValue": {
6363
"type": "number",
64-
"default": 300,
64+
"default": 600,
6565
"description": "Timeout for installing .NET in seconds."
6666
},
6767
"dotnetAcquisitionExtension.existingDotnetPath": {
@@ -101,13 +101,13 @@
101101
"yarn": "^1.22.19"
102102
},
103103
"devDependencies": {
104-
"@types/chai": "4.2.22",
104+
"@types/chai": "^4.3.5",
105105
"@types/mocha": "^9.0.0",
106106
"@types/node": "16.11.7",
107107
"@types/rimraf": "3.0.2",
108108
"@types/vscode": "1.62.0",
109109
"copy-webpack-plugin": "9.0.1",
110-
"webpack": "5.63.0",
110+
"webpack": "5.88.2",
111111
"webpack-cli": "4.9.1"
112112
},
113113
"__metadata": {
@@ -116,4 +116,4 @@
116116
"publisherId": "d05e23de-3974-4ff0-8d47-23ee77830092",
117117
"isPreReleaseVersion": false
118118
}
119-
}
119+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace commandKeys {
6060
const commandPrefix = 'dotnet';
6161
const configPrefix = 'dotnetAcquisitionExtension';
6262
const displayChannelName = '.NET Runtime';
63-
const defaultTimeoutValue = 300;
63+
const defaultTimeoutValue = 600;
6464
const moreInfoUrl = 'https://github.com/dotnet/vscode-dotnet-runtime/blob/main/Documentation/troubleshooting-runtime.md';
6565

6666
export function activate(context: vscode.ExtensionContext, extensionContext?: IExtensionContext) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
MockWindowDisplayWorker,
1818
} from 'vscode-dotnet-runtime-library';
1919
import * as extension from '../../extension';
20-
const assert = chai.assert;
20+
const assert : any = chai.assert;
2121
/* tslint:disable:no-any */
2222

2323
suite('DotnetCoreAcquisitionExtension End to End', function() {
@@ -131,7 +131,7 @@ suite('DotnetCoreAcquisitionExtension End to End', function() {
131131
const context: IDotnetAcquireContext = { version: 'foo', requestingExtensionId };
132132
try {
133133
await vscode.commands.executeCommand<IDotnetAcquireResult>('dotnet.acquire', context);
134-
assert(false); // An error should have been thrown
134+
assert.isTrue(false); // An error should have been thrown
135135
} catch (error) {
136136
const versionError = MockTelemetryReporter.telemetryEvents.find((event: ITelemetryEvent) => event.eventName === '[ERROR]:DotnetVersionResolutionError');
137137
assert.exists(versionError);

0 commit comments

Comments
 (0)