Skip to content

Commit 59b8722

Browse files
DustinCampbellDustinCampbell
committed
Update to latest OmniSharp build and update required Mono version
1 parent 74e0bd9 commit 59b8722

File tree

3 files changed

+42
-67
lines changed

3 files changed

+42
-67
lines changed

‎package.json‎

Lines changed: 38 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-vscode",
4-
"version": "1.12.0-beta4",
4+
"version": "1.12.0-beta5",
55
"description": "C# for Visual Studio Code (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -67,100 +67,79 @@
6767
},
6868
"runtimeDependencies": [
6969
{
70-
"description": "Mono Runtime (Linux / x86)",
71-
"url": "https://download.visualstudio.microsoft.com/download/pr/11004046/b55a892377b7f8157e3ab28a2f8a3a1f/mono.linux-x86-5.2.0.209.zip",
72-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/mono.linux-x86-5.2.0.209.zip",
73-
"installPath": "./bin",
70+
"description": "OmniSharp for Windows (.NET 4.6 / x86)",
71+
"url": "https://download.visualstudio.microsoft.com/download/pr/11071086/063b9e6c2684eeb7fe7bdd18f13251c3/omnisharp-win-x86-1.23.1.zip",
72+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.23.1.zip",
73+
"installPath": ".omnisharp",
7474
"platforms": [
75-
"linux"
75+
"win32"
7676
],
7777
"architectures": [
7878
"x86"
7979
],
80-
"binaries": [
81-
"./mono.linux-x86",
82-
"./run"
83-
],
84-
"installTestPath": "./bin/mono.linux-x86"
80+
"installTestPath": "./.omnisharp/OmniSharp.exe"
8581
},
8682
{
87-
"description": "Mono Runtime (Linux / x64)",
88-
"url": "https://download.visualstudio.microsoft.com/download/pr/11004046/b55a892377b7f8157e3ab28a2f8a3a1f/mono.linux-x86_64-5.2.0.209.zip",
89-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/mono.linux-x86_64-5.2.0.209.zip",
90-
"installPath": "./bin",
83+
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
84+
"url": "https://download.visualstudio.microsoft.com/download/pr/11071082/0a7eaf3db408dd7d32a0f485976e9ae6/omnisharp-win-x64-1.23.1.zip",
85+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.23.1.zip",
86+
"installPath": ".omnisharp",
9187
"platforms": [
92-
"linux"
88+
"win32"
9389
],
9490
"architectures": [
9591
"x86_64"
9692
],
97-
"binaries": [
98-
"./mono.linux-x86_64",
99-
"./run"
100-
],
101-
"installTestPath": "./bin/mono.linux-x86_64"
93+
"installTestPath": "./.omnisharp/OmniSharp.exe"
10294
},
10395
{
104-
"description": "Mono Runtime (macOS)",
105-
"url": "https://download.visualstudio.microsoft.com/download/pr/11004046/b55a892377b7f8157e3ab28a2f8a3a1f/mono.osx-5.2.0.209.zip",
106-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/mono.osx-5.2.0.209.zip",
107-
"installPath": "./bin",
96+
"description": "OmniSharp for OSX",
97+
"url": "https://download.visualstudio.microsoft.com/download/pr/11071084/5379c1db956504a48f36b75cae51d0b7/omnisharp-osx-1.23.1.zip",
98+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.23.1.zip",
99+
"installPath": ".omnisharp",
108100
"platforms": [
109101
"darwin"
110102
],
111103
"binaries": [
112104
"./mono.osx",
113105
"./run"
114106
],
115-
"installTestPath": "./bin/mono.osx"
107+
"installTestPath": "./.omnisharp/mono.osx"
116108
},
117109
{
118-
"description": "Mono Framework Assemblies",
119-
"url": "https://download.visualstudio.microsoft.com/download/pr/11004046/b55a892377b7f8157e3ab28a2f8a3a1f/framework-5.2.0.209.zip",
120-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/framework-5.2.0.209.zip",
121-
"installPath": "./bin/framework",
110+
"description": "OmniSharp for Linux (x86)",
111+
"url": "https://download.visualstudio.microsoft.com/download/pr/11071083/158283a915ddb292272442d60d6e168f/omnisharp-linux-x86-1.23.1.zip",
112+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.23.1.zip",
113+
"installPath": ".omnisharp",
122114
"platforms": [
123-
"darwin",
124115
"linux"
125116
],
126-
"installTestPath": "./bin/framework/mscorlib.dll"
127-
},
128-
{
129-
"description": "OmniSharp (.NET 4.6 / x86)",
130-
"url": "https://download.visualstudio.microsoft.com/download/pr/11004046/b55a892377b7f8157e3ab28a2f8a3a1f/omnisharp-win-x86-1.23.0-alpha1.zip",
131-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.23.0-alpha1.zip",
132-
"installPath": "./bin/omnisharp",
133-
"platforms": [
134-
"win32"
135-
],
136117
"architectures": [
137-
"x86"
118+
"x86",
119+
"i686"
120+
],
121+
"binaries": [
122+
"./mono.linux-x86",
123+
"./run"
138124
],
139-
"installTestPath": "./bin/omnisharp/OmniSharp.exe"
125+
"installTestPath": "./.omnisharp/mono.linux-x86"
140126
},
141127
{
142-
"description": "OmniSharp (.NET 4.6 / x64)",
143-
"url": "https://download.visualstudio.microsoft.com/download/pr/11004046/b55a892377b7f8157e3ab28a2f8a3a1f/omnisharp-win-x64-1.23.0-alpha1.zip",
144-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.23.0-alpha1.zip",
145-
"installPath": "./bin/omnisharp",
128+
"description": "OmniSharp for Linux (x64)",
129+
"url": "https://download.visualstudio.microsoft.com/download/pr/11071081/0298915c96e0e04d63af47073956d770/omnisharp-linux-x64-1.23.1.zip",
130+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.23.1.zip",
131+
"installPath": ".omnisharp",
146132
"platforms": [
147-
"win32"
133+
"linux"
148134
],
149135
"architectures": [
150136
"x86_64"
151137
],
152-
"installTestPath": "./bin/omnisharp/OmniSharp.exe"
153-
},
154-
{
155-
"description": "OmniSharp (Mono 4.6)",
156-
"url": "https://download.visualstudio.microsoft.com/download/pr/11004046/b55a892377b7f8157e3ab28a2f8a3a1f/omnisharp-mono-1.23.0-alpha1.zip",
157-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-mono-1.23.0-alpha1.zip",
158-
"installPath": "./bin/omnisharp",
159-
"platforms": [
160-
"darwin",
161-
"linux"
138+
"binaries": [
139+
"./mono.linux-x86_64",
140+
"./run"
162141
],
163-
"installTestPath": "./bin/omnisharp/OmniSharp.exe"
142+
"installTestPath": "./.omnisharp/mono.linux-x86_64"
164143
},
165144
{
166145
"description": ".NET Core Debugger (Windows / x64)",

‎src/common.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ export function getExtensionPath() {
2222
return extensionPath;
2323
}
2424

25-
export function getBinPath() {
26-
return path.resolve(getExtensionPath(), "bin");
27-
}
28-
2925
export function isBoolean(obj: any): obj is boolean {
3026
return obj === true || obj === false;
3127
}

‎src/omnisharp/launcher.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ function getConfigurationValue(globalConfig: vscode.WorkspaceConfiguration, csha
219219
}
220220

221221
function getLaunchPath(platformInfo: PlatformInformation): string {
222-
const binPath = util.getBinPath();
222+
const binPath = path.resolve(util.getExtensionPath(), '.omnisharp');
223223

224224
return platformInfo.isWindows()
225-
? path.join(binPath, 'omnisharp', 'OmniSharp.exe')
225+
? path.join(binPath, 'OmniSharp.exe')
226226
: path.join(binPath, 'run');
227227
}
228228

@@ -289,12 +289,12 @@ function launchNixMono(launchPath: string, cwd: string, args: string[]): Promise
289289

290290
function canLaunchMono(): Promise<void> {
291291
return new Promise<void>((resolve, reject) => {
292-
hasMono('>=4.6.0').then(success => {
292+
hasMono('>=5.2.0').then(success => {
293293
if (success) {
294294
resolve();
295295
}
296296
else {
297-
reject(new Error('Cannot start Omnisharp because Mono version >=4.0.1 is required.'));
297+
reject(new Error('Cannot start Omnisharp because Mono version >=5.2.0 is required.'));
298298
}
299299
});
300300
});

0 commit comments

Comments
 (0)