Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new version of O# #5625

Merged
merged 1 commit into from
Mar 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@
"updatePackageDependencies"
],
"env": {
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-x64-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-x86-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-arm64-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-osx-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-x64-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-x86-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-arm64-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-musl-x64-net6.0-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-musl-arm64-net6.0-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-x64-net6.0-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-arm64-net6.0-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-osx-x64-net6.0-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-osx-arm64-net6.0-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-x64-net6.0-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-x86-net6.0-1.39.5.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-arm64-net6.0-1.39.5.zip",
"NEW_DEPS_VERSION": "1.39.5"
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-x64-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-x86-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-arm64-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-osx-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x64-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x86-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-arm64-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-musl-x64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-musl-arm64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-x64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-arm64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-osx-x64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-osx-arm64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x86-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-arm64-net6.0-1.39.6.zip",
"NEW_DEPS_VERSION": "1.39.6"
},
"cwd": "${workspaceFolder}"
}
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
* As a workaround, make an edit within the file before using Rename Symbol.

## 1.25.5
* Update OmniSharp to 1.39.6 (PR: [#5625](https://github.com/OmniSharp/omnisharp-vscode/pull/5625))
* Use new VS threading version to match with Razor (PR:[#2518](https://github.com/OmniSharp/omnisharp-roslyn/pull/2518))
* Update OmniSharp to 1.39.5 (PR: [#5618](https://github.com/OmniSharp/omnisharp-vscode/pull/5618))
* Update to Roslyn `4.6.0-3.23153.5` (PR:[#2511](https://github.com/OmniSharp/omnisharp-roslyn/pull/2511))
* Report to the client if the project being loaded is sdk style (PR:[#2502](https://github.com/OmniSharp/omnisharp-roslyn/pull/2502))
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ If you still need Unity or .NET Framework support, you can set `omnisharp.useMod
See issue [#5120](https://github.com/OmniSharp/omnisharp-vscode/issues/5120) for more details.

## What's new in 1.25.5
* Update OmniSharp to 1.39.6 (PR: [#5625](https://github.com/OmniSharp/omnisharp-vscode/pull/5625))
* Use new VS threading version to match with Razor (PR:[#2518](https://github.com/OmniSharp/omnisharp-roslyn/pull/2518))
* Update OmniSharp to 1.39.5 (PR: [#5618](https://github.com/OmniSharp/omnisharp-vscode/pull/5618))
* Update to Roslyn `4.6.0-3.23153.5` (PR:[#2511](https://github.com/OmniSharp/omnisharp-roslyn/pull/2511))
* Report to the client if the project being loaded is sdk style (PR:[#2502](https://github.com/OmniSharp/omnisharp-roslyn/pull/2502))
Expand Down
130 changes: 65 additions & 65 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}
},
"defaults": {
"omniSharp": "1.39.5",
"omniSharp": "1.39.6",
"razor": "7.0.0-preview.23067.5"
},
"main": "./dist/extension",
Expand Down Expand Up @@ -127,104 +127,104 @@
{
"id": "OmniSharp",
"description": "OmniSharp for Windows (.NET 4.7.2 / x86)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-x86-1.39.5.zip",
"installPath": ".omnisharp/1.39.5",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x86-1.39.6.zip",
"installPath": ".omnisharp/1.39.6",
"platforms": [
"win32"
],
"architectures": [
"x86"
],
"installTestPath": "./.omnisharp/1.39.5/OmniSharp.exe",
"installTestPath": "./.omnisharp/1.39.6/OmniSharp.exe",
"platformId": "win-x86",
"isFramework": true,
"integrity": "39A26B4CA02E6B50A5A16567DC288D8CC1ABD88DFC1C0340711B2534A00633E9"
"integrity": "BF78EA3018C2613608511A71324F9A5159F3FE361C41B7D6A755A767AF58497F"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Windows (.NET 6 / x86)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-x86-net6.0-1.39.5.zip",
"installPath": ".omnisharp/1.39.5-net6.0",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x86-net6.0-1.39.6.zip",
"installPath": ".omnisharp/1.39.6-net6.0",
"platforms": [
"win32"
],
"architectures": [
"x86"
],
"installTestPath": "./.omnisharp/1.39.5-net6.0/OmniSharp.dll",
"installTestPath": "./.omnisharp/1.39.6-net6.0/OmniSharp.dll",
"platformId": "win-x86",
"isFramework": false,
"integrity": "CC3382E70B7C8971939F4F35DDE46E73C6BA4A0DD40BE5ECC1C4F5A5E1688828"
"integrity": "6D0E35584CDD8B5C0FED0A42D71EAC0414C455D6B476B482CF52D6AEBAC1CDD4"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Windows (.NET 4.7.2 / x64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-x64-1.39.5.zip",
"installPath": ".omnisharp/1.39.5",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x64-1.39.6.zip",
"installPath": ".omnisharp/1.39.6",
"platforms": [
"win32"
],
"architectures": [
"x86_64"
],
"installTestPath": "./.omnisharp/1.39.5/OmniSharp.exe",
"installTestPath": "./.omnisharp/1.39.6/OmniSharp.exe",
"platformId": "win-x64",
"isFramework": true,
"integrity": "68BE38081528C5C799579CE11C5A976A0D8F911C5F739715B6156AD37A326287"
"integrity": "0429E2986CAE2BEC50728AD3492BA56A69529967A750CCE7F18D6C428E24B6B9"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Windows (.NET 6 / x64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-x64-net6.0-1.39.5.zip",
"installPath": ".omnisharp/1.39.5-net6.0",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x64-net6.0-1.39.6.zip",
"installPath": ".omnisharp/1.39.6-net6.0",
"platforms": [
"win32"
],
"architectures": [
"x86_64"
],
"installTestPath": "./.omnisharp/1.39.5-net6.0/OmniSharp.dll",
"installTestPath": "./.omnisharp/1.39.6-net6.0/OmniSharp.dll",
"platformId": "win-x64",
"isFramework": false,
"integrity": "7410CF9B0D1E6ACF0821A104A5A34BA8E2C8B336A99D3F239789B13C6D48048A"
"integrity": "74A8A99B027E4AF3409C4282ED71D201152DE18BB59ECA0A06DA5F7A660026B4"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Windows (.NET 4.7.2 / arm64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-arm64-1.39.5.zip",
"installPath": ".omnisharp/1.39.5",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-arm64-1.39.6.zip",
"installPath": ".omnisharp/1.39.6",
"platforms": [
"win32"
],
"architectures": [
"arm64"
],
"installTestPath": "./.omnisharp/1.39.5/OmniSharp.exe",
"installTestPath": "./.omnisharp/1.39.6/OmniSharp.exe",
"platformId": "win-arm64",
"isFramework": true,
"integrity": "5E9909C42D82B4C16843756B24EEA0B483CD6E2CB75484C733129E0701C977A3"
"integrity": "5CC9975B2599E56ACE57303E9FE53872E3DE32DEE6C678ADB9A507380D19FEA9"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Windows (.NET 6 / arm64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-win-arm64-net6.0-1.39.5.zip",
"installPath": ".omnisharp/1.39.5-net6.0",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-arm64-net6.0-1.39.6.zip",
"installPath": ".omnisharp/1.39.6-net6.0",
"platforms": [
"win32"
],
"architectures": [
"arm64"
],
"installTestPath": "./.omnisharp/1.39.5-net6.0/OmniSharp.dll",
"installTestPath": "./.omnisharp/1.39.6-net6.0/OmniSharp.dll",
"platformId": "win-arm64",
"isFramework": false,
"integrity": "C924BDD5A17BEE806CE4359DDDDBCAC70708A88BB7D1815F29DFB9113276A21A"
"integrity": "73A6E00B032C72277F60D32C1BB90D9783522F4F814098B35AA672A019BA6025"
},
{
"id": "OmniSharp",
"description": "OmniSharp for OSX (Mono / x64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-osx-1.39.5.zip",
"installPath": ".omnisharp/1.39.5",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-osx-1.39.6.zip",
"installPath": ".omnisharp/1.39.6",
"platforms": [
"darwin"
],
Expand All @@ -236,48 +236,48 @@
"./mono.osx",
"./run"
],
"installTestPath": "./.omnisharp/1.39.5/run",
"installTestPath": "./.omnisharp/1.39.6/run",
"platformId": "osx",
"isFramework": true,
"integrity": "D61A523C52B913AF572122A50FFD7AADDFA3D5AEC35C49B7B013E369D38B4298"
"integrity": "1D1CF5EC77FA2FD7BB74F94F4E1BD34021ECA7B36A3F83C0F84CE68BEA65E5CD"
},
{
"id": "OmniSharp",
"description": "OmniSharp for OSX (.NET 6 / x64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-osx-x64-net6.0-1.39.5.zip",
"installPath": ".omnisharp/1.39.5-net6.0",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-osx-x64-net6.0-1.39.6.zip",
"installPath": ".omnisharp/1.39.6-net6.0",
"platforms": [
"darwin"
],
"architectures": [
"x86_64"
],
"installTestPath": "./.omnisharp/1.39.5-net6.0/OmniSharp.dll",
"installTestPath": "./.omnisharp/1.39.6-net6.0/OmniSharp.dll",
"platformId": "osx-x64",
"isFramework": false,
"integrity": "F706F4312D5CDABF1E861CECE00802F64DD762367DA39D933489AE584BFAA0ED"
"integrity": "F2798C24A93141DB07681625DAC74DB5F1FDD1D26B2927967CD73727F4C2BC48"
},
{
"id": "OmniSharp",
"description": "OmniSharp for OSX (.NET 6 / arm64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-osx-arm64-net6.0-1.39.5.zip",
"installPath": ".omnisharp/1.39.5-net6.0",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-osx-arm64-net6.0-1.39.6.zip",
"installPath": ".omnisharp/1.39.6-net6.0",
"platforms": [
"darwin"
],
"architectures": [
"arm64"
],
"installTestPath": "./.omnisharp/1.39.5-net6.0/OmniSharp.dll",
"installTestPath": "./.omnisharp/1.39.6-net6.0/OmniSharp.dll",
"platformId": "osx-arm64",
"isFramework": false,
"integrity": "6EC7C832E06EEB6284D7440488FB0A003E4A159B57DC0F704167A8E21EE3A87F"
"integrity": "3535C90FB62069376FB2030D4157C8F479CAAAF70DAF3F623F81C5A4DEE22788"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Linux (Mono / x86)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-x86-1.39.5.zip",
"installPath": ".omnisharp/1.39.5",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-x86-1.39.6.zip",
"installPath": ".omnisharp/1.39.6",
"platforms": [
"linux"
],
Expand All @@ -289,16 +289,16 @@
"./mono.linux-x86",
"./run"
],
"installTestPath": "./.omnisharp/1.39.5/run",
"installTestPath": "./.omnisharp/1.39.6/run",
"platformId": "linux-x86",
"isFramework": true,
"integrity": "0B79B937F952FEC805E77DAA991C971011C15A4E134D5A02B0A79D9758F69D53"
"integrity": "8DDA58F724AB7D5C8EEBE0B67F850D655D4C943E557307F1838CAE75B6F5732A"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Linux (Mono / x64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-x64-1.39.5.zip",
"installPath": ".omnisharp/1.39.5",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-x64-1.39.6.zip",
"installPath": ".omnisharp/1.39.6",
"platforms": [
"linux"
],
Expand All @@ -309,32 +309,32 @@
"./mono.linux-x86_64",
"./run"
],
"installTestPath": "./.omnisharp/1.39.5/run",
"installTestPath": "./.omnisharp/1.39.6/run",
"platformId": "linux-x64",
"isFramework": true,
"integrity": "53E86A1E94F143A42B30C52CF765CE5E7BBC894F981962C5F53617F8C82F9A36"
"integrity": "022C65DE2EB1B12EAC6BD7847DA6A5354B162AA8430D2FF1DDB40B6406613C77"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Linux (.NET 6 / x64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-x64-net6.0-1.39.5.zip",
"installPath": ".omnisharp/1.39.5-net6.0",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-x64-net6.0-1.39.6.zip",
"installPath": ".omnisharp/1.39.6-net6.0",
"platforms": [
"linux"
],
"architectures": [
"x86_64"
],
"installTestPath": "./.omnisharp/1.39.5-net6.0/OmniSharp.dll",
"installTestPath": "./.omnisharp/1.39.6-net6.0/OmniSharp.dll",
"platformId": "linux-x64",
"isFramework": false,
"integrity": "98F949C8624B41FB3A346F56AB334D1EC1F09DDF1236480E559BADA843ED3E80"
"integrity": "A3C751F7113F89BB84C56FC832A12CD3B06C44C31B392E02F1D3D044F0D55DD0"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Linux (Mono / arm64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-arm64-1.39.5.zip",
"installPath": ".omnisharp/1.39.5",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-arm64-1.39.6.zip",
"installPath": ".omnisharp/1.39.6",
"platforms": [
"linux"
],
Expand All @@ -345,58 +345,58 @@
"./mono.linux-arm64",
"./run"
],
"installTestPath": "./.omnisharp/1.39.5/run",
"installTestPath": "./.omnisharp/1.39.6/run",
"platformId": "linux-arm64",
"isFramework": true,
"integrity": "8892EE240A71FC8D0EDF06BC3FE8CF02433F0FF3C76518C71FDB4DA243B4C8B5"
"integrity": "D5F8F3BF097B3A4464A295E9D0A696188C0143985219A3B7873B41B44478CD8F"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Linux (.NET 6 / arm64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-arm64-net6.0-1.39.5.zip",
"installPath": ".omnisharp/1.39.5-net6.0",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-arm64-net6.0-1.39.6.zip",
"installPath": ".omnisharp/1.39.6-net6.0",
"platforms": [
"linux"
],
"architectures": [
"arm64"
],
"installTestPath": "./.omnisharp/1.39.5-net6.0/OmniSharp.dll",
"installTestPath": "./.omnisharp/1.39.6-net6.0/OmniSharp.dll",
"platformId": "linux-arm64",
"isFramework": false,
"integrity": "580BC9D7EBC21455C05916F0481C12580FC0636001822624C7D46BB0CE94AA6C"
"integrity": "8ED5A2D1134002AF01E772F8F711D6BF319DAE9BD17129377A101008B93DF10D"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Linux musl (.NET 6 / x64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-musl-x64-net6.0-1.39.5.zip",
"installPath": ".omnisharp/1.39.5-net6.0",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-musl-x64-net6.0-1.39.6.zip",
"installPath": ".omnisharp/1.39.6-net6.0",
"platforms": [
"linux-musl"
],
"architectures": [
"x86_64"
],
"installTestPath": "./.omnisharp/1.39.5-net6.0/OmniSharp.dll",
"installTestPath": "./.omnisharp/1.39.6-net6.0/OmniSharp.dll",
"platformId": "linux-musl-x64",
"isFramework": false,
"integrity": "5F688DD5E6EE8DBA108E793CD0BCAFF306A2DACE88A3060B3CABBF62A3346753"
"integrity": "BD09F2C4CA19229DC81154B6CC58EBA30F341D1ACDD360F1D813AD78D4CBE6C6"
},
{
"id": "OmniSharp",
"description": "OmniSharp for Linux musl (.NET 6 / arm64)",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.5/omnisharp-linux-musl-arm64-net6.0-1.39.5.zip",
"installPath": ".omnisharp/1.39.5-net6.0",
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-musl-arm64-net6.0-1.39.6.zip",
"installPath": ".omnisharp/1.39.6-net6.0",
"platforms": [
"linux-musl"
],
"architectures": [
"arm64"
],
"installTestPath": "./.omnisharp/1.39.5-net6.0/OmniSharp.dll",
"installTestPath": "./.omnisharp/1.39.6-net6.0/OmniSharp.dll",
"platformId": "linux-musl-arm64",
"isFramework": false,
"integrity": "D60EC7E1D7DB59F059A08BE24EDAA9D387ACB2E5849E0D8941749D5B733407F7"
"integrity": "F8E6EA2BB7E9567150015289DBFC526F23118954BE74CE0DC25D25EA12EA4C51"
},
{
"id": "Debugger",
Expand Down