Skip to content

Commit 4a26dce

Browse files
akshita31akshita31
authored
Merge pull request #2967 from akshita31/omnisharp_update
Add the omnisharp 1.32.13 updates
2 parents c3337aa + d60835d commit 4a26dce

File tree

4 files changed

+40
-40
lines changed

4 files changed

+40
-40
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@
144144
"updatePackageDependencies"
145145
],
146146
"env": {
147-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9c36608c-cb04-451f-8df7-547eeb9b5d55/8626f25cb9fb40cd6fa2508009fccd1d/coreclr-debug-linux-x64.zip,https://download.visualstudio.microsoft.com/download/pr/9c36608c-cb04-451f-8df7-547eeb9b5d55/b5b307980f5da0bc161018acfad043c9/coreclr-debug-osx-x64.zip,https://download.visualstudio.microsoft.com/download/pr/9c36608c-cb04-451f-8df7-547eeb9b5d55/4b9c72a90d4558d8e72e653c1ea79936/coreclr-debug-win7-x64.zip",
148-
"NEW_DEPS_VERSION": "1.18.0"
147+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/05754b42f101bd577c701b871a950390/omnisharp-linux-x64-1.32.13.zip,https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/e3e29593834e777ed825d856e1ecacee/omnisharp-linux-x86-1.32.13.zip,https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/88198e741f987291ff067179fb47e063/omnisharp-osx-1.32.13.zip,https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/f0b0e318d1bd9eae2b694e5a47b1615f/omnisharp-win-x64-1.32.13.zip,https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/32011b2b326552dbdef73952ad67a382/omnisharp-win-x86-1.32.13.zip" ,
148+
"NEW_DEPS_VERSION": "1.32.13"
149149
},
150150
"cwd": "${workspaceFolder}"
151151
}

‎package.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-vscode",
4-
"version": "1.18.0",
4+
"version": "1.18.1",
55
"description": "C# for Visual Studio Code (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -29,7 +29,7 @@
2929
"dotnet"
3030
],
3131
"defaults": {
32-
"omniSharp": "1.32.11",
32+
"omniSharp": "1.32.13",
3333
"razor": "1.0.0-alpha2.1-20190322.5"
3434
},
3535
"main": "./dist/extension",
@@ -159,58 +159,58 @@
159159
{
160160
"id": "OmniSharp",
161161
"description": "OmniSharp for Windows (.NET 4.6 / x86)",
162-
"url": "https://download.visualstudio.microsoft.com/download/pr/589d976c-645f-4762-9a9b-d8dcc3e58756/2b4f781a43ed12ee45123af2a9c383a1/omnisharp-win-x86-1.32.11.zip",
163-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.32.11.zip",
164-
"installPath": ".omnisharp/1.32.11",
162+
"url": "https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/32011b2b326552dbdef73952ad67a382/omnisharp-win-x86-1.32.13.zip",
163+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.32.13.zip",
164+
"installPath": ".omnisharp/1.32.13",
165165
"platforms": [
166166
"win32"
167167
],
168168
"architectures": [
169169
"x86"
170170
],
171-
"installTestPath": "./.omnisharp/1.32.11/OmniSharp.exe",
171+
"installTestPath": "./.omnisharp/1.32.13/OmniSharp.exe",
172172
"platformId": "win-x86",
173-
"integrity": "2033902379327B95222FD6CEFECE6C69AA078B7EF40393A2CCFDF9AB08E6C16E"
173+
"integrity": "CCA922DBBBDE6D416FD774F31BB8A5CDC99A389F9F7ED669E6C3B10EA74D1919"
174174
},
175175
{
176176
"id": "OmniSharp",
177177
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
178-
"url": "https://download.visualstudio.microsoft.com/download/pr/589d976c-645f-4762-9a9b-d8dcc3e58756/c5b3a4f9a05ae8b2a7f87db37303c120/omnisharp-win-x64-1.32.11.zip",
179-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.32.11.zip",
180-
"installPath": ".omnisharp/1.32.11",
178+
"url": "https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/f0b0e318d1bd9eae2b694e5a47b1615f/omnisharp-win-x64-1.32.13.zip",
179+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.32.13.zip",
180+
"installPath": ".omnisharp/1.32.13",
181181
"platforms": [
182182
"win32"
183183
],
184184
"architectures": [
185185
"x86_64"
186186
],
187-
"installTestPath": "./.omnisharp/1.32.11/OmniSharp.exe",
187+
"installTestPath": "./.omnisharp/1.32.13/OmniSharp.exe",
188188
"platformId": "win-x64",
189-
"integrity": "E5D89064F520F9A37709AF550A65BDAE6374FD8193485D5AFFE519415A6C0678"
189+
"integrity": "F2FF5330E83DFC6E8C0F31276C66850DD5A2677026FC47DD853BA6A52903D3C0"
190190
},
191191
{
192192
"id": "OmniSharp",
193193
"description": "OmniSharp for OSX",
194-
"url": "https://download.visualstudio.microsoft.com/download/pr/589d976c-645f-4762-9a9b-d8dcc3e58756/75c6fc5949ccbca7b086c445fcf49a82/omnisharp-osx-1.32.11.zip",
195-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.32.11.zip",
196-
"installPath": ".omnisharp/1.32.11",
194+
"url": "https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/88198e741f987291ff067179fb47e063/omnisharp-osx-1.32.13.zip",
195+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.32.13.zip",
196+
"installPath": ".omnisharp/1.32.13",
197197
"platforms": [
198198
"darwin"
199199
],
200200
"binaries": [
201201
"./mono.osx",
202202
"./run"
203203
],
204-
"installTestPath": "./.omnisharp/1.32.11/run",
204+
"installTestPath": "./.omnisharp/1.32.13/run",
205205
"platformId": "osx",
206-
"integrity": "C8ECC3C4620A4607617FEE4CC84FB3A4C76F2762F75A0953B9BC96992A486608"
206+
"integrity": "46D9AECA3D84F8727EA803AABF4BC5A35D60E281CC347E7A7460FA1BB75C730D"
207207
},
208208
{
209209
"id": "OmniSharp",
210210
"description": "OmniSharp for Linux (x86)",
211-
"url": "https://download.visualstudio.microsoft.com/download/pr/589d976c-645f-4762-9a9b-d8dcc3e58756/0ecf73163422fc7037f8635fd984f25b/omnisharp-linux-x86-1.32.11.zip",
212-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.32.11.zip",
213-
"installPath": ".omnisharp/1.32.11",
211+
"url": "https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/e3e29593834e777ed825d856e1ecacee/omnisharp-linux-x86-1.32.13.zip",
212+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.32.13.zip",
213+
"installPath": ".omnisharp/1.32.13",
214214
"platforms": [
215215
"linux"
216216
],
@@ -222,16 +222,16 @@
222222
"./mono.linux-x86",
223223
"./run"
224224
],
225-
"installTestPath": "./.omnisharp/1.32.11/run",
225+
"installTestPath": "./.omnisharp/1.32.13/run",
226226
"platformId": "linux-x86",
227-
"integrity": "2F2D2688F19FC59C4712D57AFFC553DAF62B873CA092A74FC587F8499148B6F9"
227+
"integrity": "A55E67FF75779A118EBDC6CCCFC880A9C79EEB8DBC07661FB27897E59642A55C"
228228
},
229229
{
230230
"id": "OmniSharp",
231231
"description": "OmniSharp for Linux (x64)",
232-
"url": "https://download.visualstudio.microsoft.com/download/pr/589d976c-645f-4762-9a9b-d8dcc3e58756/5654b2e66b8ef31eafd254933d568a67/omnisharp-linux-x64-1.32.11.zip",
233-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.32.11.zip",
234-
"installPath": ".omnisharp/1.32.11",
232+
"url": "https://download.visualstudio.microsoft.com/download/pr/8fe6eb8c-375b-4b07-a65e-78ea53993aef/05754b42f101bd577c701b871a950390/omnisharp-linux-x64-1.32.13.zip",
233+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.32.13.zip",
234+
"installPath": ".omnisharp/1.32.13",
235235
"platforms": [
236236
"linux"
237237
],
@@ -242,9 +242,9 @@
242242
"./mono.linux-x86_64",
243243
"./run"
244244
],
245-
"installTestPath": "./.omnisharp/1.32.11/run",
245+
"installTestPath": "./.omnisharp/1.32.13/run",
246246
"platformId": "linux-x64",
247-
"integrity": "BA21D9D0C66997E2384AA1213996690E326FA967BFC9B10ED236DCC48A643ED1"
247+
"integrity": "D44C4164193F39D2E3DBB6A93432D0D92C2ADEDC162DD807A6A15F68935593F1"
248248
},
249249
{
250250
"id": "Debugger",
@@ -2903,4 +2903,4 @@
29032903
]
29042904
}
29052905
}
2906-
}
2906+
}

‎src/observers/TelemetryObserver.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ export class TelemetryObserver {
4646
break;
4747
case EventType.ProjectConfigurationReceived:
4848
let projectConfig = (<ProjectConfiguration>event).projectConfiguration;
49-
telemetryProps['ProjectGuid'] = projectConfig.ProjectGuid;
50-
telemetryProps['TargetFrameworks'] = projectConfig.TargetFrameworks.join(";");
51-
telemetryProps['References'] = projectConfig.References.join(";");
52-
telemetryProps['FileExtensions'] = projectConfig.FileExtensions.join(";");
49+
telemetryProps['ProjectId'] = projectConfig.ProjectGuid;
50+
telemetryProps['TargetFrameworks'] = projectConfig.TargetFrameworks.join("|");
51+
telemetryProps['References'] = projectConfig.References.join("|");
52+
telemetryProps['FileExtensions'] = projectConfig.FileExtensions.join("|");
5353
this.reporter.sendTelemetryEvent("ProjectConfiguration", telemetryProps);
5454
break;
5555
}

‎test/unitTests/logging/TelemetryObserver.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@ suite('TelemetryReporterObserver', () => {
5151

5252
test(`${ProjectConfiguration.name}: Telemetry props contains project file path and target framework`, () => {
5353
const targetFrameworks = new Array("tfm1", "tfm2");
54-
const projectFilePath = "projectFilePath";
54+
const projectId = "projectFilePath";
5555
const references = new Array("ref1", "ref2");
5656
const fileExtensions = new Array(".cs", ".cshtml");
5757
let event = new ProjectConfiguration({
5858
TargetFrameworks: targetFrameworks,
59-
ProjectGuid: projectFilePath,
59+
ProjectGuid: projectId,
6060
References: references,
6161
FileExtensions: fileExtensions
6262
});
6363

6464
observer.post(event);
65-
expect(property["TargetFrameworks"]).to.be.equal("tfm1;tfm2");
66-
expect(property["ProjectGuid"]).to.be.equal(projectFilePath);
67-
expect(property["References"]).to.be.equal("ref1;ref2");
68-
expect(property["FileExtensions"]).to.be.equal(".cs;.cshtml");
65+
expect(property["TargetFrameworks"]).to.be.equal("tfm1|tfm2");
66+
expect(property["ProjectId"]).to.be.equal(projectId);
67+
expect(property["References"]).to.be.equal("ref1|ref2");
68+
expect(property["FileExtensions"]).to.be.equal(".cs|.cshtml");
6969
});
7070

7171
[

0 commit comments

Comments
 (0)