Skip to content

Commit 6c02c88

Browse files
committed
Add more changes
1 parent 2de6f75 commit 6c02c88

File tree

3 files changed

+46
-21
lines changed

3 files changed

+46
-21
lines changed

package-lock.json

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

package.json

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,18 @@
149149
{
150150
"id": "OmniSharp",
151151
"description": "OmniSharp for Windows (.NET 4.6 / x86)",
152-
"url": "https://download.visualstudio.microsoft.com/download/pr/515dbb33-d644-4ba6-9ee4-8ca7227ab580/02621f196a581cb3062dbeab2ec28429/omnisharp-win-x86-1.32.8.zip",
153-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.32.8.zip",
154-
"installPath": ".omnisharp/1.32.8",
152+
"url": "https://download.visualstudio.microsoft.com/download/pr/ed7cfe88-470c-421d-8078-062aea0f0ead/e9e2a6b82a6084fa4de82cb1515098fc/omnisharp-win-x86-1.32.7.zip",
153+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.32.7.zip",
154+
"installPath": ".omnisharp/1.32.7",
155155
"platforms": [
156156
"win32"
157157
],
158158
"architectures": [
159159
"x86"
160160
],
161-
"installTestPath": "./.omnisharp/1.32.8/OmniSharp.exe",
162-
"platformId": "win-x86"
161+
"installTestPath": "./.omnisharp/1.32.7/OmniSharp.exe",
162+
"platformId": "win-x86",
163+
"integrity": "30AE34B885D448D5677A85FB0D3ECA568F79EF135C3F34B5698F17AD90E2D3D2"
163164
},
164165
{
165166
"id": "OmniSharp",
@@ -463,12 +464,12 @@
463464
"items": {
464465
"type": "string"
465466
},
466-
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
467+
"description": "Array of symbol server URLs (example: http://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
467468
"default": []
468469
},
469470
"searchMicrosoftSymbolServer": {
470471
"type": "boolean",
471-
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
472+
"description": "If 'true' the Microsoft Symbol server (https://msdl.microsoft.com/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
472473
"default": false
473474
},
474475
"cachePath": {
@@ -1312,12 +1313,12 @@
13121313
"items": {
13131314
"type": "string"
13141315
},
1315-
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
1316+
"description": "Array of symbol server URLs (example: http://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
13161317
"default": []
13171318
},
13181319
"searchMicrosoftSymbolServer": {
13191320
"type": "boolean",
1320-
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
1321+
"description": "If 'true' the Microsoft Symbol server (https://msdl.microsoft.com/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
13211322
"default": false
13221323
},
13231324
"cachePath": {
@@ -1713,12 +1714,12 @@
17131714
"items": {
17141715
"type": "string"
17151716
},
1716-
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
1717+
"description": "Array of symbol server URLs (example: http://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
17171718
"default": []
17181719
},
17191720
"searchMicrosoftSymbolServer": {
17201721
"type": "boolean",
1721-
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
1722+
"description": "If 'true' the Microsoft Symbol server (https://msdl.microsoft.com/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
17221723
"default": false
17231724
},
17241725
"cachePath": {
@@ -2380,12 +2381,12 @@
23802381
"items": {
23812382
"type": "string"
23822383
},
2383-
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
2384+
"description": "Array of symbol server URLs (example: http://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
23842385
"default": []
23852386
},
23862387
"searchMicrosoftSymbolServer": {
23872388
"type": "boolean",
2388-
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
2389+
"description": "If 'true' the Microsoft Symbol server (https://msdl.microsoft.com/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
23892390
"default": false
23902391
},
23912392
"cachePath": {
@@ -2781,12 +2782,12 @@
27812782
"items": {
27822783
"type": "string"
27832784
},
2784-
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
2785+
"description": "Array of symbol server URLs (example: http://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
27852786
"default": []
27862787
},
27872788
"searchMicrosoftSymbolServer": {
27882789
"type": "boolean",
2789-
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
2790+
"description": "If 'true' the Microsoft Symbol server (https://msdl.microsoft.com/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
27902791
"default": false
27912792
},
27922793
"cachePath": {
@@ -2911,4 +2912,4 @@
29112912
]
29122913
}
29132914
}
2914-
}
2915+
}

src/tools/UpdatePackageDependencies.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export async function updatePackageDependencies(): Promise<void> {
9595
const networkSettingsProvider: NetworkSettingsProvider = () => new NetworkSettings(/*proxy:*/ null, /*stringSSL:*/ true);
9696

9797
const downloadAndGetHash = async (url: string): Promise<string> => {
98-
console.log(`Downlodaing from '${url}'`);
98+
console.log(`Downloading from '${url}'`);
9999
const buffer: Buffer = await DownloadFile(url, eventStream, networkSettingsProvider, url, null);
100100
return getBufferIntegrityHash(buffer);
101101
};
@@ -143,7 +143,7 @@ function replaceVersion(value: string, newVersion: string): string {
143143
dottedVersionRegExp.lastIndex = 0;
144144

145145
if (!regex.test(value)) {
146-
return value; //If the string doesnt contain any version return the same string
146+
return value; //If the string doesn't contain any version return the same string
147147
}
148148

149149
return value.replace(regex, newValue);
@@ -169,10 +169,10 @@ function verifyMatchCount(value: string, shouldContainVersion = false): void {
169169
const matchCount: number = dottedMatches + dashedMatches;
170170

171171
if (shouldContainVersion && matchCount == 0) {
172-
throw new Error(`Version number not found in fallback URL '${value}'.`);
172+
throw new Error(`Version number not found in '${value}'.`);
173173
}
174174
if (matchCount > 1) {
175-
throw new Error(`Ambiguous version pattern found in fallback URL '${value}'. Multiple version strings found.`);
175+
throw new Error(`Ambiguous version pattern found in '${value}'. Multiple version strings found.`);
176176
}
177177
}
178178

@@ -192,7 +192,7 @@ function getLowercaseFileNameFromUrl(url: string): string {
192192
if (!versions || versions.length == 0) {
193193
return fileName;
194194
}
195-
195+
196196
if (versions.length > 1) {
197197
//we expect only one version string to be present in the last part of the url
198198
throw new Error(`Ambiguous version pattern found in fallback URL '${url}'. Multiple version strings found.`);

0 commit comments

Comments
 (0)