Merge branch 'master' into pass-env-variables-on-test-debug

Author: JoeRobich

.github/workflows/ci.yml

@@ -10,6 +10,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/release-ci.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
     - uses: actions/checkout@v2

CHANGELOG.md

@@ -13,6 +13,9 @@
   * As a workaround, make an edit within the file before using Rename Symbol.
 
 ## 1.24.2
+* Support inlay hints ([#1932](https://github.com/OmniSharp/omnisharp-roslyn/issues/1932), PR: [#5107](https://github.com/OmniSharp/omnisharp-vscode/pull/5107))
+* Pass "shell: true" as a spawn option when launching O# (PR: [#5125](https://github.com/OmniSharp/omnisharp-vscode/pull/5125))
+* Add GoToTypeDefinition provider ([#4251](https://github.com/OmniSharp/omnisharp-vscode/issues/4251), PR: [#5094](https://github.com/OmniSharp/omnisharp-vscode/pull/5094))
 * Quote launch paths when necessary ([#5099](https://github.com/OmniSharp/omnisharp-vscode/issues/5099), PR: [#5101](https://github.com/OmniSharp/omnisharp-vscode/pull/5101))
 * Fix string escape for linux and unix (PR: [#5122](https://github.com/OmniSharp/omnisharp-vscode/pull/5122))
 * Debounce diagnostic requests ([#5085](https://github.com/OmniSharp/omnisharp-vscode/issues/5085), PR: [#5089](https://github.com/OmniSharp/omnisharp-vscode/pull/5089))

README.md

@@ -57,6 +57,9 @@ For MacOS and Linux users who have Mono installed, this means you will need to s
 You can also use the .NET 6 build of OmniSharp which runs on the .NET 6 SDK. See instructions above.
 
 ### What's new in 1.24.2
+* Support inlay hints ([#1932](https://github.com/OmniSharp/omnisharp-roslyn/issues/1932), PR: [#5107](https://github.com/OmniSharp/omnisharp-vscode/pull/5107))
+* Pass "shell: true" as a spawn option when launching O# (PR: [#5125](https://github.com/OmniSharp/omnisharp-vscode/pull/5125))
+* Add GoToTypeDefinition provider ([#4251](https://github.com/OmniSharp/omnisharp-vscode/issues/4251), PR: [#5094](https://github.com/OmniSharp/omnisharp-vscode/pull/5094))
 * Quote launch paths when necessary ([#5099](https://github.com/OmniSharp/omnisharp-vscode/issues/5099), PR: [#5101](https://github.com/OmniSharp/omnisharp-vscode/pull/5101))
 * Fix string escape for linux and unix (PR: [#5122](https://github.com/OmniSharp/omnisharp-vscode/pull/5122))
 * Debounce diagnostic requests ([#5085](https://github.com/OmniSharp/omnisharp-vscode/issues/5085), PR: [#5089](https://github.com/OmniSharp/omnisharp-vscode/pull/5089))

package-lock.json

@@ -67,15 +67,15 @@
     "node-machine-id": "1.1.12",
     "request-light": "0.4.0",
     "rxjs": "6.6.7",
-    "semver": "^5.6.0",
+    "semver": "5.6.0",
     "stream": "0.0.2",
     "strip-bom": "5.0.0",
     "strip-bom-buf": "2.0.0",
     "tmp": "0.0.33",
     "vscode-debugprotocol": "1.33.0",
     "vscode-extension-telemetry": "0.1.6",
     "vscode-languageserver-protocol": "3.16.0",
-    "vscode-nls": "^5.0.0",
+    "vscode-nls": "5.0.0",
     "yauzl": "2.10.0"
   },
   "devDependencies": {
@@ -119,7 +119,7 @@
     "typescript": "4.2.4",
     "unzipper": "0.10.11",
     "vsce": "1.100.2",
-    "vscode-test": "1.5.2",
+    "vscode-test": "1.6.1",
     "webpack": "5.34.0",
     "webpack-cli": "4.6.0"
   },
@@ -4071,4 +4071,4 @@
       }
     ]
   }
-}
+}

package.json

@@ -18,7 +18,7 @@ async function main() {
         const extensionTestsPath = path.resolve(__dirname, './featureTests/index');
 
         // Download VS Code, unzip it and run the integration test
-        await runTests({ extensionDevelopmentPath, extensionTestsPath, launchArgs: ['-n', '--verbose'] });
+        await runTests({ version: "1.65.0", extensionDevelopmentPath, extensionTestsPath, launchArgs: ['-n', '--verbose'] });
     } catch (err) {
         console.error(err);
         console.error('Failed to run tests');

test/runFeatureTests.ts

@@ -44,7 +44,7 @@ async function main() {
         }
 
         // Download VS Code, unzip it and run the integration test
-        await runTests({ extensionDevelopmentPath, extensionTestsPath, launchArgs: [workspacePath, '-n', '--verbose'], extensionTestsEnv: process.env });
+        await runTests({ version: "1.65.0", extensionDevelopmentPath, extensionTestsPath, launchArgs: [workspacePath, '-n', '--verbose'], extensionTestsEnv: process.env });
     } catch (err) {
         console.error(err);
         console.error('Failed to run tests');