From fbd2d30e03c7ec83256055955955956348ff25fc Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 11 Dec 2023 13:57:27 -0800 Subject: [PATCH 01/29] Upgrade Roslyn version --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9b854c47..8fc85667e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) ## Latest +* Update Roslyn to 4.9.0-3.23611.3 (PR: [#<>](https://github.com/dotnet/vscode-csharp/pull/<>)) +* Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730)) +* Fix description of debugger `console` setting (PR: [#6726](https://github.com/dotnet/vscode-csharp/pull/6726)) +* Read extension paths option (PR: [#6724](https://github.com/dotnet/vscode-csharp/pull/6724)) + +## 2.13.10 * Update Roslyn to 4.9.0-3.23604.10 (PR: [#6676](https://github.com/dotnet/vscode-csharp/pull/6676)) * Pass through folders for additional files (PR: [#71061](https://github.com/dotnet/roslyn/pull/71061)) * Automatically detect missing NuGet packages and restore (PR: [#70851](https://github.com/dotnet/roslyn/pull/70851)) diff --git a/package.json b/package.json index 33e56d9db..5b4a8f7c4 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ } }, "defaults": { - "roslyn": "4.9.0-3.23604.10", + "roslyn": "4.9.0-3.23611.3", "omniSharp": "1.39.10", "razor": "7.0.0-preview.23528.1", "razorOmnisharp": "7.0.0-preview.23363.1", From 4dc22d19ab3a0d6a9a3941afc36cd9920107da05 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 11 Dec 2023 16:37:50 -0800 Subject: [PATCH 02/29] Increment prerelease version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 56f1df7c1..22da6ae5d 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.14", + "version": "2.15", "publicReleaseRefSpec": [ "^refs/heads/release$", "^refs/heads/main$", From 2d148aaf7577e6d17531f6d7371814cc4621559c Mon Sep 17 00:00:00 2001 From: David Wengier Date: Tue, 12 Dec 2023 14:29:09 +1100 Subject: [PATCH 03/29] Bump Razor to 7.0.0-preview.23611.2 --- .vscode/launch.json | 8 ++--- package.json | 84 ++++++++++++++++++++++----------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 29295a38b..b11388d76 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -168,8 +168,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/9f8414527411c020d02468b80fff0bcb/razorlanguageserver-linux-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/5a42eb01d3f32093f2d6375afee05413/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/b64dda5342f5204e530c7d5023b6f58c/razorlanguageserver-linux-musl-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/760785c241dc29d7ef7d302d0f4cb3ff/razorlanguageserver-linux-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/16cf46982673c8d73d31fbf7eb296537/razorlanguageserver-osx-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/4e58ddfbf33d25b211ed4ba91d44eb8f/razorlanguageserver-osx-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/114b672bebae3a3c491cef86fdab7ef4/razorlanguageserver-platformagnostic-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/da9092ec75455980387263797d99b7c5/razorlanguageserver-win-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/ed71f389320d0f59a12b66cf6e95c359/razorlanguageserver-win-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/b150b23785cb7c3c71114decf380e333/razorlanguageserver-win-x86-7.0.0-preview.23528.1.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.23528.1", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/e0f801bdafd01c3f43da737947281f81/razorlanguageserver-linux-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/527a542a3ba900550caefea6846ced7d/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/c8a0653ea1e819861e8c5a95aec6e910/razorlanguageserver-linux-musl-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/768c5dde8e54c2072e8db38a00336155/razorlanguageserver-linux-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/df06d231751e0027d7fca3ca68177a8a/razorlanguageserver-osx-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/3be409a63d071b7f146cd0add8e969a8/razorlanguageserver-osx-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52819418a9dc741619b81118f6c319be/razorlanguageserver-platformagnostic-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/b4819f7f31e1001bfdd217bd6a91253b/razorlanguageserver-win-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/50352dafd482a09e3f7ebb0b67346459/razorlanguageserver-win-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/12ebd9174d0b62a837da0109a5ed7e60/razorlanguageserver-win-x86-7.0.0-preview.23611.2.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.23611.2", "NEW_DEPS_ID": "Razor" }, "cwd": "${workspaceFolder}" @@ -184,8 +184,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/95ff1c975183590a39324be2da3dc7de/devkittelemetry-linux-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/0aa52c01416252184ee429facac46105/devkittelemetry-linux-musl-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/bca6fc6bd3a79153178f072795921f87/devkittelemetry-linux-musl-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/2068bef8944968089f5972883cc87da2/devkittelemetry-linux-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/8b24b4572e8a4108a649669740bcc44a/devkittelemetry-osx-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/7c2c6b57522154608cf4b1959f0363ee/devkittelemetry-osx-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/4e49d092100bf8167139bd1523f077ae/devkittelemetry-platformagnostic-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/e58f7d176e80e16dfcecfb84034844b0/devkittelemetry-win-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/e2447a82a7190f5756a31322565f0a2e/devkittelemetry-win-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/9d55070fb7ae293f74ded5f18c7a9953/devkittelemetry-win-x86-7.0.0-preview.23528.1.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.23528.1", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/239d3947eac895453bd1145d5e0b8b3d/devkittelemetry-linux-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bf770a7f0b7a374e64a21c335958d77b/devkittelemetry-linux-musl-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/efb6b7891e87bdffd43dd20bb58715cf/devkittelemetry-linux-musl-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/8c006ed01d9901a824f1986a9f8867cc/devkittelemetry-linux-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/13ed152d6d94d9135f705151846ce026/devkittelemetry-osx-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2966a3d87b6a914cf3e22bbbb571c016/devkittelemetry-osx-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52129618a1908d39137a27bd71c98e5f/devkittelemetry-platformagnostic-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2625dff1e7d78fdb88282a709195e00c/devkittelemetry-win-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bded259717edabe1af8e703e0a8b825d/devkittelemetry-win-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/fa215cdb51b645b9848daafd65198281/devkittelemetry-win-x86-7.0.0-preview.23611.2.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.23611.2", "NEW_DEPS_ID": "RazorTelemetry" }, "cwd": "${workspaceFolder}" diff --git a/package.json b/package.json index 5b4a8f7c4..b33366dee 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ "defaults": { "roslyn": "4.9.0-3.23611.3", "omniSharp": "1.39.10", - "razor": "7.0.0-preview.23528.1", + "razor": "7.0.0-preview.23611.2", "razorOmnisharp": "7.0.0-preview.23363.1", - "razorTelemetry": "7.0.0-preview.23528.1" + "razorTelemetry": "7.0.0-preview.23611.2" }, "main": "./dist/extension", "l10n": "./l10n", @@ -608,7 +608,7 @@ { "id": "Razor", "description": "Razor Language Server (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/ed71f389320d0f59a12b66cf6e95c359/razorlanguageserver-win-x64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/50352dafd482a09e3f7ebb0b67346459/razorlanguageserver-win-x64-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "win32" @@ -616,12 +616,12 @@ "architectures": [ "x86_64" ], - "integrity": "7845A7A07DE82DF9C0A9F8B90771EBD428F6D36C5AC97192DED447BBB3A3149E" + "integrity": "A33421C03D58780A785508FD38A5E1188276B37AE21D19E784508CF9AFF66312" }, { "id": "Razor", "description": "Razor Language Server (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/b150b23785cb7c3c71114decf380e333/razorlanguageserver-win-x86-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/12ebd9174d0b62a837da0109a5ed7e60/razorlanguageserver-win-x86-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "win32" @@ -629,12 +629,12 @@ "architectures": [ "x86" ], - "integrity": "CABD9F62FE3362C8FDC2B00C80301DC9BAFC7047327FE158B3FDF505ED416356" + "integrity": "59451726080E34CB111916FB32E53D28A23AC9B1FE60E34D8026A5B042DB6653" }, { "id": "Razor", "description": "Razor Language Server (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/da9092ec75455980387263797d99b7c5/razorlanguageserver-win-arm64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/b4819f7f31e1001bfdd217bd6a91253b/razorlanguageserver-win-arm64-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "win32" @@ -642,12 +642,12 @@ "architectures": [ "arm64" ], - "integrity": "7F7A9D8F0CE46B37935A6DCE341DE69075AE7D7649E4E86998C4D7E5F7938E58" + "integrity": "54624954C5ECB5ABB6CB6201381572234B239F29F24FDCE51077CDE74B93EBEB" }, { "id": "Razor", "description": "Razor Language Server (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/760785c241dc29d7ef7d302d0f4cb3ff/razorlanguageserver-linux-x64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/768c5dde8e54c2072e8db38a00336155/razorlanguageserver-linux-x64-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "linux" @@ -658,12 +658,12 @@ "binaries": [ "./rzls" ], - "integrity": "B24DEE5A2392E914E3D34B6F8C9EDB45E6477E24D11399F288099EDC66FE3A8E" + "integrity": "33806A355869861B9DE8D1310B56B99EECE485E4FFD8E288EF215ED04686423B" }, { "id": "Razor", "description": "Razor Language Server (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/9f8414527411c020d02468b80fff0bcb/razorlanguageserver-linux-arm64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/e0f801bdafd01c3f43da737947281f81/razorlanguageserver-linux-arm64-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "linux" @@ -674,12 +674,12 @@ "binaries": [ "./rzls" ], - "integrity": "64022CE18D8B84C0C8D94C2D9C736A7DE5412E09855497E749971D94A0583881" + "integrity": "DF3C14D2D6D956CEA7364071D97D0876C4165DD04A56359D914C406643F29594" }, { "id": "Razor", "description": "Razor Language Server (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/b64dda5342f5204e530c7d5023b6f58c/razorlanguageserver-linux-musl-x64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/c8a0653ea1e819861e8c5a95aec6e910/razorlanguageserver-linux-musl-x64-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -690,12 +690,12 @@ "binaries": [ "./rzls" ], - "integrity": "4F5882B23289D03EC08AF04C66B931D13F958AE7443AFE2B4C4AED4B8B7889B6" + "integrity": "25B3D8CFA85B337D5A3371D3E346CBBA0997C35A7390A5DC3CAE76121802E462" }, { "id": "Razor", "description": "Razor Language Server (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/5a42eb01d3f32093f2d6375afee05413/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/527a542a3ba900550caefea6846ced7d/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -706,12 +706,12 @@ "binaries": [ "./rzls" ], - "integrity": "2A79681A26838FC5FD62C40D7575548161813E4DB28769FA2D5CC69CA8C60436" + "integrity": "D763CAF2B3438552A02EFD381C84CC17DAA8CC378627647C90008DEAFEDE1E68" }, { "id": "Razor", "description": "Razor Language Server (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/4e58ddfbf33d25b211ed4ba91d44eb8f/razorlanguageserver-osx-x64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/3be409a63d071b7f146cd0add8e969a8/razorlanguageserver-osx-x64-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -722,12 +722,12 @@ "binaries": [ "./rzls" ], - "integrity": "CB13DB96B8A07B66279D0E249F4CE65A74ED038AFC68643074FEEF03468B3249" + "integrity": "90C31B386EF6E08BD7FADC5E07F99BF132DDAC7B39CE3372649666C5FA070F21" }, { "id": "Razor", "description": "Razor Language Server (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/16cf46982673c8d73d31fbf7eb296537/razorlanguageserver-osx-arm64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/df06d231751e0027d7fca3ca68177a8a/razorlanguageserver-osx-arm64-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -738,12 +738,12 @@ "binaries": [ "./rzls" ], - "integrity": "3FDA10D5E2FB9D7277DB01FD1C948F722D8FC0875D1DA4078813893F8FBC2F7B" + "integrity": "8669DC7F4A7603B46F297B14AADDAB2F5BB8A7ECB8BCA17B745FA69EC522ADE5" }, { "id": "Razor", "description": "Razor Language Server (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/114b672bebae3a3c491cef86fdab7ef4/razorlanguageserver-platformagnostic-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52819418a9dc741619b81118f6c319be/razorlanguageserver-platformagnostic-7.0.0-preview.23611.2.zip", "installPath": ".razor", "platforms": [ "neutral" @@ -754,7 +754,7 @@ "binaries": [ "./rzls" ], - "integrity": "B01E893D107D54EFFF2EE8AA5ECCC9F37BCFD428B860A8C07D1D64F276384FAE" + "integrity": "9B4689314C7306A235959BED28FD10CF4F84DF5D7BA931CA0C2E49EFD927604E" }, { "id": "RazorOmnisharp", @@ -885,7 +885,7 @@ { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/e2447a82a7190f5756a31322565f0a2e/devkittelemetry-win-x64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bded259717edabe1af8e703e0a8b825d/devkittelemetry-win-x64-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -893,12 +893,12 @@ "architectures": [ "x86_64" ], - "integrity": "B92F684ABBB74CC99DC3BCBC34429228DC00CFDEF402523213C1528AA9651D27" + "integrity": "295C19FEEEB32AD74CF147F7248D90B65B24EB2F21A99FDD83B24CCCACD46964" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/9d55070fb7ae293f74ded5f18c7a9953/devkittelemetry-win-x86-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/fa215cdb51b645b9848daafd65198281/devkittelemetry-win-x86-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -906,12 +906,12 @@ "architectures": [ "x86" ], - "integrity": "E3C2DD6DB70E688BE690F3F0352C11F65B65A5D39A8A85D570DAEA8D663943E6" + "integrity": "5BEEF2EFEB690ACBEA880595B0A8984EDAEFA27092BF891ABA8DDB084A7F8C6C" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/e58f7d176e80e16dfcecfb84034844b0/devkittelemetry-win-arm64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2625dff1e7d78fdb88282a709195e00c/devkittelemetry-win-arm64-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -919,12 +919,12 @@ "architectures": [ "arm64" ], - "integrity": "73E50E9874FEE5D70F16B1FC8AFAA18ECB924DB673426C42915CEB1FA9A17764" + "integrity": "9E0F4981F7AB6F8018A9C39232BEBBBE3DEB7858218051BDDB2A8B1E8BA2D585" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/2068bef8944968089f5972883cc87da2/devkittelemetry-linux-x64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/8c006ed01d9901a824f1986a9f8867cc/devkittelemetry-linux-x64-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -932,12 +932,12 @@ "architectures": [ "x86_64" ], - "integrity": "EC8A4E89352D8AA064E098C6E9830B2A499AA2A892CEDB3A713AC40E26802382" + "integrity": "C1F65BC70C24122E9A7BE0018DF4E202D6B4D7EF12523D3C079A946F76590160" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/95ff1c975183590a39324be2da3dc7de/devkittelemetry-linux-arm64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/239d3947eac895453bd1145d5e0b8b3d/devkittelemetry-linux-arm64-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -945,12 +945,12 @@ "architectures": [ "arm64" ], - "integrity": "0E3E8A10A9A9899E21353C752BD26FAC821AF814E6BD7990DF387E2F97E6DFFC" + "integrity": "8993BD2B08A280FD981D98B922DD482273BF1C1ED1E6BA2B266D5DF1E5CF124D" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/bca6fc6bd3a79153178f072795921f87/devkittelemetry-linux-musl-x64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/efb6b7891e87bdffd43dd20bb58715cf/devkittelemetry-linux-musl-x64-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -958,12 +958,12 @@ "architectures": [ "x86_64" ], - "integrity": "E2A367170B8152452A9813E03B115A01F61F879E8D4CCE959BF476B38007ECC7" + "integrity": "7782B57EED68E28F967C9FF3732B3B13C33A1B2CDE78CD9759C2EE8336311185" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/0aa52c01416252184ee429facac46105/devkittelemetry-linux-musl-arm64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bf770a7f0b7a374e64a21c335958d77b/devkittelemetry-linux-musl-arm64-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -971,12 +971,12 @@ "architectures": [ "arm64" ], - "integrity": "F193A9A1B41B05465150FC9F647EF38A0B35BDF9984D9CD3EE7F5AC952735261" + "integrity": "183211BB9417FE9EFDD7BFD4E146D42D828C055CDBDB42B4DBF0E7E01EB17305" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/7c2c6b57522154608cf4b1959f0363ee/devkittelemetry-osx-x64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2966a3d87b6a914cf3e22bbbb571c016/devkittelemetry-osx-x64-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -984,12 +984,12 @@ "architectures": [ "x86_64" ], - "integrity": "6140DA282F9235F7E5F1406996A27F0E99D6260C3F34A3A68CE0F7E00E794D07" + "integrity": "C1EB8179D559662124D608714CC1133B8A154511D350DFE223C11F83EEE0DBE9" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/8b24b4572e8a4108a649669740bcc44a/devkittelemetry-osx-arm64-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/13ed152d6d94d9135f705151846ce026/devkittelemetry-osx-arm64-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -997,12 +997,12 @@ "architectures": [ "arm64" ], - "integrity": "D4183D8A0ECC2981D43AA4C4A62DD6076A47266A03DE2FE65769C577614C1400" + "integrity": "FE23F23044F313900B80673697B80697935A7D271CDF3B84D42179EB5CBF6240" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/4e49d092100bf8167139bd1523f077ae/devkittelemetry-platformagnostic-7.0.0-preview.23528.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52129618a1908d39137a27bd71c98e5f/devkittelemetry-platformagnostic-7.0.0-preview.23611.2.zip", "installPath": ".razortelemetry", "platforms": [ "netural" @@ -1010,7 +1010,7 @@ "architectures": [ "neutral" ], - "integrity": "25713B3DFBAB0861CD4238FF5DC8A24E6E90CDD3841EE01DE97996C60BD86A14" + "integrity": "A6D0371DCC8959D3E666D161B105E4FEDA0B76270E2DBF5186C03557A4A7350C" } ], "engines": { From 15fefcedda4503876e6ff9ca5c3c6488234a1d9c Mon Sep 17 00:00:00 2001 From: David Wengier Date: Tue, 12 Dec 2023 14:32:38 +1100 Subject: [PATCH 04/29] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fc85667e..62945bbba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) ## Latest -* Update Roslyn to 4.9.0-3.23611.3 (PR: [#<>](https://github.com/dotnet/vscode-csharp/pull/<>)) +* Update Razor to 7.0.0-preview.23611.2 (PR: [#6741](https://github.com/dotnet/vscode-csharp/pull/6741) +* Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) * Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730)) * Fix description of debugger `console` setting (PR: [#6726](https://github.com/dotnet/vscode-csharp/pull/6726)) * Read extension paths option (PR: [#6724](https://github.com/dotnet/vscode-csharp/pull/6724)) From 08f75c4a447cee76ddeb8ddf338108abc6a339ea Mon Sep 17 00:00:00 2001 From: David Wengier Date: Wed, 13 Dec 2023 09:52:00 +1100 Subject: [PATCH 05/29] Separate change log sections --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62945bbba..0645f6d98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ ## Latest * Update Razor to 7.0.0-preview.23611.2 (PR: [#6741](https://github.com/dotnet/vscode-csharp/pull/6741) + +## 2.14.? * Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) * Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730)) * Fix description of debugger `console` setting (PR: [#6726](https://github.com/dotnet/vscode-csharp/pull/6726)) From d4a81349ca3ecac335d0549d4ec8410872443908 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Tue, 12 Dec 2023 15:24:53 -0800 Subject: [PATCH 06/29] Upgrade vscode test packages to respond to layout change in vscode installation in 1.85.0 --- package-lock.json | 16 ++++++++-------- package.json | 2 +- test/vscodeLauncher.ts | 5 +++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 062dcdfbf..d08a56c54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "@typescript-eslint/eslint-plugin": "^5.61.0", "@typescript-eslint/parser": "^5.61.0", "@vscode/l10n-dev": "^0.0.30", - "@vscode/test-electron": "2.3.4", + "@vscode/test-electron": "2.3.8", "@vscode/vsce": "2.21.0", "archiver": "5.3.0", "del": "3.0.0", @@ -98,7 +98,7 @@ "webpack-cli": "4.6.0" }, "engines": { - "vscode": "^1.73.0" + "vscode": "^1.75.0" } }, "node_modules/@ampproject/remapping": { @@ -3362,9 +3362,9 @@ } }, "node_modules/@vscode/test-electron": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.4.tgz", - "integrity": "sha512-eWzIqXMhvlcoXfEFNWrVu/yYT5w6De+WZXR/bafUQhAp8+8GkQo95Oe14phwiRUPv8L+geAKl/QM2+PoT3YW3g==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.8.tgz", + "integrity": "sha512-b4aZZsBKtMGdDljAsOPObnAi7+VWIaYl3ylCz1jTs+oV6BZ4TNHcVNC3xUn0azPeszBmwSBDQYfFESIaUQnrOg==", "dev": true, "dependencies": { "http-proxy-agent": "^4.0.1", @@ -19646,9 +19646,9 @@ } }, "@vscode/test-electron": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.4.tgz", - "integrity": "sha512-eWzIqXMhvlcoXfEFNWrVu/yYT5w6De+WZXR/bafUQhAp8+8GkQo95Oe14phwiRUPv8L+geAKl/QM2+PoT3YW3g==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.8.tgz", + "integrity": "sha512-b4aZZsBKtMGdDljAsOPObnAi7+VWIaYl3ylCz1jTs+oV6BZ4TNHcVNC3xUn0azPeszBmwSBDQYfFESIaUQnrOg==", "dev": true, "requires": { "http-proxy-agent": "^4.0.1", diff --git a/package.json b/package.json index 5b4a8f7c4..eb930f141 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "@typescript-eslint/eslint-plugin": "^5.61.0", "@typescript-eslint/parser": "^5.61.0", "@vscode/l10n-dev": "^0.0.30", - "@vscode/test-electron": "2.3.4", + "@vscode/test-electron": "2.3.8", "@vscode/vsce": "2.21.0", "archiver": "5.3.0", "del": "3.0.0", diff --git a/test/vscodeLauncher.ts b/test/vscodeLauncher.ts index 197cb39b3..03e2a177d 100644 --- a/test/vscodeLauncher.ts +++ b/test/vscodeLauncher.ts @@ -70,8 +70,9 @@ async function main() { // Download VS Code, unzip it and run the integration test const exitCode = await runTests({ - extensionDevelopmentPath, - extensionTestsPath, + vscodeExecutablePath: vscodeExecutablePath, + extensionDevelopmentPath: extensionDevelopmentPath, + extensionTestsPath: extensionTestsPath, // Launch with info logging as anything else is way too verbose and will hide test results. launchArgs: [workspacePath, '-n', '--log', 'info'], extensionTestsEnv: process.env, From c97b62bdb85dde656d44c43c2a5050c0ba3c37c8 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Thu, 14 Dec 2023 11:06:39 -0800 Subject: [PATCH 07/29] Remove check for projectPath for resolveDebugConfiguration (#6754) * Remove check for projectPath for resolveDebugConfiguration This PR allows projectPath to be null for resolveDebugConfigurationWithLaunchConfigurationService as that service can now handle it being null. Also updating error messaging an ensuring they are localized. --- l10n/bundle.l10n.json | 5 +++ .../IDotnetDebugConfigurationService.ts | 2 +- src/shared/dotnetConfigurationProvider.ts | 44 +++++++++++++++---- 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/l10n/bundle.l10n.json b/l10n/bundle.l10n.json index 3403fc14c..54094eb70 100644 --- a/l10n/bundle.l10n.json +++ b/l10n/bundle.l10n.json @@ -3,6 +3,11 @@ "Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.", "Cannot create .NET debug configurations. The active C# project is not within folder '{0}'.": "Cannot create .NET debug configurations. The active C# project is not within folder '{0}'.", "Does not contain .NET Core projects.": "Does not contain .NET Core projects.", + "'{0}' was not set in the debug configuration.": "'{0}' was not set in the debug configuration.", + "'{0}' request is not supported for the '{1}' configuration.": "'{0}' request is not supported for the '{1}' configuration.", + "'{0}' was not provided in the debug configuration.": "'{0}' was not provided in the debug configuration.", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.", + "No launchable target found.": "No launchable target found.", "No launchable target found for '{0}'": "No launchable target found for '{0}'", "Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.", "Unable to determine a configuration for '{0}'. Please generate C# debug assets instead.": "Unable to determine a configuration for '{0}'. Please generate C# debug assets instead.", diff --git a/src/lsptoolshost/services/IDotnetDebugConfigurationService.ts b/src/lsptoolshost/services/IDotnetDebugConfigurationService.ts index e3b93b9e1..52d57d6a5 100644 --- a/src/lsptoolshost/services/IDotnetDebugConfigurationService.ts +++ b/src/lsptoolshost/services/IDotnetDebugConfigurationService.ts @@ -23,7 +23,7 @@ export interface IDotnetDebugConfigurationServiceResult { export interface IDotnetDebugConfigurationService { resolveDebugConfigurationWithLaunchConfigurationService( - projectPath: string, + projectPath: string | undefined, debugConfiguration: vscode.DebugConfiguration, token?: vscode.CancellationToken ): Promise; diff --git a/src/shared/dotnetConfigurationProvider.ts b/src/shared/dotnetConfigurationProvider.ts index 4cb2e3513..fec07860c 100644 --- a/src/shared/dotnetConfigurationProvider.ts +++ b/src/shared/dotnetConfigurationProvider.ts @@ -55,6 +55,8 @@ function resolveWorkspaceFolderToken(projectPath: string, folderPath: string): s } export class DotnetConfigurationResolver implements vscode.DebugConfigurationProvider { + static dotnetType = 'dotnet'; + constructor( private workspaceDebugInfoProvider: IWorkspaceDebugInformationProvider, private dotnetWorkspaceConfigurationProvider: DotnetWorkspaceConfigurationProvider @@ -73,12 +75,24 @@ export class DotnetConfigurationResolver implements vscode.DebugConfigurationPro } if (debugConfiguration.request !== 'launch') { - throw new Error(`'${debugConfiguration.request}' is unsupported.`); + if (!debugConfiguration.request) { + throw new Error(vscode.l10n.t("'{0}' was not set in the debug configuration.", 'request')); + } else { + throw new Error( + vscode.l10n.t( + "'{0}' request is not supported for the '{1}' configuration.", + debugConfiguration.request, + DotnetConfigurationResolver.dotnetType + ) + ); + } } - let projectPath: string = debugConfiguration.projectPath; - if (folder && projectPath) { - projectPath = resolveWorkspaceFolderToken(projectPath, folder.uri.fsPath); + let projectPath: string | undefined = debugConfiguration.projectPath; + if (folder) { + if (projectPath) { + projectPath = resolveWorkspaceFolderToken(projectPath, folder.uri.fsPath); + } const dotnetDebugServiceProxy = await getServiceBroker()?.getProxy( Descriptors.dotnetDebugConfigurationService @@ -96,6 +110,11 @@ export class DotnetConfigurationResolver implements vscode.DebugConfigurationPro throw new UnavaliableLaunchServiceError(); } } catch (e) { + if (!projectPath) { + throw new LaunchServiceError( + vscode.l10n.t("'{0}' was not provided in the debug configuration.", 'projectPath') + ); + } if (e instanceof UnavaliableLaunchServiceError) { return await this.resolveDebugConfigurationWithWorkspaceDebugInformationProvider( folder, @@ -109,15 +128,20 @@ export class DotnetConfigurationResolver implements vscode.DebugConfigurationPro } finally { dotnetDebugServiceProxy?.dispose(); } + } else { + throw new Error( + vscode.l10n.t( + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.", + DotnetConfigurationResolver.dotnetType + ) + ); } - - return debugConfiguration; } //#endregion private resolveDotnetDebugConfigurationServiceResult( - projectPath: string, + projectPath: string | undefined, result: IDotnetDebugConfigurationServiceResult ): vscode.DebugConfiguration { if (result.error) { @@ -135,7 +159,11 @@ export class DotnetConfigurationResolver implements vscode.DebugConfigurationPro const debugConfigArray = result.configurations; if (debugConfigArray.length == 0) { - throw new LaunchServiceError(vscode.l10n.t("No launchable target found for '{0}'", projectPath)); + if (!projectPath) { + throw new LaunchServiceError(vscode.l10n.t('No launchable target found.')); + } else { + throw new LaunchServiceError(vscode.l10n.t("No launchable target found for '{0}'", projectPath)); + } } if (debugConfigArray.length == 1) { return debugConfigArray[0]; From 8189f5c4c37d60541434e9308e3cdaa5598fcc4f Mon Sep 17 00:00:00 2001 From: David Barbet Date: Thu, 14 Dec 2023 11:24:36 -0800 Subject: [PATCH 08/29] Fix changelog based on actual release branch --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0645f6d98..f8de0d317 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,9 @@ ## Latest * Update Razor to 7.0.0-preview.23611.2 (PR: [#6741](https://github.com/dotnet/vscode-csharp/pull/6741) - -## 2.14.? * Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) + +## 2.14.8 * Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730)) * Fix description of debugger `console` setting (PR: [#6726](https://github.com/dotnet/vscode-csharp/pull/6726)) * Read extension paths option (PR: [#6724](https://github.com/dotnet/vscode-csharp/pull/6724)) From 11a7739f44cab45c0f325421825bdc2f53c8742f Mon Sep 17 00:00:00 2001 From: David Wengier Date: Sun, 17 Dec 2023 14:32:40 +1100 Subject: [PATCH 09/29] Bump Razor to 7.0.0-preview.23616.1 --- .vscode/launch.json | 8 ++--- package.json | 84 ++++++++++++++++++++++----------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b11388d76..cad466968 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -168,8 +168,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/e0f801bdafd01c3f43da737947281f81/razorlanguageserver-linux-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/527a542a3ba900550caefea6846ced7d/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/c8a0653ea1e819861e8c5a95aec6e910/razorlanguageserver-linux-musl-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/768c5dde8e54c2072e8db38a00336155/razorlanguageserver-linux-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/df06d231751e0027d7fca3ca68177a8a/razorlanguageserver-osx-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/3be409a63d071b7f146cd0add8e969a8/razorlanguageserver-osx-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52819418a9dc741619b81118f6c319be/razorlanguageserver-platformagnostic-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/b4819f7f31e1001bfdd217bd6a91253b/razorlanguageserver-win-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/50352dafd482a09e3f7ebb0b67346459/razorlanguageserver-win-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/12ebd9174d0b62a837da0109a5ed7e60/razorlanguageserver-win-x86-7.0.0-preview.23611.2.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.23611.2", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/c272788e7d4dae4b7ddaac5f51f98a78/razorlanguageserver-linux-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9391972405d093eaa406482ffe73925e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7d68e714a49ffa67169bdb2f979d9625/razorlanguageserver-linux-musl-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9c1986fb1da8db7882cc4af6e624a92e/razorlanguageserver-linux-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/374d6a0c0ae5b043fa424a89e740e82e/razorlanguageserver-osx-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/44eced55816edabb41d131eec4db442b/razorlanguageserver-osx-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/1e21370d7aa085b5ef9da0708e73707d/razorlanguageserver-platformagnostic-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2b08591e0a9532a95cbb4d961e543624/razorlanguageserver-win-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/b6fc013fa813d42c44ffe33bc31742f9/razorlanguageserver-win-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/21e60c5e4f6423182ea9725cd3d28668/razorlanguageserver-win-x86-7.0.0-preview.23616.1.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.23616.1", "NEW_DEPS_ID": "Razor" }, "cwd": "${workspaceFolder}" @@ -184,8 +184,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/239d3947eac895453bd1145d5e0b8b3d/devkittelemetry-linux-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bf770a7f0b7a374e64a21c335958d77b/devkittelemetry-linux-musl-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/efb6b7891e87bdffd43dd20bb58715cf/devkittelemetry-linux-musl-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/8c006ed01d9901a824f1986a9f8867cc/devkittelemetry-linux-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/13ed152d6d94d9135f705151846ce026/devkittelemetry-osx-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2966a3d87b6a914cf3e22bbbb571c016/devkittelemetry-osx-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52129618a1908d39137a27bd71c98e5f/devkittelemetry-platformagnostic-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2625dff1e7d78fdb88282a709195e00c/devkittelemetry-win-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bded259717edabe1af8e703e0a8b825d/devkittelemetry-win-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/fa215cdb51b645b9848daafd65198281/devkittelemetry-win-x86-7.0.0-preview.23611.2.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.23611.2", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2cb789acba83c4d4080cf10b3e91720c/devkittelemetry-linux-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7dc0d68d9ed50a0de44894d0ac7d9fa9/devkittelemetry-linux-musl-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7f3d45705e5ce18781dc69a7bb1084b9/devkittelemetry-linux-musl-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/91916990f7b25c357bb577c60c00e9f5/devkittelemetry-linux-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/09ae5baf1e9f1c894ba269aa4484ca48/devkittelemetry-osx-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/3ab2d6e1d3bdc5575075d9a062a24166/devkittelemetry-osx-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/40b4a00152d07869d12ce44b96572d4c/devkittelemetry-platformagnostic-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/6d5a093349b5e749c44457cb758f718f/devkittelemetry-win-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7e92c77e99d0291a9ab78c8c993315a2/devkittelemetry-win-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/902166e7b43e0a87a62bc9c39aa21c7b/devkittelemetry-win-x86-7.0.0-preview.23616.1.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.23616.1", "NEW_DEPS_ID": "RazorTelemetry" }, "cwd": "${workspaceFolder}" diff --git a/package.json b/package.json index 85f546902..d6d65b48c 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ "defaults": { "roslyn": "4.9.0-3.23611.3", "omniSharp": "1.39.10", - "razor": "7.0.0-preview.23611.2", + "razor": "7.0.0-preview.23616.1", "razorOmnisharp": "7.0.0-preview.23363.1", - "razorTelemetry": "7.0.0-preview.23611.2" + "razorTelemetry": "7.0.0-preview.23616.1" }, "main": "./dist/extension", "l10n": "./l10n", @@ -608,7 +608,7 @@ { "id": "Razor", "description": "Razor Language Server (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/50352dafd482a09e3f7ebb0b67346459/razorlanguageserver-win-x64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/b6fc013fa813d42c44ffe33bc31742f9/razorlanguageserver-win-x64-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "win32" @@ -616,12 +616,12 @@ "architectures": [ "x86_64" ], - "integrity": "A33421C03D58780A785508FD38A5E1188276B37AE21D19E784508CF9AFF66312" + "integrity": "642B8B4B823099FB1EA7B95A41D7C50CEE7B7FF6A3C73282D70AADD40FA7109D" }, { "id": "Razor", "description": "Razor Language Server (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/12ebd9174d0b62a837da0109a5ed7e60/razorlanguageserver-win-x86-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/21e60c5e4f6423182ea9725cd3d28668/razorlanguageserver-win-x86-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "win32" @@ -629,12 +629,12 @@ "architectures": [ "x86" ], - "integrity": "59451726080E34CB111916FB32E53D28A23AC9B1FE60E34D8026A5B042DB6653" + "integrity": "B028CE8B8532D3BFCBD6FC7EB2CB68BAB8B4BB4BA768FE73E12BC0DDC88C2637" }, { "id": "Razor", "description": "Razor Language Server (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/b4819f7f31e1001bfdd217bd6a91253b/razorlanguageserver-win-arm64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2b08591e0a9532a95cbb4d961e543624/razorlanguageserver-win-arm64-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "win32" @@ -642,12 +642,12 @@ "architectures": [ "arm64" ], - "integrity": "54624954C5ECB5ABB6CB6201381572234B239F29F24FDCE51077CDE74B93EBEB" + "integrity": "DCD0ACD9B8D1F5BA5850FE572CC1172EA81B82C8CB33E1BE2714E0C212495612" }, { "id": "Razor", "description": "Razor Language Server (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/768c5dde8e54c2072e8db38a00336155/razorlanguageserver-linux-x64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9c1986fb1da8db7882cc4af6e624a92e/razorlanguageserver-linux-x64-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "linux" @@ -658,12 +658,12 @@ "binaries": [ "./rzls" ], - "integrity": "33806A355869861B9DE8D1310B56B99EECE485E4FFD8E288EF215ED04686423B" + "integrity": "36EDB3660807BB2F8B4F269B597E788BAC345EEA738BAF38009D0B68975A23D4" }, { "id": "Razor", "description": "Razor Language Server (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/e0f801bdafd01c3f43da737947281f81/razorlanguageserver-linux-arm64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/c272788e7d4dae4b7ddaac5f51f98a78/razorlanguageserver-linux-arm64-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "linux" @@ -674,12 +674,12 @@ "binaries": [ "./rzls" ], - "integrity": "DF3C14D2D6D956CEA7364071D97D0876C4165DD04A56359D914C406643F29594" + "integrity": "B0CF33B87FDD344BDDEA9044512901A95F8F46E2F6D0AF3A3A0CCB3EF9F3B8BC" }, { "id": "Razor", "description": "Razor Language Server (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/c8a0653ea1e819861e8c5a95aec6e910/razorlanguageserver-linux-musl-x64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7d68e714a49ffa67169bdb2f979d9625/razorlanguageserver-linux-musl-x64-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -690,12 +690,12 @@ "binaries": [ "./rzls" ], - "integrity": "25B3D8CFA85B337D5A3371D3E346CBBA0997C35A7390A5DC3CAE76121802E462" + "integrity": "BA502DC10AF08C85EE2AA76329642128F3BC16A70E4D2FE5A4B45827A2DC6C86" }, { "id": "Razor", "description": "Razor Language Server (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/527a542a3ba900550caefea6846ced7d/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9391972405d093eaa406482ffe73925e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -706,12 +706,12 @@ "binaries": [ "./rzls" ], - "integrity": "D763CAF2B3438552A02EFD381C84CC17DAA8CC378627647C90008DEAFEDE1E68" + "integrity": "D9138F3E9CDAD94564A742CC1FC65746DF54AA261850038C84A8488BC6884F4A" }, { "id": "Razor", "description": "Razor Language Server (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/3be409a63d071b7f146cd0add8e969a8/razorlanguageserver-osx-x64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/44eced55816edabb41d131eec4db442b/razorlanguageserver-osx-x64-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -722,12 +722,12 @@ "binaries": [ "./rzls" ], - "integrity": "90C31B386EF6E08BD7FADC5E07F99BF132DDAC7B39CE3372649666C5FA070F21" + "integrity": "366D14A4BD06DD565E1AE46CC802D857D792692406986D1CFA3DF239CBCB4566" }, { "id": "Razor", "description": "Razor Language Server (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/df06d231751e0027d7fca3ca68177a8a/razorlanguageserver-osx-arm64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/374d6a0c0ae5b043fa424a89e740e82e/razorlanguageserver-osx-arm64-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -738,12 +738,12 @@ "binaries": [ "./rzls" ], - "integrity": "8669DC7F4A7603B46F297B14AADDAB2F5BB8A7ECB8BCA17B745FA69EC522ADE5" + "integrity": "828DD72BB38AA64A15DEB706C90738098FE5528A1D41F4DDE7FB84D5325FCC59" }, { "id": "Razor", "description": "Razor Language Server (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52819418a9dc741619b81118f6c319be/razorlanguageserver-platformagnostic-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/1e21370d7aa085b5ef9da0708e73707d/razorlanguageserver-platformagnostic-7.0.0-preview.23616.1.zip", "installPath": ".razor", "platforms": [ "neutral" @@ -754,7 +754,7 @@ "binaries": [ "./rzls" ], - "integrity": "9B4689314C7306A235959BED28FD10CF4F84DF5D7BA931CA0C2E49EFD927604E" + "integrity": "275038BCCC4B25BBCA3004117F6FCF594C2BDC45CDE96C7751882EF2FFEA6F6C" }, { "id": "RazorOmnisharp", @@ -885,7 +885,7 @@ { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bded259717edabe1af8e703e0a8b825d/devkittelemetry-win-x64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7e92c77e99d0291a9ab78c8c993315a2/devkittelemetry-win-x64-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -893,12 +893,12 @@ "architectures": [ "x86_64" ], - "integrity": "295C19FEEEB32AD74CF147F7248D90B65B24EB2F21A99FDD83B24CCCACD46964" + "integrity": "F049007CFC25253F8899FC125F46A14B4197C29A19B0ED412B9A57BC47E66B8B" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/fa215cdb51b645b9848daafd65198281/devkittelemetry-win-x86-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/902166e7b43e0a87a62bc9c39aa21c7b/devkittelemetry-win-x86-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -906,12 +906,12 @@ "architectures": [ "x86" ], - "integrity": "5BEEF2EFEB690ACBEA880595B0A8984EDAEFA27092BF891ABA8DDB084A7F8C6C" + "integrity": "6EB981D3B773C505C6F2E54105508832AB0AD1D395C9342F52E56A771BCCAF99" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2625dff1e7d78fdb88282a709195e00c/devkittelemetry-win-arm64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/6d5a093349b5e749c44457cb758f718f/devkittelemetry-win-arm64-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -919,12 +919,12 @@ "architectures": [ "arm64" ], - "integrity": "9E0F4981F7AB6F8018A9C39232BEBBBE3DEB7858218051BDDB2A8B1E8BA2D585" + "integrity": "66C8C930D5C651B7D7A76BD4982D3F9B601E73B4E6C6E469B1D34A7B58EACBFC" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/8c006ed01d9901a824f1986a9f8867cc/devkittelemetry-linux-x64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/91916990f7b25c357bb577c60c00e9f5/devkittelemetry-linux-x64-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -932,12 +932,12 @@ "architectures": [ "x86_64" ], - "integrity": "C1F65BC70C24122E9A7BE0018DF4E202D6B4D7EF12523D3C079A946F76590160" + "integrity": "869415FDF3F43806C8F15F665C2B9463D8C92C24C923275F9FE187EF0208F4B9" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/239d3947eac895453bd1145d5e0b8b3d/devkittelemetry-linux-arm64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2cb789acba83c4d4080cf10b3e91720c/devkittelemetry-linux-arm64-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -945,12 +945,12 @@ "architectures": [ "arm64" ], - "integrity": "8993BD2B08A280FD981D98B922DD482273BF1C1ED1E6BA2B266D5DF1E5CF124D" + "integrity": "742A93ED6E506F3DE6713D9B89BA73C4766CB421DF84E92DC76008FF61D6E10F" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/efb6b7891e87bdffd43dd20bb58715cf/devkittelemetry-linux-musl-x64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7f3d45705e5ce18781dc69a7bb1084b9/devkittelemetry-linux-musl-x64-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -958,12 +958,12 @@ "architectures": [ "x86_64" ], - "integrity": "7782B57EED68E28F967C9FF3732B3B13C33A1B2CDE78CD9759C2EE8336311185" + "integrity": "BCBAEB6B4618ACECF586C434A2E36D749B24832E3B5F7320A2BDBDE7A9DE02EA" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bf770a7f0b7a374e64a21c335958d77b/devkittelemetry-linux-musl-arm64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7dc0d68d9ed50a0de44894d0ac7d9fa9/devkittelemetry-linux-musl-arm64-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -971,12 +971,12 @@ "architectures": [ "arm64" ], - "integrity": "183211BB9417FE9EFDD7BFD4E146D42D828C055CDBDB42B4DBF0E7E01EB17305" + "integrity": "194A28447DE77DFBB268A47C828BA547D71C6A0A4D2C55D311D933F44CB0EFB6" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2966a3d87b6a914cf3e22bbbb571c016/devkittelemetry-osx-x64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/3ab2d6e1d3bdc5575075d9a062a24166/devkittelemetry-osx-x64-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -984,12 +984,12 @@ "architectures": [ "x86_64" ], - "integrity": "C1EB8179D559662124D608714CC1133B8A154511D350DFE223C11F83EEE0DBE9" + "integrity": "C3C6C5CF49F918A6D222280A64F847A40B400771E7D900BB57D66743F616C5D7" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/13ed152d6d94d9135f705151846ce026/devkittelemetry-osx-arm64-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/09ae5baf1e9f1c894ba269aa4484ca48/devkittelemetry-osx-arm64-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -997,12 +997,12 @@ "architectures": [ "arm64" ], - "integrity": "FE23F23044F313900B80673697B80697935A7D271CDF3B84D42179EB5CBF6240" + "integrity": "5AEA32548A44B40FEC676D40BBA76920F3114D9B13015319C3B91324C1A95AFE" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52129618a1908d39137a27bd71c98e5f/devkittelemetry-platformagnostic-7.0.0-preview.23611.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/40b4a00152d07869d12ce44b96572d4c/devkittelemetry-platformagnostic-7.0.0-preview.23616.1.zip", "installPath": ".razortelemetry", "platforms": [ "netural" @@ -1010,7 +1010,7 @@ "architectures": [ "neutral" ], - "integrity": "A6D0371DCC8959D3E666D161B105E4FEDA0B76270E2DBF5186C03557A4A7350C" + "integrity": "6D791D0323F87A6198231C251910F5F60C5C4D35FB34A79302B5E58F722A75FA" } ], "engines": { From 0f97ef34fbb7d1f16909ace96e1e586c614742d3 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Sun, 17 Dec 2023 14:35:13 +1100 Subject: [PATCH 10/29] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8de0d317..edd08a8a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) ## Latest -* Update Razor to 7.0.0-preview.23611.2 (PR: [#6741](https://github.com/dotnet/vscode-csharp/pull/6741) +* Update Razor to 7.0.0-preview.23616.1 (PR: [#6760](https://github.com/dotnet/vscode-csharp/pull/6760) * Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) ## 2.14.8 From 2263b905868e3546f02e832ad3448942f8ad4f07 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Mon, 18 Dec 2023 21:56:21 +0000 Subject: [PATCH 11/29] Localization result of cc28b5dba5fddc7ec49cb3802723c60fc5b7ba51. --- l10n/bundle.l10n.cs.json | 5 +++++ l10n/bundle.l10n.de.json | 5 +++++ l10n/bundle.l10n.es.json | 5 +++++ l10n/bundle.l10n.fr.json | 5 +++++ l10n/bundle.l10n.it.json | 5 +++++ l10n/bundle.l10n.ja.json | 5 +++++ l10n/bundle.l10n.ko.json | 5 +++++ l10n/bundle.l10n.pl.json | 5 +++++ l10n/bundle.l10n.pt-br.json | 5 +++++ l10n/bundle.l10n.ru.json | 5 +++++ l10n/bundle.l10n.tr.json | 5 +++++ l10n/bundle.l10n.zh-cn.json | 5 +++++ l10n/bundle.l10n.zh-tw.json | 5 +++++ package.nls.cs.json | 11 ++++++----- package.nls.de.json | 11 ++++++----- package.nls.es.json | 11 ++++++----- package.nls.fr.json | 11 ++++++----- package.nls.it.json | 11 ++++++----- package.nls.ja.json | 11 ++++++----- package.nls.ko.json | 11 ++++++----- package.nls.pl.json | 11 ++++++----- package.nls.pt-br.json | 11 ++++++----- package.nls.ru.json | 11 ++++++----- package.nls.tr.json | 11 ++++++----- package.nls.zh-cn.json | 11 ++++++----- package.nls.zh-tw.json | 11 ++++++----- 26 files changed, 143 insertions(+), 65 deletions(-) diff --git a/l10n/bundle.l10n.cs.json b/l10n/bundle.l10n.cs.json index 416f9f603..de3f619f9 100644 --- a/l10n/bundle.l10n.cs.json +++ b/l10n/bundle.l10n.cs.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "„{0}“ není spustitelný projekt.", + "'{0}' request is not supported for the '{1}' configuration.": "Žádost {0} se pro konfiguraci {1} nepodporuje.", + "'{0}' was not provided in the debug configuration.": "Nezadáno v konfiguraci ladění: {0}", + "'{0}' was not set in the debug configuration.": "Nenastaveno v konfiguraci ladění: {0}", "1 reference": "1 odkaz", "A valid dotnet installation could not be found: {0}": "Nepovedlo se najít platnou instalaci rozhraní dotnet: {0}", "Actual behavior": "Skutečné chování", @@ -8,6 +11,7 @@ "Bug": "Chyba", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "Konfigurace jazyka C# se změnila. Chcete znovu spustit jazykový server se změnami?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "Konfigurace jazyka C# se změnila. Chcete znovu načíst okno, aby se změny použily?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Nelze najít otevřenou složku pracovního prostoru. Než začnete ladit s konfigurací {0}, otevřete prosím složku.", "Can't parse envFile {0} because of {1}": "Nelze analyzovat envFile {0} z důvodu {1}", "Cancel": "Zrušit", "Cannot create .NET debug configurations. No workspace folder was selected.": "Nelze vytvořit konfigurace ladění .NET. Nebyla vybrána žádná složka pracovního prostoru.", @@ -71,6 +75,7 @@ "Nested Code Action": "Akce vnořeného kódu", "No executable projects": "Žádné spustitelné projekty", "No launchable target found for '{0}'": "Pro „{0}“ se nenašel žádný spustitelný cíl", + "No launchable target found.": "Nenašel se žádný spustitelný cíl.", "No process was selected.": "Nebyl vybrán žádný proces.", "Non Razor file as active document": "Soubor, který není Razor, jako aktivní dokument", "Not Now": "Teď ne", diff --git a/l10n/bundle.l10n.de.json b/l10n/bundle.l10n.de.json index 177b67a9c..200b89f46 100644 --- a/l10n/bundle.l10n.de.json +++ b/l10n/bundle.l10n.de.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "\"{0}\" ist kein ausführbares Projekt.", + "'{0}' request is not supported for the '{1}' configuration.": "Die Anforderung \"{0}\" wird für die Konfiguration \"{1}\" nicht unterstützt.", + "'{0}' was not provided in the debug configuration.": "\"{0}\" wurde in der Debugkonfiguration nicht angegeben.", + "'{0}' was not set in the debug configuration.": "\"{0}\" wurde in der Debugkonfiguration nicht festgelegt.", "1 reference": "1 Verweis", "A valid dotnet installation could not be found: {0}": "Es wurde keine gültige dotnet-Installation gefunden: {0}", "Actual behavior": "Tatsächliches Verhalten", @@ -8,6 +11,7 @@ "Bug": "Fehler", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "Die C#-Konfiguration wurde geändert. Möchten Sie den Sprachserver mit Ihren Änderungen neu starten?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "Die C#-Konfiguration wurde geändert. Möchten Sie das Fenster neu laden, um Ihre Änderungen anzuwenden?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Es wurde kein geöffneter Arbeitsbereichsordner gefunden. Öffnen Sie einen Ordner, bevor Sie mit dem Debuggen mit einer {0}-Konfiguration beginnen.", "Can't parse envFile {0} because of {1}": "envFile {0} kann aufgrund von {1} nicht analysiert werden.", "Cancel": "Abbrechen", "Cannot create .NET debug configurations. No workspace folder was selected.": ".NET-Debugkonfigurationen können nicht erstellt werden. Es wurde kein Arbeitsbereichsordner ausgewählt.", @@ -71,6 +75,7 @@ "Nested Code Action": "Geschachtelte Codeaktion", "No executable projects": "Keine ausführbaren Projekte", "No launchable target found for '{0}'": "Für \"{0}\" wurde kein startbares Ziel gefunden.", + "No launchable target found.": "Kein startbares Ziel gefunden.", "No process was selected.": "Es wurde kein Prozess ausgewählt.", "Non Razor file as active document": "Nicht-Razor-Datei als aktives Dokument", "Not Now": "Nicht jetzt", diff --git a/l10n/bundle.l10n.es.json b/l10n/bundle.l10n.es.json index ea5184b77..932deab1a 100644 --- a/l10n/bundle.l10n.es.json +++ b/l10n/bundle.l10n.es.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "'{0}' no es un proyecto ejecutable.", + "'{0}' request is not supported for the '{1}' configuration.": "No se admite la solicitud '{0}' para la configuración '{1}'.", + "'{0}' was not provided in the debug configuration.": "No se proporcionó '{0}' en la configuración de depuración.", + "'{0}' was not set in the debug configuration.": "No se estableció '{0}' en la configuración de depuración.", "1 reference": "1 referencia", "A valid dotnet installation could not be found: {0}": "No se encontró una instalación de dotnet válida: {0}", "Actual behavior": "Comportamiento real", @@ -8,6 +11,7 @@ "Bug": "Error", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "La configuración de C# ha cambiado. ¿Desea volver a iniciar el servidor de lenguaje con los cambios?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "La configuración de C# ha cambiado. ¿Desea volver a cargar la ventana para aplicar los cambios?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "No se encuentra ninguna carpeta de área de trabajo abierta. Abra una carpeta antes de iniciar la depuración con una configuración de '{0}'.", "Can't parse envFile {0} because of {1}": "No se puede analizar envFile {0} debido a {1}", "Cancel": "Cancelar", "Cannot create .NET debug configurations. No workspace folder was selected.": "No se pueden crear configuraciones de depuración de .NET. No se seleccionó ninguna carpeta del área de trabajo.", @@ -71,6 +75,7 @@ "Nested Code Action": "Acción de código anidado", "No executable projects": "No hay proyectos ejecutables", "No launchable target found for '{0}'": "No se encontró ningún destino para '{0}' que se pueda iniciar.", + "No launchable target found.": "No se encontró ningún destino que se pueda iniciar.", "No process was selected.": "No se seleccionó ningún proceso.", "Non Razor file as active document": "Archivo que no es de Razor como documento activo", "Not Now": "Ahora no", diff --git a/l10n/bundle.l10n.fr.json b/l10n/bundle.l10n.fr.json index ef6c32268..a1d2684ac 100644 --- a/l10n/bundle.l10n.fr.json +++ b/l10n/bundle.l10n.fr.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "« {0} » n’est pas un projet exécutable.", + "'{0}' request is not supported for the '{1}' configuration.": "La requête « {0} » n’est pas prise en charge pour la configuration « {1} ».", + "'{0}' was not provided in the debug configuration.": "« {0} » n’a pas été fourni dans la configuration de débogage.", + "'{0}' was not set in the debug configuration.": "« {0} » n’a pas été défini dans la configuration de débogage.", "1 reference": "1 référence", "A valid dotnet installation could not be found: {0}": "Une installation dotnet valide est introuvable : {0}", "Actual behavior": "Comportement réel", @@ -8,6 +11,7 @@ "Bug": "Bogue", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "La configuration C# a changé. Voulez-vous relancer le serveur de langage avec vos modifications ?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "La configuration C# a changé. Voulez-vous recharger la fenêtre pour appliquer vos modifications ?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Impossible de trouver un dossier d’espace de travail ouvert. Ouvrez un dossier avant de commencer à déboguer avec une configuration « {0} ».", "Can't parse envFile {0} because of {1}": "Impossible d’analyser envFile {0} en raison de {1}", "Cancel": "Annuler", "Cannot create .NET debug configurations. No workspace folder was selected.": "Impossible de créer des configurations de débogage .NET. Aucun dossier d’espace de travail n’a été sélectionné.", @@ -71,6 +75,7 @@ "Nested Code Action": "Action de code imbriqué", "No executable projects": "Aucun projet exécutable", "No launchable target found for '{0}'": "Aucune cible pouvant être lancée n’a été trouvée pour « {0} »", + "No launchable target found.": "Aucune cible pouvant être lancée n’a été trouvée.", "No process was selected.": "Aucun processus n’a été sélectionné.", "Non Razor file as active document": "Fichier non Razor comme document actif", "Not Now": "Pas maintenant", diff --git a/l10n/bundle.l10n.it.json b/l10n/bundle.l10n.it.json index 487869911..fba7afacb 100644 --- a/l10n/bundle.l10n.it.json +++ b/l10n/bundle.l10n.it.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "'{0}' non è un progetto eseguibile.", + "'{0}' request is not supported for the '{1}' configuration.": "La richiesta '{0}' non è supportata per la configurazione '{1}'.", + "'{0}' was not provided in the debug configuration.": "'{0}' non è stato specificato nella configurazione di debug.", + "'{0}' was not set in the debug configuration.": "'{0}' non è stato impostato nella configurazione di debug.", "1 reference": "1 riferimento", "A valid dotnet installation could not be found: {0}": "Non è stato possibile trovare un'installazione dotnet valida: {0}", "Actual behavior": "Comportamento effettivo", @@ -8,6 +11,7 @@ "Bug": "Bug", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "La configurazione di C# è stata modificata. Riavviare il server di linguaggio con le modifiche?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "La configurazione di C# è stata modificata. Ricaricare la finestra per applicare le modifiche?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Non è possibile trovare una cartella dell'area di lavoro aperta. Aprire una cartella prima di avviare il debug con una configurazione '{0}'.", "Can't parse envFile {0} because of {1}": "Non è possibile analizzare envFile {0} a causa di {1}", "Cancel": "Annulla", "Cannot create .NET debug configurations. No workspace folder was selected.": "Impossibile creare configurazioni di debug .NET. Non è stata selezionata alcuna cartella dell'area di lavoro.", @@ -71,6 +75,7 @@ "Nested Code Action": "Azione codice annidato", "No executable projects": "Nessun progetto eseguibile", "No launchable target found for '{0}'": "Non è stata trovata alcuna destinazione avviabile per '{0}'", + "No launchable target found.": "Non è stata trovata alcuna destinazione avviabile.", "No process was selected.": "Nessun processo selezionato.", "Non Razor file as active document": "File non Razor come documento attivo", "Not Now": "Non ora", diff --git a/l10n/bundle.l10n.ja.json b/l10n/bundle.l10n.ja.json index a9086bfb3..a37caae3e 100644 --- a/l10n/bundle.l10n.ja.json +++ b/l10n/bundle.l10n.ja.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "'{0}' は実行可能なプロジェクトではありません。", + "'{0}' request is not supported for the '{1}' configuration.": "'{0}' 要求は '{1}' 構成ではサポートされていません。", + "'{0}' was not provided in the debug configuration.": "'{0}' はデバッグ構成で指定されませんでした。", + "'{0}' was not set in the debug configuration.": "'{0}' はデバッグ構成で設定されませんでした。", "1 reference": "1 個の参照", "A valid dotnet installation could not be found: {0}": "有効な dotnet インストールが見つかりませんでした: {0}", "Actual behavior": "実際の動作", @@ -8,6 +11,7 @@ "Bug": "バグ", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# の構成が変更されました。変更を加えて言語サーバーを再起動しますか?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# の構成が変更されました。変更を適用するためにウィンドウを再読み込みしますか?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "開いているワークスペース フォルダーが見つかりません。'{0}' 構成でデバッグを開始する前に、フォルダーを開いてください。", "Can't parse envFile {0} because of {1}": "{1} のため、envFile {0} を解析できません", "Cancel": "キャンセル", "Cannot create .NET debug configurations. No workspace folder was selected.": ".NET デバッグ構成を作成できません。ワークスペース フォルダーが選択されていません。", @@ -71,6 +75,7 @@ "Nested Code Action": "入れ子になったコード アクション", "No executable projects": "実行可能なプロジェクトがありません", "No launchable target found for '{0}'": "'{0}' 向けに起動可能なターゲットが見つかりません", + "No launchable target found.": "起動可能なターゲットが見つかりません。", "No process was selected.": "プロセスが選択されていません。", "Non Razor file as active document": "アクティブなドキュメントとしての Razor 以外のファイル", "Not Now": "今はしない", diff --git a/l10n/bundle.l10n.ko.json b/l10n/bundle.l10n.ko.json index 19cbecb6c..49cb0d522 100644 --- a/l10n/bundle.l10n.ko.json +++ b/l10n/bundle.l10n.ko.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "'{0}'은(는) 실행 가능한 프로젝트가 아닙니다.", + "'{0}' request is not supported for the '{1}' configuration.": "'{0}' 요청은 '{1}' 구성에 대해 지원되지 않습니다.", + "'{0}' was not provided in the debug configuration.": "'{0}'이(가) 디버그 구성에 제공되지 않았습니다.", + "'{0}' was not set in the debug configuration.": "'{0}'이(가) 디버그 구성에서 설정되지 않았습니다.", "1 reference": "참조 1개", "A valid dotnet installation could not be found: {0}": "유효한 dotnet 설치를 찾을 수 없습니다: {0}", "Actual behavior": "실제 동작", @@ -8,6 +11,7 @@ "Bug": "버그", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# 구성이 변경되었습니다. 언어 서버를 변경 내용으로 다시 시작하시겠습니까?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# 구성이 변경되었습니다. 변경 내용을 적용하기 위해 창을 다시 로드하시겠습니까?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "열려 있는 작업 영역 폴더를 찾을 수 없습니다. '{0}' 구성'으로 디버그를 시작하기 전에 폴더를 여세요.", "Can't parse envFile {0} because of {1}": "{1} 때문에 envFile {0}을(를) 구문 분석할 수 없습니다.", "Cancel": "취소", "Cannot create .NET debug configurations. No workspace folder was selected.": ".NET 디버그 구성을 생성할 수 없습니다. 작업 영역 폴더를 선택하지 않았습니다.", @@ -71,6 +75,7 @@ "Nested Code Action": "중첩 코드 동작", "No executable projects": "실행 가능한 프로젝트 없음", "No launchable target found for '{0}'": "'{0}'에 대해 실행 가능한 대상이 없습니다.", + "No launchable target found.": "시작할 수 있는 대상을 찾을 수 없습니다.", "No process was selected.": "선택된 프로세스가 없습니다.", "Non Razor file as active document": "비 Razor 파일을 활성 문서로", "Not Now": "나중에", diff --git a/l10n/bundle.l10n.pl.json b/l10n/bundle.l10n.pl.json index 91a2efa75..4232d0b03 100644 --- a/l10n/bundle.l10n.pl.json +++ b/l10n/bundle.l10n.pl.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "„{0}” nie jest projektem wykonywalnym.", + "'{0}' request is not supported for the '{1}' configuration.": "Żądanie „{0}” nie jest obsługiwane dla konfiguracji „{1}”.", + "'{0}' was not provided in the debug configuration.": "Nie podano elementu „{0}” w konfiguracji debugowania.", + "'{0}' was not set in the debug configuration.": "Element „{0}” nie został ustawiony w konfiguracji debugowania.", "1 reference": "1 odwołanie", "A valid dotnet installation could not be found: {0}": "Nie można odnaleźć prawidłowej instalacji dotnet: {0}", "Actual behavior": "Rzeczywiste zachowanie", @@ -8,6 +11,7 @@ "Bug": "Usterka", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "Konfiguracja języka C# została zmieniona. Czy chcesz ponownie uruchomić serwer językowy ze zmianami?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "Konfiguracja języka C# została zmieniona. Czy chcesz ponownie załadować okno, aby zastosować zmiany?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Nie można odnaleźć otwartego folderu obszaru roboczego. Otwórz folder przed rozpoczęciem debugowania przy użyciu konfiguracji „{0}”.", "Can't parse envFile {0} because of {1}": "Nie można przeanalizować pliku envFile {0} z powodu {1}", "Cancel": "Anuluj", "Cannot create .NET debug configurations. No workspace folder was selected.": "Nie można utworzyć konfiguracji debugowania platformy .NET. Nie wybrano żadnego folderu obszaru roboczego.", @@ -71,6 +75,7 @@ "Nested Code Action": "Akcja kodu zagnieżdżonego", "No executable projects": "Brak projektów wykonywalnych", "No launchable target found for '{0}'": "Nie znaleziono elementu docelowego możliwego do uruchomienia w przypadku „{0}”", + "No launchable target found.": "Nie znaleziono elementu docelowego możliwego do uruchomienia.", "No process was selected.": "Nie wybrano żadnego procesu.", "Non Razor file as active document": "Plik inny niż Razor jako aktywny dokument", "Not Now": "Nie teraz", diff --git a/l10n/bundle.l10n.pt-br.json b/l10n/bundle.l10n.pt-br.json index 4b728f1a0..f3b7150eb 100644 --- a/l10n/bundle.l10n.pt-br.json +++ b/l10n/bundle.l10n.pt-br.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "\"{0}\" não é um projeto executável.", + "'{0}' request is not supported for the '{1}' configuration.": "'{0}' solicitação não tem suporte para a configuração '{1}' configuração.", + "'{0}' was not provided in the debug configuration.": "'{0}' não foi fornecida na configuração de depuração.", + "'{0}' was not set in the debug configuration.": "'{0}' foi definida na configuração de depuração.", "1 reference": "1 referência", "A valid dotnet installation could not be found: {0}": "Não foi possível encontrar uma instalação dotnet válida: {0}", "Actual behavior": "Comportamento real", @@ -8,6 +11,7 @@ "Bug": "Bug", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "A configuração do C# foi alterada. Gostaria de reiniciar o Language Server com suas alterações?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "A configuração do C# foi alterada. Gostaria de recarregar a janela para aplicar suas alterações?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Não é possível localizar uma pasta de workspace aberta. Abra uma pasta antes de começar a depurar com uma configuração '{0}'.", "Can't parse envFile {0} because of {1}": "Não foi possível analisar o envFile {0} devido a {1}", "Cancel": "Cancelar", "Cannot create .NET debug configurations. No workspace folder was selected.": "Não foi possível criar configurações de depuração do .NET. Nenhuma pasta de workspace foi selecionada.", @@ -71,6 +75,7 @@ "Nested Code Action": "Ação de Código Aninhado", "No executable projects": "Nenhum projeto executável", "No launchable target found for '{0}'": "Nenhum destino inicializável encontrado para \"{0}\"", + "No launchable target found.": "Nenhum alvo inicializável encontrado.", "No process was selected.": "Nenhum processo foi selecionado.", "Non Razor file as active document": "Arquivo não Razor como documento ativo", "Not Now": "Agora não", diff --git a/l10n/bundle.l10n.ru.json b/l10n/bundle.l10n.ru.json index f6d26e3de..74594633f 100644 --- a/l10n/bundle.l10n.ru.json +++ b/l10n/bundle.l10n.ru.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "\"{0}\" не является исполняемым проектом.", + "'{0}' request is not supported for the '{1}' configuration.": "Запрос \"{0}\" не поддерживается для конфигурации \"{1}\".", + "'{0}' was not provided in the debug configuration.": "\"{0}\" не предоставлено в конфигурации отладки.", + "'{0}' was not set in the debug configuration.": "Значение \"{0}\" не задано в конфигурации отладки.", "1 reference": "1 ссылка", "A valid dotnet installation could not be found: {0}": "Не удалось найти допустимую установку dotnet: {0}", "Actual behavior": "Фактическое поведение", @@ -8,6 +11,7 @@ "Bug": "Ошибка", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "Конфигурация C# изменена. Перезапустить языковой сервер с изменениями?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "Конфигурация C# изменена. Перезагрузить окно, чтобы применить изменения?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Не удается найти открытую папку рабочей области. Откройте папку перед началом отладки с использованием конфигурации \"{0}\".", "Can't parse envFile {0} because of {1}": "Не удается разобрать envFile {0} из-за {1}", "Cancel": "Отмена", "Cannot create .NET debug configurations. No workspace folder was selected.": "Не удается создать конфигурации отладки .NET. Не выбрана папка рабочей области.", @@ -71,6 +75,7 @@ "Nested Code Action": "Действие вложенного кода", "No executable projects": "Нет исполняемых проектов", "No launchable target found for '{0}'": "Не найдена запускаемая цель для \"{0}\"", + "No launchable target found.": "Не найден целевой объект, доступный для запуска.", "No process was selected.": "Процесс не выбран.", "Non Razor file as active document": "Активный документ не в формате Razor", "Not Now": "Не сейчас", diff --git a/l10n/bundle.l10n.tr.json b/l10n/bundle.l10n.tr.json index 35118aef4..9179e51c3 100644 --- a/l10n/bundle.l10n.tr.json +++ b/l10n/bundle.l10n.tr.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "'{0}' yürütülebilir bir proje değil.", + "'{0}' request is not supported for the '{1}' configuration.": "'{0}' isteği, '{1}' yapılandırması için desteklenmiyor.", + "'{0}' was not provided in the debug configuration.": "'{0}' hata ayıklama yapılandırmasında sağlanmadı.", + "'{0}' was not set in the debug configuration.": "'{0}' hata ayıklama yapılandırmasında ayarlanmadı.", "1 reference": "1 başvuru", "A valid dotnet installation could not be found: {0}": "Geçerli bir dotnet yüklemesi bulunamadı: {0}", "Actual behavior": "Gerçek davranış", @@ -8,6 +11,7 @@ "Bug": "Hata", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# yapılandırması değiştirildi. Dil Sunucusunu değişiklikleriniz ile yeniden başlatmak ister misiniz?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# yapılandırması değiştirildi. Değişikliklerinizi uygulamak için pencereyi yeniden yüklemek ister misiniz?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Açık bir çalışma alanı klasörü bulunamıyor. Lütfen '{0}' yapılandırmasıyla hata ayıklamaya başlamadan önce bir klasör açın.", "Can't parse envFile {0} because of {1}": "EnvFile {0} dosyası, {1} nedeniyle ayrıştırılamıyor", "Cancel": "İptal", "Cannot create .NET debug configurations. No workspace folder was selected.": ".NET hata ayıklama yapılandırmaları oluşturulamıyor. Çalışma alanı klasörü seçilmedi.", @@ -71,6 +75,7 @@ "Nested Code Action": "İç İçe Kod Eylemi", "No executable projects": "Yürütülebilir proje yok", "No launchable target found for '{0}'": "'{0}' için başlatılabilir hedef bulunamadı.", + "No launchable target found.": "Başlatılabilir hedef bulunamadı.", "No process was selected.": "İşlem seçilmedi.", "Non Razor file as active document": "Etkin belge olarak Razor olmayan dosya", "Not Now": "Şimdi Değil", diff --git a/l10n/bundle.l10n.zh-cn.json b/l10n/bundle.l10n.zh-cn.json index 35a4c9de8..3dbb9b2fc 100644 --- a/l10n/bundle.l10n.zh-cn.json +++ b/l10n/bundle.l10n.zh-cn.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "\"{0}\" 不是可执行项目。", + "'{0}' request is not supported for the '{1}' configuration.": "“{1}”配置不支持“{0}”请求。", + "'{0}' was not provided in the debug configuration.": "调试配置中未提供“{0}”。", + "'{0}' was not set in the debug configuration.": "未在调试配置中设置“{0}”。", "1 reference": "1 个引用", "A valid dotnet installation could not be found: {0}": "找不到有效的 dotnet 安装: {0}", "Actual behavior": "实际行为", @@ -8,6 +11,7 @@ "Bug": "Bug", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# 配置已更改。是否要使用更改重新启动语言服务器?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# 配置已更改。是否要重新加载窗口以应用更改?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "找不到打开的工作区文件夹。请在开始使用“{0}”配置进行调试之前打开文件夹。", "Can't parse envFile {0} because of {1}": "由于 {1}，无法分析 envFile {0}", "Cancel": "取消", "Cannot create .NET debug configurations. No workspace folder was selected.": "无法创建 .NET 调试配置。未选择任何工作区文件夹。", @@ -71,6 +75,7 @@ "Nested Code Action": "嵌套代码操作", "No executable projects": "无可执行项目", "No launchable target found for '{0}'": "找不到 \"{0}\" 的可启动目标", + "No launchable target found.": "找不到可启动的目标。", "No process was selected.": "未选择任何进程。", "Non Razor file as active document": "非 Razor 文件作为活动文档", "Not Now": "以后再说", diff --git a/l10n/bundle.l10n.zh-tw.json b/l10n/bundle.l10n.zh-tw.json index a1e62b36e..76c311b66 100644 --- a/l10n/bundle.l10n.zh-tw.json +++ b/l10n/bundle.l10n.zh-tw.json @@ -1,5 +1,8 @@ { "'{0}' is not an executable project.": "'{0}' 不是可執行的專案。", + "'{0}' request is not supported for the '{1}' configuration.": "'{0}' 要求不支援 '{1}' 設定。", + "'{0}' was not provided in the debug configuration.": "未在偵錯設定中提供 '{0}'。", + "'{0}' was not set in the debug configuration.": "未在偵錯設定中設定 '{0}'。", "1 reference": "1 個參考", "A valid dotnet installation could not be found: {0}": "找不到有效的 dotnet 安裝: {0}", "Actual behavior": "實際行為", @@ -8,6 +11,7 @@ "Bug": "Bug", "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# 設定已變更。您要重新啟動套用變更的語言伺服器嗎?", "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# 設定已變更。您要重新載入視窗以套用您的變更嗎?", + "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "找不到開啟的工作區資料夾。請先開啟資料夾，再開始使用 '{0}' 設定進行偵錯。", "Can't parse envFile {0} because of {1}": "無法剖析 envFile {0}，因為 {1}", "Cancel": "取消", "Cannot create .NET debug configurations. No workspace folder was selected.": "無法建立 .NET 偵錯設定。未選取工作區資料夾。", @@ -71,6 +75,7 @@ "Nested Code Action": "巢狀程式碼動作", "No executable projects": "沒有可執行的專案", "No launchable target found for '{0}'": "'{0}' 找不到可啟動的目標", + "No launchable target found.": "找不到可啟動的目標。", "No process was selected.": "未選取處理序。", "Non Razor file as active document": "非 Razor 檔案作為使用中文件", "Not Now": "現在不要", diff --git a/package.nls.cs.json b/package.nls.cs.json index d6da12528..2d229a678 100644 --- a/package.nls.cs.json +++ b/package.nls.cs.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Potlačit nápovědy, když název parametru odpovídá záměru metody", "configuration.dotnet.navigation.navigateToDecompiledSources": "Povolit navigaci na dekompilované zdroje.", "configuration.dotnet.preferCSharpExtension": "Vynutí načtení projektů pouze s rozšířením jazyka C#. To může být užitečné při použití starších typů projektů, které jazyk C# Dev Kit nepodporuje. (Vyžaduje opětovné načtení okna)", + "configuration.dotnet.projects.enableAutomaticRestore": "Povolí automatické obnovení balíčku NuGet, pokud rozšíření zjistí, že chybí prostředky.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Zobrazit informace o poznámkách při zobrazení symbolu.", "configuration.dotnet.server.crashDumpPath": "Nastaví cestu ke složce, do které se zapisují výpisy stavu systému, pokud dojde k chybovému ukončení jazykového serveru. Musí být zapisovatelný uživatelem.", "configuration.dotnet.server.extensionPaths": "Přepsat pro cestu k jazykovému serveru -- argumenty rozšíření", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "Argumenty příkazového řádku, které se předávají do programu", "generateOptionsSchema.args.1.description": "Řetězcová verze argumentů příkazového řádku, které se předávají do programu.", "generateOptionsSchema.checkForDevCert.description": "Pokud spouštíte webový projekt ve Windows nebo macOS a tato možnost je povolená, ladicí program zkontroluje, jestli má počítač certifikát HTTPS podepsaný svým držitelem, který se používá k vývoji webových serverů běžících na koncových bodech HTTPS. Pokud není tato možnost zadaná, použije se při nastaveném serverReadyAction výchozí hodnota true. Tato možnost neprovádí nic v linuxových scénářích, scénářích se vzdáleným VS Code a scénářích s webovým uživatelským rozhraním VS Code. Pokud se certifikát HTTPS nenajde nebo není důvěryhodný, zobrazí se uživateli výzva k jeho instalaci nebo k důvěřování.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "Externí terminál, který lze konfigurovat pomocí uživatelského nastavení.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "Integrovaný terminál VS Code.", - "generateOptionsSchema.console.internalConsole.enumDescription": "Výstup do konzoly ladění VS Code. Nepodporuje čtení vstupu konzoly (např. Console.ReadLine)", - "generateOptionsSchema.console.markdownDescription": "Při spouštění projektů konzoly označuje, do které konzoly se má cílový program spustit.", - "generateOptionsSchema.console.settingsDescription": "**Poznámka:** _Tato možnost se používá jenom pro konfiguraci ladění typu dotnet_.\r\n\r\nPři spouštění projektů konzoly označuje, do které konzoly se má cílový program spustit.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "Cílový proces bude spuštěn v rámci vlastního externího terminálu. Při použití tohoto režimu bude nutné přepnout fokus mezi Visual Studio Code a oknem externího terminálu.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "Cílový proces bude spuštěn v integrovaném terminálu VS Code.", + "generateOptionsSchema.console.internalConsole.enumDescription": "Vstup (stdin) a výstup (stdout/stderr) konzoly cílového procesu se směrují přes konzolu ladění VS Code.", + "generateOptionsSchema.console.markdownDescription": "Označuje, do které konzoly se má cílový program spustit. Další informace najdete tady: https://aka.ms/VSCode-CS-LaunchJson-Console.", + "generateOptionsSchema.console.settingsDescription": "**Poznámka:** _Tato možnost se používá jenom pro projekty konzoly spuštěné s konfigurací ladění typu dotnet_.\r\n\r\nOznačuje, do které konzoly se má cílový program spustit. Další informace najdete tady: https://aka.ms/VSCode-CS-LaunchJson-Console.", "generateOptionsSchema.cwd.description": "Cesta k pracovnímu adresáři laděného programu. Výchozí hodnota je aktuální pracovní prostor.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "Příznakem povolíte krokování nad vlastnostmi a operátory. Výchozí hodnota této možnosti je true.", "generateOptionsSchema.env.description": "Proměnné prostředí se předaly programu.", diff --git a/package.nls.de.json b/package.nls.de.json index 9f2092f34..f6c7b6713 100644 --- a/package.nls.de.json +++ b/package.nls.de.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Hinweise unterdrücken, wenn der Parametername mit der Methodenabsicht übereinstimmt", "configuration.dotnet.navigation.navigateToDecompiledSources": "Aktivieren der Navigation zu dekompilierten Quellen.", "configuration.dotnet.preferCSharpExtension": "Erzwingt, dass Projekte nur mit der C#-Erweiterung geladen werden. Dies kann nützlich sein, wenn Legacy-Projekttypen verwendet werden, die vom C# Dev Kit nicht unterstützt werden. (Erfordert erneutes Laden des Fensters)", + "configuration.dotnet.projects.enableAutomaticRestore": "Aktiviert die automatische NuGet-Wiederherstellung, wenn die Erweiterung erkennt, dass Ressourcen fehlen.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Beschreibungsinformationen beim Anzeigen des Symbols anzeigen.", "configuration.dotnet.server.crashDumpPath": "Legt einen Ordnerpfad fest, in den Absturzabbilder geschrieben werden, wenn der Sprachserver abstürzt. Muss vom Benutzer beschreibbar sein.", "configuration.dotnet.server.extensionPaths": "Außerkraftsetzung für Pfad zu Sprachserver --extension-Argumenten", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "Befehlszeilenargumente, die an das Programm übergeben werden.", "generateOptionsSchema.args.1.description": "An das Programm übergebene Zeichenfolgenversion von Befehlszeilenargumenten.", "generateOptionsSchema.checkForDevCert.description": "Wenn Sie ein Webprojekt unter Windows oder macOS starten und dies aktiviert ist, überprüft der Debugger, ob der Computer über ein selbstsigniertes HTTPS-Zertifikat verfügt, das zum Entwickeln von Webservern verwendet wird, die auf HTTPS-Endpunkten ausgeführt werden. Wenn nicht angegeben, wird standardmäßig \"true\" verwendet, wenn \"serverReadyAction\" festgelegt ist. Mit dieser Option werden keine Linux-, VS Code-Remote- und VS Code-Webbenutzeroberflächenszenarien ausgeführt. Wenn das HTTPS-Zertifikat nicht gefunden wird oder nicht vertrauenswürdig ist, wird der Benutzer aufgefordert, es zu installieren bzw. ihm zu vertrauen.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "Externes Terminal, das über Benutzereinstellungen konfiguriert werden kann.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "Das integrierte Terminal von VS Code.", - "generateOptionsSchema.console.internalConsole.enumDescription": "Ausgabe an den VS Code-Debugging-Konsole. Das Lesen von Konsoleneingaben (z. B. Console.ReadLine) wird nicht unterstützt.", - "generateOptionsSchema.console.markdownDescription": "Gibt beim Starten von Konsolenprojekten an, in welcher Konsole das Zielprogramm gestartet werden soll.", - "generateOptionsSchema.console.settingsDescription": "**Hinweis:** _This Option wird nur für die Debugkonfiguration \"dotnet\" type_ verwendet.\r\n\r\nGibt beim Starten von Konsolenprojekten an, in welcher Konsole das Zielprogramm gestartet werden soll.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "Der Zielprozess wird in einem eigenen externen Terminal ausgeführt. Wenn Sie diesen Modus verwenden, müssen Sie den Fokus zwischen Visual Studio Code und dem externen Terminalfenster wechseln.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "Der Zielprozess wird im integrierten Terminal VS Code ausgeführt.", + "generateOptionsSchema.console.internalConsole.enumDescription": "Die Konsoleneingabe (stdin) und die Ausgabe (stdout/stderr) des Zielprozesses werden über die VS Code Debugging-Konsole weitergeleitet.", + "generateOptionsSchema.console.markdownDescription": "Gibt an, in welcher Konsole das Zielprogramm gestartet werden soll. Weitere Informationen finden Sie unter „https://aka.ms/VSCode-CS-LaunchJson-Console“.", + "generateOptionsSchema.console.settingsDescription": "**Hinweis:** _Diese Option wird nur für Konsolenprojekte verwendet, die mit der Debugkonfiguration vom Typ „dotnet“ gestartet wurden_.\r\n\r\nGibt an, in welcher Konsole das Zielprogramm gestartet werden soll. Weitere Informationen finden Sie unter „https://aka.ms/VSCode-CS-LaunchJson-Console“.", "generateOptionsSchema.cwd.description": "Pfad zum Arbeitsverzeichnis des Programms, das gedebuggt wird. Der Standardwert ist der aktuelle Arbeitsbereich.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "Kennzeichnung zum Aktivieren des Schrittweisen Ausführens von Eigenschaften und Operatoren. Diese Option wird standardmäßig auf \"true\" festgelegt.", "generateOptionsSchema.env.description": "Umgebungsvariablen, die an das Programm übergeben werden.", diff --git a/package.nls.es.json b/package.nls.es.json index 150d032a8..dcd068464 100644 --- a/package.nls.es.json +++ b/package.nls.es.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Suprimir las sugerencias cuando el nombre del parámetro coincida con la intención del método", "configuration.dotnet.navigation.navigateToDecompiledSources": "Habilitar la navegación a fuentes descompiladas.", "configuration.dotnet.preferCSharpExtension": "Fuerza la carga de proyectos solo con la extensión de C#. Esto puede ser útil cuando se usan tipos de proyecto heredados que no son compatibles con el kit de desarrollo de C#. (Requiere volver a cargar la ventana)", + "configuration.dotnet.projects.enableAutomaticRestore": "Habilita la restauración automática de NuGet si la extensión detecta que faltan activos.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Mostrar información de comentarios cuando se muestra el símbolo.", "configuration.dotnet.server.crashDumpPath": "Establece una ruta de acceso de carpeta en la que se escriben los volcados de memoria si el servidor de lenguaje se bloquea. El usuario debe poder escribir en él.", "configuration.dotnet.server.extensionPaths": "Invalidación de la ruta de acceso a los argumentos --extension del servidor de lenguaje", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "Argumentos de la línea de comandos que se pasan al programa.", "generateOptionsSchema.args.1.description": "Versión en cadena de los argumentos de la línea de comandos pasados al programa.", "generateOptionsSchema.checkForDevCert.description": "Si va a iniciar un proyecto web en Windows o macOS y está habilitado, el depurador comprobará si el equipo tiene un certificado HTTPS autofirmado que se usa para desarrollar servidores web que se ejecutan en puntos de conexión HTTPS. Si no se especifica, el valor predeterminado es true cuando se establece “serverReadyAction”. Esta opción no hace nada en escenarios de Linux, VS Code remoto e interfaz de usuario web de VS Code. Si no se encuentra el certificado HTTPS o no es de confianza, se pedirá al usuario que lo instale o confíe en él.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "Terminal externo que puede configurarse desde la configuración del usuario.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "Terminal integrado de VS Code.", - "generateOptionsSchema.console.internalConsole.enumDescription": "Salida a la Consola de depuración de VS Code. No se admite la lectura de entrada de la consola (ejemplo: Console.ReadLine).", - "generateOptionsSchema.console.markdownDescription": "Al iniciar proyectos de consola, indica en qué consola se debe iniciar el programa de destino.", - "generateOptionsSchema.console.settingsDescription": "**Nota:** _Esta opción solo se usa para el tipo de configuración de depuración \"dotnet\".\r\n\r\nAl iniciar proyectos de consola, indica en qué consola se debe iniciar el programa de destino.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "El proceso de destino se ejecutará dentro de su propia terminal externa. Al utilizar este modo, deberá cambiar el foco entre Visual Studio Code y la ventana del terminal externo.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "El proceso de destino se ejecutará dentro de la terminal integrada de VS Code.", + "generateOptionsSchema.console.internalConsole.enumDescription": "La entrada (stdin) y la salida (stdout/stderr) de la consola del proceso de destino se enrutan a través de la Consola de depuración de VS Code.", + "generateOptionsSchema.console.markdownDescription": "Indica en qué consola se debe iniciar el programa de destino. Consulte https://aka.ms/VSCode-CS-LaunchJson-Console para obtener más información.", + "generateOptionsSchema.console.settingsDescription": "**Nota:** _Esta opción solo se usa para proyectos de consola iniciados con el tipo de configuración de depuración `dotnet`_.\r\n\r\nIndica en qué consola se debe iniciar el programa de destino. Consulte https://aka.ms/VSCode-CS-LaunchJson-Console para obtener más información.", "generateOptionsSchema.cwd.description": "Ruta de acceso al directorio de trabajo del programa que se está depurando. El valor predeterminado es el área de trabajo actual.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "Marca para habilitar la ejecución paso a paso de las propiedades y los operadores. Esta opción tiene como valor predeterminado \"true\".", "generateOptionsSchema.env.description": "Variables de entorno pasadas al programa.", diff --git a/package.nls.fr.json b/package.nls.fr.json index 27274dcbc..9c39d5231 100644 --- a/package.nls.fr.json +++ b/package.nls.fr.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Supprimer les indicateurs quand le nom de paramètre correspond à l'intention de la méthode", "configuration.dotnet.navigation.navigateToDecompiledSources": "Activez la navigation vers les sources décompliées.", "configuration.dotnet.preferCSharpExtension": "Force le chargement des projets avec l'extension C# uniquement. Cela peut être utile lors de l’utilisation de types de projets hérités qui ne sont pas pris en charge par C# Dev Kit. (Nécessite le rechargement de la fenêtre)", + "configuration.dotnet.projects.enableAutomaticRestore": "Active la restauration automatique de NuGet si l’extension détecte que des actifs sont manquants.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Afficher les informations sur les remarques lors de l’affichage du symbole.", "configuration.dotnet.server.crashDumpPath": "Définit un chemin de dossier dans lequel les vidages sur incident sont écrits en cas de panne du serveur de langue. Doit être accessible en écriture par l'utilisateur.", "configuration.dotnet.server.extensionPaths": "Remplacer le chemin d’accès au serveur de langage --extension arguments", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "Arguments de ligne de commande passés au programme.", "generateOptionsSchema.args.1.description": "Version en chaîne des arguments de ligne de commande passés au programme.", "generateOptionsSchema.checkForDevCert.description": "Si vous lancez un projet web sur Windows ou macOS et que cette option est activée, le débogueur case activée si l’ordinateur dispose d’un certificat HTTPS auto-signé utilisé pour développer des serveurs web s’exécutant sur des points de terminaison HTTPS. Si la valeur n’est pas spécifiée, la valeur par défaut est true lorsque « serverReadyAction » est défini. Cette option ne fonctionne pas sur Linux, VS Code à distance et VS Code scénarios d’interface utilisateur web. Si le certificat HTTPS est introuvable ou s’il n’est pas approuvé, l’utilisateur est invité à l’installer/approuver.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "Terminal externe pouvant être configuré via des paramètres utilisateur.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "terminal intégré de VS Code.", - "generateOptionsSchema.console.internalConsole.enumDescription": "Sortie vers le VS Code Console de débogage. Cela ne prend pas en charge la lecture de l’entrée de console (ex:Console.ReadLine).", - "generateOptionsSchema.console.markdownDescription": "Lors du lancement de projets de console, indique dans quelle console le programme cible doit être lancé.", - "generateOptionsSchema.console.settingsDescription": "**Remarque :** _Cette option est utilisée uniquement pour le type_ de configuration de débogage « dotnet ».\r\n\r\nLors du lancement de projets de console, indique dans quelle console le programme cible doit être lancé.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "Le processus cible s’exécutera dans son propre terminal externe. Lorsque vous utilisez ce mode, vous devez basculer le focus entre Visual Studio Code et la fenêtre de terminal externe.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "Le processus cible s’exécutera dans le terminal intégré de VS Code.", + "generateOptionsSchema.console.internalConsole.enumDescription": "L’entrée de console (stdin) et la sortie (stdout/stderr) du processus cible sont routées via le VS Code Console de débogage.", + "generateOptionsSchema.console.markdownDescription": "Indique dans quelle console le programme cible doit être lancé. Pour plus d’informations, consultez https://aka.ms/VSCode-CS-LaunchJson-Console.", + "generateOptionsSchema.console.settingsDescription": "**Remarque :** _Cette option n’est utilisée que pour les projets de console lancés avec la configuration de débogage `dotnet` type_.\r\n\r\nIndique dans quelle console le programme cible doit être lancé. Pour plus d’informations, consultez https://aka.ms/VSCode-CS-LaunchJson-Console.", "generateOptionsSchema.cwd.description": "Chemin du répertoire de travail du programme en cours de débogage. La valeur par défaut est l’espace de travail actuel.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "Indicateur permettant d’activer l’exécution pas à pas sur les propriétés et les opérateurs. Cette option a la valeur par défaut 'true'.", "generateOptionsSchema.env.description": "Variables d'environnement passées au programme.", diff --git a/package.nls.it.json b/package.nls.it.json index cfaf35ddb..22789c864 100644 --- a/package.nls.it.json +++ b/package.nls.it.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Non visualizzare suggerimenti quando il nome del parametro corrisponde alla finalità del metodo", "configuration.dotnet.navigation.navigateToDecompiledSources": "Abilita la navigazione verso origini decompilate.", "configuration.dotnet.preferCSharpExtension": "Forza il caricamento dei progetti solo con l'estensione C#. Può essere utile quando si usano tipi di progetto legacy non supportati dal Kit di sviluppo C#. (Richiede il ricaricamento della finestra)", + "configuration.dotnet.projects.enableAutomaticRestore": "Abilita il ripristino automatico di NuGet se l'estensione rileva che mancano asset.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Mostra le informazioni sulle note quando viene visualizzato il simbolo.", "configuration.dotnet.server.crashDumpPath": "Imposta un percorso cartella in cui vengono scritti i dump di arresto anomalo del sistema in caso di arresto anomalo del server di linguaggio. Deve essere scrivibile dall'utente.", "configuration.dotnet.server.extensionPaths": "Eseguire l’override per il percorso del server di linguaggio --argomenti estensione", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "Argomenti della riga di comando passati al programma.", "generateOptionsSchema.args.1.description": "Versione in formato stringa degli argomenti della riga di comando passati al programma.", "generateOptionsSchema.checkForDevCert.description": "Se si avvia un progetto Web in Windows o macOS e questa opzione è abilitata, il debugger verificherà se nel computer è presente un certificato HTTPS autofirmato usato per sviluppare server Web in esecuzione negli endpoint HTTPS. Se non viene specificato, il valore predefinito sarà true quando viene impostato 'serverReadyAction'. Questa opzione non ha effetto in scenari Linux, VS Code remoto o VS Code per il Web. Se il certificato HTTPS non viene trovato o non è considerato affidabile, verrà richiesto all'utente di installarlo o di considerarlo attendibile.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "Terminale esterno che può essere configurato tramite impostazioni utente.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "Terminale integrato di Visual Studio Code.", - "generateOptionsSchema.console.internalConsole.enumDescription": "Invia l'output alla Console di debug di Visual Studio Code. Non supporta la lettura dell'input della console, ad esempio Console.ReadLine.", - "generateOptionsSchema.console.markdownDescription": "Quando si avviano progetti console, questo parametro indica la console in cui deve essere avviato il programma di destinazione.", - "generateOptionsSchema.console.settingsDescription": "**Nota:** _Questa opzione è usata solo per il tipo di configurazione di debug 'dotnet'_.\r\n\r\nQuando si avviano progetti console, indica in quale console il programma di destinazione deve essere avviato.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "Il processo di destinazione sarà eseguito all'interno del relativo terminale esterno. Quando si usa questa modalità, è necessario spostare lo stato attivo tra Visual Studio Code e la finestra del terminale esterno.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "Il processo di destinazione sarà eseguito all'interno del terminale integrato di VS Code.", + "generateOptionsSchema.console.internalConsole.enumDescription": "L'input (stdin) e l'output (stdout/stderr) della console del processo di destinazione sono instradati attraverso la Console di debug VS Code.", + "generateOptionsSchema.console.markdownDescription": "Indica in quale console deve essere avviato il programma di destinazione. Vedere https://aka.ms/VSCode-CS-LaunchJson-Console per ulteriori informazioni.", + "generateOptionsSchema.console.settingsDescription": "**Nota:** _Questa opzione è usata solo per i progetti console avviati con il tipo di configurazione di debug 'dotnet'_.\r\n\r\nIndica in quale console deve essere avviato il programma di destinazione. Vedere https://aka.ms/VSCode-CS-LaunchJson-Console per ulteriori informazioni.", "generateOptionsSchema.cwd.description": "Percorso della directory di lavoro del programma in fase di debug. Il valore predefinito è l’area di lavoro corrente.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "Flag per abilitare il passaggio di proprietà e operatori. L'impostazione predefinita di questa opzione è 'true'.", "generateOptionsSchema.env.description": "Variabili di ambiente passate al programma.", diff --git a/package.nls.ja.json b/package.nls.ja.json index 9c17fdec6..9cfa35916 100644 --- a/package.nls.ja.json +++ b/package.nls.ja.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "パラメーター名がメソッドの意図と一致する場合にヒントを非表示にする", "configuration.dotnet.navigation.navigateToDecompiledSources": "逆コンパイルされたソースへのナビゲーションを有効にします。", "configuration.dotnet.preferCSharpExtension": "C# 拡張機能のみを使用してプロジェクトを強制的に読み込みます。 これは、C# Dev Kit でサポートされていないレガシ プロジェクトの種類を使用する場合に役立ちます。(ウィンドウの再読み込みが必要)", + "configuration.dotnet.projects.enableAutomaticRestore": "拡張機能で資産が見つからないと検出された場合に、NuGet の自動復元を有効にします。", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "シンボルを表示するときに注釈情報を表示します。", "configuration.dotnet.server.crashDumpPath": "言語サーバーがクラッシュした場合にクラッシュ ダンプの書き込み先フォルダー パスを設定します。ユーザーによる書き込みが可能であることが必要です。", "configuration.dotnet.server.extensionPaths": "言語サーバーへのパスのオーバーライド --拡張引数", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "プログラムに渡すコマンド ライン引数。", "generateOptionsSchema.args.1.description": "プログラムに渡されるコマンド ライン引数の文字列化バージョン。", "generateOptionsSchema.checkForDevCert.description": "Windows または macOS で Web プロジェクトを起動していて、これを有効にしているときにこのオプションを有効にすると、デバッガーはコンピューターに https エンドポイントで実行中の Web サーバーを開発するために使用される自己署名証明書がコンピューターにあるかどうかを確認します。指定しない場合、'serverReadyAction' が設定されていると既定値は true になります。このオプションは、Linux、VS Code リモート、および VS Code Web UI シナリオでは何もしません。HTTPS 証明書が見つからないか、または信頼されていない場合は、証明書をインストールまたは信頼するよう求めるメッセージがユーザーに表示されます。", - "generateOptionsSchema.console.externalTerminal.enumDescription": "ユーザー設定を介して構成できる外部ターミナルです。", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "VS Code の統合ターミナルです。", - "generateOptionsSchema.console.internalConsole.enumDescription": "VS Code デバッグ コンソールに出力します。これはコンソール入力の読み取りをサポートしていません (例: Console.ReadLine)。", - "generateOptionsSchema.console.markdownDescription": "コンソール プロジェクトを起動するときに、ターゲット プログラムを起動する必要があるコンソールを示します。", - "generateOptionsSchema.console.settingsDescription": "**注:** _このオプションは、`dotnet` デバッグ構成の種類でのみ使用されます_。\r\n\r\nコンソール プロジェクトを起動するときに、ターゲット プログラムを起動する必要があるコンソールを示します。", + "generateOptionsSchema.console.externalTerminal.enumDescription": "ターゲット プロセスは、自身の外部ターミナル内で実行されます。このモードを使用する場合は、Visual Studio Code と外部ターミナル ウィンドウの間でフォーカスを切り替える必要があります。", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "ターゲット プロセスは、VS Code の統合ターミナル内で実行されます。", + "generateOptionsSchema.console.internalConsole.enumDescription": "ターゲット プロセスのコンソール入力 (stdin) と出力 (stdout/stderr) は、VS Code デバッグ コンソール経由でルーティングされます。", + "generateOptionsSchema.console.markdownDescription": "ターゲット プログラムを起動するコンソールを示します。詳細については、https://aka.ms/VSCode-CS-LaunchJson-Console を参照してください。", + "generateOptionsSchema.console.settingsDescription": "**注:** _このオプションは、'dotnet' デバッグ構成タイプで起動されたコンソール プロジェクトにのみ使用されます_。\r\n\r\nターゲット プログラムを起動するコンソールを示します。詳細については、https://aka.ms/VSCode-CS-LaunchJson-Console を参照してください。", "generateOptionsSchema.cwd.description": "デバッグ中のプログラムの作業ディレクトリへのパスです。既定値は現在のワークスペースです。", "generateOptionsSchema.enableStepFiltering.markdownDescription": "プロパティと演算子のステップ オーバーを有効にするフラグ。このオプションの既定値は 'true' です。", "generateOptionsSchema.env.description": "プログラムに渡される環境変数。", diff --git a/package.nls.ko.json b/package.nls.ko.json index 507ccc841..134cfbe07 100644 --- a/package.nls.ko.json +++ b/package.nls.ko.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "매개 변수 이름이 메서드의 의도와 일치하는 경우 힌트 표시 안 함", "configuration.dotnet.navigation.navigateToDecompiledSources": "디컴파일된 원본 탐색을 사용하도록 설정합니다.", "configuration.dotnet.preferCSharpExtension": "프로젝트가 C# 확장으로만 로드되도록 합니다. C# 개발 키트에서 지원되지 않는 레거시 프로젝트 형식을 사용할 때 유용할 수 있습니다(창 다시 로드 필요).", + "configuration.dotnet.projects.enableAutomaticRestore": "확장에서 자산이 누락된 것을 감지하는 경우 자동 NuGet 복원을 사용하도록 설정합니다.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "기호를 표시할 때 설명 정보를 표시합니다.", "configuration.dotnet.server.crashDumpPath": "언어 서버가 충돌하는 경우 크래시 덤프가 기록되는 폴더 경로를 설정합니다. 사용자가 쓸 수 있어야 합니다.", "configuration.dotnet.server.extensionPaths": "언어 서버 --extension 인수 경로에 대한 재정의", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "프로그램에 전달된 명령줄 인수입니다.", "generateOptionsSchema.args.1.description": "프로그램에 전달된 명령줄 인수의 문자열화된 버전입니다.", "generateOptionsSchema.checkForDevCert.description": "Windows 또는 macOS에서 웹 프로젝트를 시작하고 이것이 활성화된 경우 디버거는 https 엔드포인트에서 실행되는 웹 서버를 개발하는 데 사용되는 자체 서명된 HTTPS 인증서가 컴퓨터에 있는지 확인합니다. 지정되지 않은 경우 `serverReadyAction`이 설정되면 기본값은 true입니다. 이 옵션은 Linux, VS Code 원격 및 VS Code 웹 UI 시나리오에서는 아무 작업도 수행하지 않습니다. HTTPS 인증서를 찾을 수 없거나 신뢰할 수 없는 경우 사용자에게 이를 설치/신뢰하라는 메시지가 표시됩니다.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "사용자 설정을 통해 구성할 수 있는 외부 터미널입니다.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "VS Code의 통합 터미널", - "generateOptionsSchema.console.internalConsole.enumDescription": "VS Code 디버그 콘솔로 출력합니다. 콘솔 입력(예: Console.ReadLine) 읽기를 지원하지 않습니다.", - "generateOptionsSchema.console.markdownDescription": "콘솔 프로젝트를 실행할 때 대상 프로그램을 실행할 콘솔을 나타냅니다.", - "generateOptionsSchema.console.settingsDescription": "**참고:** _이 옵션은 `dotnet` 디버그 구성 유형_에만 사용됩니다.\r\n\r\n콘솔 프로젝트를 실행할 때 대상 프로그램을 실행할 콘솔을 나타냅니다.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "대상 프로세스는 자체 외부 터미널 내에서 실행됩니다. 이 모드를 사용하는 경우 Visual Studio Code와 외부 터미널 창 간에 포커스를 전환해야 합니다.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "대상 프로세스는 VS Code의 통합 터미널 내에서 실행됩니다.", + "generateOptionsSchema.console.internalConsole.enumDescription": "대상 프로세스의 콘솔 입력(stdin) 및 출력(stdout/stderr)은 VS Code 디버그 콘솔 통해 라우팅됩니다.", + "generateOptionsSchema.console.markdownDescription": "대상 프로그램을 시작해야 하는 콘솔을 나타냅니다. 자세한 내용은 https://aka.ms/VSCode-CS-LaunchJson-Console을 참조하세요.", + "generateOptionsSchema.console.settingsDescription": "**참고:** _이 옵션은 'dotnet' 디버그 구성 유형_을 사용하여 시작된 콘솔 프로젝트에만 사용됩니다.\r\n\r\n대상 프로그램을 시작해야 하는 콘솔을 나타냅니다. 자세한 내용은 https://aka.ms/VSCode-CS-LaunchJson-Console을 참조하세요.", "generateOptionsSchema.cwd.description": "디버깅 중인 프로그램의 작업 디렉터리 경로입니다. 기본값은 현재 작업 영역입니다.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "속성 및 연산자 건너뛰기를 활성화하는 플래그입니다. 이 옵션의 기본값은 `true`입니다.", "generateOptionsSchema.env.description": "프로그램에 전달된 환경 변수입니다.", diff --git a/package.nls.pl.json b/package.nls.pl.json index eb05ddf98..634145dc0 100644 --- a/package.nls.pl.json +++ b/package.nls.pl.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Pomiń wskazówki, gdy nazwa parametru pasuje do intencji metody", "configuration.dotnet.navigation.navigateToDecompiledSources": "Włącz nawigację do zdekompilowanych źródeł.", "configuration.dotnet.preferCSharpExtension": "Wymusza ładowanie projektów tylko z rozszerzeniem języka C#. Może to być przydatne w przypadku korzystania ze starszych typów projektów, które nie są obsługiwane przez zestaw C# Dev Kit. (Wymaga ponownego załadowania okna)", + "configuration.dotnet.projects.enableAutomaticRestore": "Włącza automatyczne przywracanie pakietu NuGet, jeśli rozszerzenie wykryje brak zasobów.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Pokaż informacje o uwagach podczas wyświetlania symbolu.", "configuration.dotnet.server.crashDumpPath": "Ustawia ścieżkę folderu, w której są zapisywane zrzuty awaryjne w przypadku awarii serwera języka. Użytkownik musi mieć możliwość zapisu.", "configuration.dotnet.server.extensionPaths": "Przesłoń ścieżkę do serwera językowego --argumenty rozszerzenia", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "Argumenty wiersza polecenia przekazywane do programu.", "generateOptionsSchema.args.1.description": "Wersja konwertowana na ciąg argumentów wiersza polecenia przekazanych do programu.", "generateOptionsSchema.checkForDevCert.description": "Jeśli uruchamiasz projekt sieci Web w systemie Windows lub macOS i jest on włączony, debuger sprawdzi, czy komputer ma certyfikat HTTPS z podpisem własnym używany do tworzenia serwerów internetowych działających w punktach końcowych HTTPS. Jeśli nie zostanie określona, wartością domyślną będzie true, gdy ustawiona jest wartość„serverReadyAction”. Ta opcja nie pełni żadnej funkcji w scenariuszach interfejsu użytkownika systemu Linux, zdalnego VS Code i VS Code w sieci Web. Jeśli certyfikat HTTPS nie zostanie znaleziony lub nie będzie zaufany, użytkownik zostanie poproszony o zainstalowanie lub zaufanie.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "Terminal zewnętrzny, który można skonfigurować za pośrednictwem ustawień użytkownika.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "Zintegrowany terminal programu VS Code.", - "generateOptionsSchema.console.internalConsole.enumDescription": "Dane wyjściowe do konsoli debugowania programu VS Code. Ta opcja nie obsługuje odczytywania danych wejściowych konsoli (np. Console.ReadLine).", - "generateOptionsSchema.console.markdownDescription": "Podczas uruchamiania projektów konsoli wskazuje konsolę, na której ma być uruchamiany program docelowy.", - "generateOptionsSchema.console.settingsDescription": "**Uwaga:** _Ta opcja jest używana tylko w przypadku typu konfiguracji debugowania „dotnet”_.\r\n\r\nPodczas uruchamiania projektów konsoli wskazuje konsolę, na której ma zostać uruchomiony program docelowy.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "Proces docelowy zostanie uruchomiony wewnątrz własnego terminalu zewnętrznego. W przypadku korzystania z tego trybu należy przełączyć fokus między edytorem Visual Studio Code a zewnętrznym oknem terminalu.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "Proces docelowy zostanie uruchomiony wewnątrz zintegrowanego terminalu edytora VS Code.", + "generateOptionsSchema.console.internalConsole.enumDescription": "Dane wejściowe (stdin) i dane wyjściowe (stdout/stderr) procesu docelowego są kierowane przez konsolę debugowania edytora VS Code.", + "generateOptionsSchema.console.markdownDescription": "Wskazuje konsolę, do której ma zostać uruchomiony program docelowy. Aby uzyskać więcej informacji, zobacz https://aka.ms/VSCode-CS-LaunchJson-Console.", + "generateOptionsSchema.console.settingsDescription": "**Uwaga:** _Ta opcja jest używana tylko w przypadku projektów konsoli uruchamianych z typem konfiguracji debugowania „dotnet”_.\r\n\r\nWskazuje konsolę, do której ma zostać uruchomiony program docelowy. Aby uzyskać więcej informacji, zobacz https://aka.ms/VSCode-CS-LaunchJson-Console.", "generateOptionsSchema.cwd.description": "Ścieżka do katalogu roboczego debugowanego programu. Ustawieniem domyślnym jest bieżący obszar roboczy.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "Flaga umożliwiająca przejście przez właściwości i operatory. Ta opcja jest domyślnie ustawiona na wartość „true”.", "generateOptionsSchema.env.description": "Zmienne środowiskowe przekazywane do programu.", diff --git a/package.nls.pt-br.json b/package.nls.pt-br.json index 25bffbc2c..b1a6022ce 100644 --- a/package.nls.pt-br.json +++ b/package.nls.pt-br.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Suprimir as dicas quando o nome do parâmetro corresponder à intenção do método", "configuration.dotnet.navigation.navigateToDecompiledSources": "Habilite a navegação para fontes não compatíveis.", "configuration.dotnet.preferCSharpExtension": "Força o carregamento dos projetos somente com a extensão C#. Isso pode ser útil ao usar tipos de projetos herdados que não são suportados pelo C# Dev Kit. (Requer recarga da janela)", + "configuration.dotnet.projects.enableAutomaticRestore": "Habilita a restauração automática do NuGet se a extensão detectar que os ativos estão ausentes.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Mostrar informações de comentários ao exibir o símbolo.", "configuration.dotnet.server.crashDumpPath": "Define um caminho de pasta onde os despejos de memória serão gravados se o servidor de idioma travar. Deve ser gravável pelo usuário.", "configuration.dotnet.server.extensionPaths": "Substituir o caminho para os argumentos --extension do servidor de idiomas", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "Argumentos de linha de comando passados para o programa.", "generateOptionsSchema.args.1.description": "Versão em cadeia de caracteres dos argumentos de linha de comando passada para o programa.", "generateOptionsSchema.checkForDevCert.description": "Se você estiver iniciando um projeto da Web no Windows ou macOS e isso estiver habilitado, o depurador verificará se o computador possui um certificado HTTPS autoassinado usado para desenvolver servidores da Web em execução em pontos de extremidade https. Se não especificado, o padrão é verdadeiro quando `serverReadyAction` é definido. Esta opção não faz nada no Linux, VS Code remoto e cenários de IU da Web do VS Code. Se o certificado HTTPS não for encontrado ou não for confiável, o usuário será solicitado a instalá-lo/confiar nele.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "Terminal externo que pode ser configurado através das configurações do usuário.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "Terminal integrado do VS Code.", - "generateOptionsSchema.console.internalConsole.enumDescription": "Saída para o console de depuração do VS Code. Isso não suporta leitura de entrada do console (ex:Console.ReadLine).", - "generateOptionsSchema.console.markdownDescription": "Ao iniciar projetos de console, indica em qual console o programa de destino deve ser iniciado.", - "generateOptionsSchema.console.settingsDescription": "**Observação:** _Esta opção é usada apenas para o tipo de configuração de depuração `dotnet`_.\r\n\r\nAo iniciar projetos de console, indica em qual console o programa de destino deve ser iniciado.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "O processo de destino será executado dentro de seu próprio terminal externo. Ao usar esse modo, você precisará alternar o foco entre Visual Studio Code janela do terminal externo.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "O processo de destino será executado dentro VS Code terminal integrado do cliente.", + "generateOptionsSchema.console.internalConsole.enumDescription": "A entrada e a saída do console do processo de destino (stdin) (stdout/stderr) são roteados por meio do Console de Depuração VS Code.", + "generateOptionsSchema.console.markdownDescription": "Indica em qual console o programa de destino deve ser iniciado. Veja https://aka.ms/VSCode-CS-LaunchJson-Console para mais informação.", + "generateOptionsSchema.console.settingsDescription": "**Observação:** _This é usada apenas para projetos de console iniciados com a configuração de depuração 'dotnet' type_.\r\n\r\nIndica em qual console o programa de destino deve ser iniciado. Veja https://aka.ms/VSCode-CS-LaunchJson-Console para mais informação.", "generateOptionsSchema.cwd.description": "Caminho para o diretório de trabalho do programa que está sendo depurado. O padrão é o espaço de trabalho atual.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "Sinalizador para habilitar o passo a passo sobre Propriedades e Operadores. Esta opção é padronizada como `true`.", "generateOptionsSchema.env.description": "Variáveis de ambiente passadas para o programa.", diff --git a/package.nls.ru.json b/package.nls.ru.json index d8b1054b4..4e4172f22 100644 --- a/package.nls.ru.json +++ b/package.nls.ru.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Скрывать подсказки, если имя параметра соответствует намерению метода.", "configuration.dotnet.navigation.navigateToDecompiledSources": "Включить переход к декомпилированным источникам.", "configuration.dotnet.preferCSharpExtension": "Принудительно загружает проекты только с расширением C#. Это может быть полезно при использовании устаревших типов проектов, которые не поддерживаются C# Dev Kit. (Требуется перезагрузка окна)", + "configuration.dotnet.projects.enableAutomaticRestore": "Включает автоматическое восстановление NuGet при обнаружении расширением отсутствия ресурсов.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Показывать примечания при отображении символа.", "configuration.dotnet.server.crashDumpPath": "Задает путь к папке, в которую записываются аварийные дампы в случае сбоя языкового сервера. Должен быть доступен для записи пользователем.", "configuration.dotnet.server.extensionPaths": "Переопределить путь к аргументам --extension сервера языка", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "Аргументы командной строки, переданные в программу.", "generateOptionsSchema.args.1.description": "Строковая версия аргументов командной строки, переданных в программу.", "generateOptionsSchema.checkForDevCert.description": "Если вы запускаете веб-проект в Windows или macOS и этот параметр включен, отладчик выполнит проверку того, есть ли на компьютере самозаверяющий HTTPS-сертификат, используемый для разработки веб-серверов, которые работают в конечных точках HTTPS. Если значение не указано, по умолчанию применяется значение true, когда настроен параметр serverReadyAction. Этот параметр не выполняет никаких действий в Linux, удаленной среде VS Code и сценариях пользовательского веб-интерфейса VS Code. Если HTTPS-сертификат не найден или не является доверенным, пользователю будет предложено установить его или доверять ему.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "Внешний терминал, который можно настроить в параметрах пользователя.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "Интегрированный терминал VS Code.", - "generateOptionsSchema.console.internalConsole.enumDescription": "Вывод в консоль отладки VS Code. Не поддерживает чтение входных данных консоли (например: Console.ReadLine).", - "generateOptionsSchema.console.markdownDescription": "При запуске проектов консоли указывает, в какой консоли должна быть запущена целевая программа.", - "generateOptionsSchema.console.settingsDescription": "**Примечание.** _Этот параметр используется только для типа конфигурации отладки \"dotnet\"_.\r\n\r\nПри запуске проектов консоли указывает, в какой консоли должна быть запущена целевая программа.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "Целевой процесс будет выполняться внутри собственного внешнего терминала. При использовании этого режима необходимо переключать фокус между Visual Studio Code и окном внешнего терминала.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "Целевой процесс будет выполняться внутри встроенного терминала VS Code.", + "generateOptionsSchema.console.internalConsole.enumDescription": "Входные (stdin) и выходные данные (stdout/stderr) консоли целевого процесса перенаправляются через консоль отладки VS Code.", + "generateOptionsSchema.console.markdownDescription": "Указывает консоль, в которой должна быть запущена целевая программа. Дополнительные сведения: https://aka.ms/VSCode-CS-LaunchJson-Console.", + "generateOptionsSchema.console.settingsDescription": "**Примечание.** _Этот параметр используется только для консольных проектов, запущенных с типом конфигурации отладки \"dotnet\"_.\r\n\r\nУказывает консоль, в которой должна быть запущена целевая программа. Дополнительные сведения: https://aka.ms/VSCode-CS-LaunchJson-Console.", "generateOptionsSchema.cwd.description": "Путь к рабочей папке отлаживаемой программы. По умолчанию используется текущая рабочая область.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "Флаг для включения обхода свойств и операторов. По умолчанию этот параметр принимает значение true.", "generateOptionsSchema.env.description": "Переменные среды, переданные в программу.", diff --git a/package.nls.tr.json b/package.nls.tr.json index 00e1e9628..89254e469 100644 --- a/package.nls.tr.json +++ b/package.nls.tr.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "Parametre adı metodun hedefi ile eşleştiğinde ipuçlarını gizle", "configuration.dotnet.navigation.navigateToDecompiledSources": "Derlenmiş kaynaklarda gezinmeyi etkinleştir.", "configuration.dotnet.preferCSharpExtension": "Projeleri yalnızca C# uzantısıyla yüklenmeye zorlar. Bu, C# Dev Kit tarafından desteklenmeyen eski proje türlerini kullanırken yararlı olabilir. (Pencerenin yeniden yüklenmesi gerekir)", + "configuration.dotnet.projects.enableAutomaticRestore": "Uzantı varlıkların eksik olduğunu algılarsa otomatik NuGet geri yükleme işlemini etkinleştirir.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Simge görüntülendiğinde açıklama bilgilerini göster.", "configuration.dotnet.server.crashDumpPath": "Dil sunucusunun çökmesi durumunda kilitlenme dökümlerinin yazılacağı klasör yolunu ayarlar. Kullanıcı tarafından yazılabilir olmalıdır.", "configuration.dotnet.server.extensionPaths": "Dil sunucusu --extension bağımsız değişkenleri yolunu geçersiz kıl", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "Programa geçirilen komut satırı bağımsız değişkenleri.", "generateOptionsSchema.args.1.description": "Programa geçirilen komut satırı bağımsız değişkenlerinin dizeleştirilmiş sürümü.", "generateOptionsSchema.checkForDevCert.description": "Windows veya macOS üzerinde bir web projesi başlatıyorsanız ve bu etkinleştirilmişse hata ayıklayıcısı, bilgisayarda https uç noktalarında çalışan web sunucuları geliştirmek için kullanılan ve otomatik olarak imzalanan bir HTTPS sertifikası olup olmadığını denetler. Belirtilmezse 'serverReadyAction' ayarlandığında varsayılan olarak true değerini alır. Bu seçenek Linux, uzak VS Code ve VS Code web kullanıcı arabirimi senaryolarında işlem yapmaz. HTTPS sertifikası bulunmuyorsa veya sertifikaya güvenilmiyorsa kullanıcıdan sertifikayı yüklemesi/sertifikaya güvenmesi istenir.", - "generateOptionsSchema.console.externalTerminal.enumDescription": "Kullanıcı ayarları aracılığıyla yapılandırılabilen dış terminal.", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "VS Code'un tümleşik terminali.", - "generateOptionsSchema.console.internalConsole.enumDescription": "VS Code Hata Ayıklama Konsolu'nun çıkışı. Bu, konsol girişini (ör: Console.ReadLine) okumayı desteklemez.", - "generateOptionsSchema.console.markdownDescription": "Konsol projeleri başlatılırken hedef programın hangi konsolda başlatılması gerektiğini gösterir.", - "generateOptionsSchema.console.settingsDescription": "**Not:** _Bu seçenek yalnızca `dotnet` hata ayıklama yapılandırması türü için kullanılır_.\r\n\r\nKonsol projeleri başlatılırken hedef programın hangi konsolda başlatılması gerektiğini gösterir.", + "generateOptionsSchema.console.externalTerminal.enumDescription": "Hedef işlem kendi dış terminali içinde çalıştırılır. Bu modu kullanırken, odağı Visual Studio Code ve dış terminal penceresi arasında değiştirmeniz gerekir.", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "Hedef işlem VS Code tümleşik terminali içinde çalıştırılır.", + "generateOptionsSchema.console.internalConsole.enumDescription": "Hedef işlemin konsol girişi (stdin) ve çıkışı (stdout/stderr) VS Code Hata Ayıklama Konsolu aracılığıyla yönlendirilir.", + "generateOptionsSchema.console.markdownDescription": "Hedef programın hangi konsolda başlatılması gerektiğini belirtir. Daha fazla bilgi için https://aka.ms/VSCode-CS-LaunchJson-Console sayfasına bakın.", + "generateOptionsSchema.console.settingsDescription": "**Not:** _Bu seçenek yalnıza `dotnet` hata ayıklama yapılandırması türüyle başlatılan konsol projeleri için kullanılabilir_.\r\n\r\nHedef programın hangi konsolda başlatılması gerektiğini belirtir. Daha fazla bilgi için https://aka.ms/VSCode-CS-LaunchJson-Console sayfasına bakın.", "generateOptionsSchema.cwd.description": "Hataları ayıklanan programın çalışma dizininin yolu. Varsayılan, geçerli çalışma alanıdır.", "generateOptionsSchema.enableStepFiltering.markdownDescription": "Özellikler ve İşleçler üzerinde adımlamayı etkinleştiren bayrak. Bu seçenek varsayılan olarak `true` değerini alır.", "generateOptionsSchema.env.description": "Programa geçirilen ortam değişkenleri.", diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json index 3246d9c27..8184c475f 100644 --- a/package.nls.zh-cn.json +++ b/package.nls.zh-cn.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "当参数名称与方法的意图匹配时禁止显示提示", "configuration.dotnet.navigation.navigateToDecompiledSources": "启用对分解源的导航。", "configuration.dotnet.preferCSharpExtension": "仅强制使用 C# 扩展加载项目。使用 C# Dev Kit 不支持的旧项目类型时，这可能很有用。(需要重新加载窗口)", + "configuration.dotnet.projects.enableAutomaticRestore": "如果扩展检测到缺少资产，则启用“自动 NuGet 还原”。", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "显示符号时显示备注信息。", "configuration.dotnet.server.crashDumpPath": "设置在语言服务器崩溃时在其中写入故障转储的文件夹路径。用户必须可以写入。", "configuration.dotnet.server.extensionPaths": "替代语言服务器 --extension 参数的路径", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "传递给程序的命令行参数。", "generateOptionsSchema.args.1.description": "传递给程序的命令行参数的字符串化版本。", "generateOptionsSchema.checkForDevCert.description": "如果要在 Windows 或 macOS 上启动 Web 项目并启用此功能，当计算机具有用于开发在 https 终结点上运行的 Web 服务器的自签名 HTTPS 证书时，调试器将检查。如果未指定，在设置 \"serverReadyAction\" 时默认为 true。此选项在 Linux、VS Code 远程和 VS Code Web UI 方案中不起作用。如果找不到 HTTPS 证书或该证书不受信任，将提示用户安装/信任它。", - "generateOptionsSchema.console.externalTerminal.enumDescription": "可通过用户设置来配置的外部终端。", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "VS Code 的集成终端。", - "generateOptionsSchema.console.internalConsole.enumDescription": "输出到 VS Code 调试控制台。这不支持读取控制台输入(例如: Console.ReadLine)。", - "generateOptionsSchema.console.markdownDescription": "启动控制台项目时，指示应将目标程序启动到哪个控制台。", - "generateOptionsSchema.console.settingsDescription": "**注意:** _此选项仅用于 \"dotnet\" 调试配置类型_。\r\n\r\n启动控制台项目时，指示应将目标程序启动到哪个控制台。", + "generateOptionsSchema.console.externalTerminal.enumDescription": "目标进程将在其自己的外部终端内运行。使用此模式时，需要在 Visual Studio Code 窗口和外部终端窗口之间切换焦点。", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "目标进程将在 VS Code 的集成终端内运行。", + "generateOptionsSchema.console.internalConsole.enumDescription": "目标进程的控制台输入 (stdin) 和输出 (stdout/stderr) 通过 VS Code 调试控制台进行路由。", + "generateOptionsSchema.console.markdownDescription": "指示目标程序应启动到哪个控制台。有关详细信息，请参阅 https://aka.ms/VSCode-CS-LaunchJson-Console。", + "generateOptionsSchema.console.settingsDescription": "**注意:** _此选项仅用于使用 `dotnet` 调试配置类型启动的控制台项目_。\r\n\r\n指示目标程序应启动到哪个控制台。有关详细信息，请参阅 https://aka.ms/VSCode-CS-LaunchJson-Console。", "generateOptionsSchema.cwd.description": "正在调试的程序的工作目录的路径。默认值是当前工作区。", "generateOptionsSchema.enableStepFiltering.markdownDescription": "用于启用逐过程执行属性和运算符的标志。此选项默认为 \"true\"。", "generateOptionsSchema.env.description": "传递给程序的环境变量。", diff --git a/package.nls.zh-tw.json b/package.nls.zh-tw.json index 17c14883f..8f255dbf5 100644 --- a/package.nls.zh-tw.json +++ b/package.nls.zh-tw.json @@ -60,6 +60,7 @@ "configuration.dotnet.inlayHints.suppressInlayHintsForParametersThatMatchMethodIntent": "當參數名稱符合方法的意圖時，不出現提示", "configuration.dotnet.navigation.navigateToDecompiledSources": "啟用到反向組譯來源的瀏覽。", "configuration.dotnet.preferCSharpExtension": "強制專案僅以 C# 延伸模組載入。使用 C# 開發人員套件不支援的舊版專案類型時，這會很有用。(需要重新載入視窗)", + "configuration.dotnet.projects.enableAutomaticRestore": "如果延伸模組偵測到資產遺失，則啟用自動 NuGet 還原。", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "顯示符號時顯示備註資訊。", "configuration.dotnet.server.crashDumpPath": "設定當語言伺服器當機時要寫入當機傾印的資料夾路徑。必須可由使用者寫入。", "configuration.dotnet.server.extensionPaths": "覆寫語言伺服器 --extension 引數的路徑", @@ -96,11 +97,11 @@ "generateOptionsSchema.args.0.description": "傳遞至程式的命令列引數。", "generateOptionsSchema.args.1.description": "傳遞至程式的命令列引數字串版本。", "generateOptionsSchema.checkForDevCert.description": "如果您要在 Windows 或 macOS 上啟動 Web 專案，且已啟用此功能，偵錯工具會檢查電腦是否具有用來開發在 HTTPs 端點上執行之 Web 服務器的自我簽署 HTTPS 憑證。如果未指定，則在設定 'serverReadyAction' 時預設為 true。此選項不會在 Linux、VS Code遠端及 web UI 案例 VS Code 上執行任何動作。如果找不到 HTTPS 憑證或該憑證不受信任，將會提示使用者安裝/信任該憑證。", - "generateOptionsSchema.console.externalTerminal.enumDescription": "可透過使用者設定進行外部終端機的設定。", - "generateOptionsSchema.console.integratedTerminal.enumDescription": "VS Code 的整合式終端機。", - "generateOptionsSchema.console.internalConsole.enumDescription": "輸出到 VS Code 偵錯主控台。這不支援讀取主控台輸入 (例如: Console.ReadLine)。", - "generateOptionsSchema.console.markdownDescription": "啟動主控台專案時，指出目的程式應該啟動到哪一個主控台。", - "generateOptionsSchema.console.settingsDescription": "**注意:** _此選項僅適用於 'dotnet' 偵錯設定 type_。\r\n\r\n啟動主控台專案時，指出目的程式應該啟動到哪一個主控台。", + "generateOptionsSchema.console.externalTerminal.enumDescription": "目標處理常式將在它自己的外部終端機內執行。使用此模式時，您必須在 Visual Studio Code 與外部終端機視窗之間切換焦點。", + "generateOptionsSchema.console.integratedTerminal.enumDescription": "目標處理常式將在 VS Code 的整合式終端機內執行。", + "generateOptionsSchema.console.internalConsole.enumDescription": "目標處理常式的主控台輸入 (stdin) 和輸出 (stdout/stderr) 會透過VS Code 偵錯主控台路由傳送。", + "generateOptionsSchema.console.markdownDescription": "指出目的程式應該啟動到哪一個主控台。如需詳細資訊，請參閱 https://aka.ms/VSCode-CS-LaunchJson-Console。", + "generateOptionsSchema.console.settingsDescription": "**注意:** _此選項僅適用於使用 'dotnet' 偵錯設定 type_ 啟動的主控台專案。\r\n\r\n指出目的程式應該啟動到哪一個主控台。如需詳細資訊，請參閱 https://aka.ms/VSCode-CS-LaunchJson-Console。", "generateOptionsSchema.cwd.description": "正在偵錯之程式的工作目錄路徑。預設值是目前的工作區。", "generateOptionsSchema.enableStepFiltering.markdownDescription": "要啟用逐步執行屬性和運算子的旗標。此選項預設為 'true'。", "generateOptionsSchema.env.description": "傳遞給程式的環境變數。", From 0d7d1e45f67494a2cb3c30cbf343ee16ff7ef374 Mon Sep 17 00:00:00 2001 From: Isadora Date: Tue, 19 Dec 2023 14:17:53 -0800 Subject: [PATCH 12/29] Update debugger to 2.9.1 (#6765) Co-authored-by: Isadora Rodopoulos --- package.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index d6d65b48c..27dd064ec 100644 --- a/package.json +++ b/package.json @@ -452,7 +452,7 @@ { "id": "Debugger", "description": ".NET Core Debugger (Windows / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-0/coreclr-debug-win7-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-1/coreclr-debug-win7-x64.zip", "installPath": ".debugger/x86_64", "platforms": [ "win32" @@ -462,12 +462,12 @@ "arm64" ], "installTestPath": "./.debugger/x86_64/vsdbg-ui.exe", - "integrity": "413A1FE80F781788D1CE108464C1BDA00E65D8F800D5CF1868C36B410BF93453" + "integrity": "C708DDC65998BDB634AA895886B13DAD60639B53B31C8AD5E94E9DF50C7F2D56" }, { "id": "Debugger", "description": ".NET Core Debugger (Windows / ARM64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-0/coreclr-debug-win10-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-1/coreclr-debug-win10-arm64.zip", "installPath": ".debugger/arm64", "platforms": [ "win32" @@ -476,12 +476,12 @@ "arm64" ], "installTestPath": "./.debugger/arm64/vsdbg-ui.exe", - "integrity": "C8AFCE6223DCD180865E25069145D68FD70959DB477370EAD876C24B58383D14" + "integrity": "514A9F94AE0EE403761C4263E208DFDE4F9CAD62B2B7DBF7B4B16ACB6C95E0D2" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-0/coreclr-debug-osx-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-1/coreclr-debug-osx-x64.zip", "installPath": ".debugger/x86_64", "platforms": [ "darwin" @@ -495,12 +495,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/x86_64/vsdbg-ui", - "integrity": "61CF0221226E30BD2809A643899329E80573CB395B515301A85FB6D2370D54F9" + "integrity": "3D167961816743C020FEF3968DD938596248448B7AB579A7E497C80AA84E5FF5" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / arm64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-0/coreclr-debug-osx-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-1/coreclr-debug-osx-arm64.zip", "installPath": ".debugger/arm64", "platforms": [ "darwin" @@ -513,12 +513,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/arm64/vsdbg-ui", - "integrity": "220466464DE9002E6F781A00665E87A98B899195E65CB2A2543E31172B919621" + "integrity": "1F8CC782964860B3869D6EE30E33314BB4235568C4B676A9E30E16659073C172" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-0/coreclr-debug-linux-arm.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-1/coreclr-debug-linux-arm.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -531,12 +531,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "356232C01B8E1404378463CB3FC27C29427101C611391364921ECB53DE7AF93F" + "integrity": "FAADDFD23CB8285F63BA3E5F7C9190016BD95F234B139D0C54A4E87C2AA526AC" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-0/coreclr-debug-linux-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-1/coreclr-debug-linux-arm64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -549,12 +549,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "8259720283E62582B027E9285F2F65D0F65C7177CAD969F6470A39350E391860" + "integrity": "1C160B16917633B67E8E5531CA1D2055591294AF4809DC3D9B7E9EBE63E6F8B0" }, { "id": "Debugger", "description": ".NET Core Debugger (linux musl / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-0/coreclr-debug-linux-musl-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-1/coreclr-debug-linux-musl-x64.zip", "installPath": ".debugger", "platforms": [ "linux-musl" @@ -567,12 +567,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "CC6235947B701E4DD4BC252384C4AF481370280FD1A99EA77B9859FC113DFD66" + "integrity": "C0E5556157F9FD7CD1EA8C45279B9C89E7D723687ACADEF617070A66DCE2FFFF" }, { "id": "Debugger", "description": ".NET Core Debugger (linux musl / ARM64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-0/coreclr-debug-linux-musl-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-1/coreclr-debug-linux-musl-arm64.zip", "installPath": ".debugger", "platforms": [ "linux-musl" @@ -585,12 +585,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "A67EACE7A6F73C0DD54EA44B5D31BFBC085FDB4640723FA69704A2379F5CDDC2" + "integrity": "D296C7AD188653700A10A1CA6434DFD76F6BBF2D21150AC4F27B60C4229C4FFF" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-0/coreclr-debug-linux-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-9-1/coreclr-debug-linux-x64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -603,7 +603,7 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "9B906C74F56DD65F0F9A4B82B53D6083D5FD229DBF941DB5F3CB86E29094EEE6" + "integrity": "010809D73F35BB37BF851628D79FDBC77F378D4B84FD7DA400AECD9E09FD86E4" }, { "id": "Razor", From 7c7bada586f0d6511852be8d478099175d889e8e Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Wed, 20 Dec 2023 18:03:50 -0300 Subject: [PATCH 13/29] Support debug apps running under mono runtime using vsdbg (#6752) * Implement support to debug when running on mono runtime using vsdbg * Fix merge * Adding changes to debug using mono runtime * Using monovsdbg to debug mono using icordbg * Addressing Gregg's and Andrew's comments * Addressing comments * Remove unrelated changes * Removing unnecessary information about debug using icordbg for mono, the launch.json will be created by another extension. * Remove unnecessary changes. * remove extra enter --- package.json | 12 +++++++++++- src/coreclrDebug/activate.ts | 7 +++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 27dd064ec..874c2fc52 100644 --- a/package.json +++ b/package.json @@ -1021,6 +1021,7 @@ "onDebugResolve:blazorwasm", "onDebugResolve:coreclr", "onDebugResolve:clr", + "onDebugResolve:monovsdbg", "onDebugResolve:dotnet", "onLanguage:csharp", "onCommand:o.showOutput", @@ -1642,7 +1643,8 @@ "type": "string", "enum": [ "coreclr", - "clr" + "clr", + "monovsdbg" ], "description": "Type type of code to debug. Can be either 'coreclr' for .NET Core debugging, or 'clr' for Desktop .NET Framework. 'clr' only works on Windows as the Desktop framework is Windows-only.", "default": "coreclr" @@ -4875,6 +4877,14 @@ } } ] + }, + { + "type": "monovsdbg", + "label": ".NET Core using Mono Runtime", + "hiddenWhen": "true", + "languages": [ + "csharp" + ] } ], "semanticTokenTypes": [ diff --git a/src/coreclrDebug/activate.ts b/src/coreclrDebug/activate.ts index 1bffd2924..52e2f466b 100644 --- a/src/coreclrDebug/activate.ts +++ b/src/coreclrDebug/activate.ts @@ -92,8 +92,15 @@ export async function activate( new BaseVsDbgConfigurationProvider(platformInformation, csharpOutputChannel) ) ); + context.subscriptions.push( + vscode.debug.registerDebugConfigurationProvider( + 'monovsdbg', + new BaseVsDbgConfigurationProvider(platformInformation, csharpOutputChannel) + ) + ); disposables.add(vscode.debug.registerDebugAdapterDescriptorFactory('coreclr', factory)); disposables.add(vscode.debug.registerDebugAdapterDescriptorFactory('clr', factory)); + disposables.add(vscode.debug.registerDebugAdapterDescriptorFactory('monovsdbg', factory)); context.subscriptions.push(disposables); } From 922f61f9915cc785e9b5e18f28db2ff0cbfb1101 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Thu, 21 Dec 2023 14:48:30 +1100 Subject: [PATCH 14/29] Rename razor.trace to razor.server.trace, and use LogLevel values, to match Roslyn (and VS Code conventions) --- CONTRIBUTING.md | 4 +- l10n/bundle.l10n.json | 2 +- package.json | 25 ++++++------ src/razor/src/diagnostics/reportIssuePanel.ts | 8 ++-- src/razor/src/extension.ts | 8 ++-- src/razor/src/{trace.ts => logLevel.ts} | 12 ++++-- src/razor/src/razorLanguageServerClient.ts | 14 +++---- src/razor/src/razorLanguageServerOptions.ts | 4 +- .../src/razorLanguageServerOptionsResolver.ts | 6 +-- .../src/razorLanguageServerTraceResolver.ts | 38 ++++++++++++------- src/razor/src/razorLogger.ts | 29 +++++++------- src/razor/src/telemetryReporter.ts | 6 +-- test-plan.md | 14 ++++--- ...tools_host_BasicRazorApp2_1.code-workspace | 2 +- 14 files changed, 93 insertions(+), 79 deletions(-) rename src/razor/src/{trace.ts => logLevel.ts} (72%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a17f2a452..7f1aa4feb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,7 @@ https://github.com/dotnet/razor contains the server implementation. Follow the depending on which configuration is built. Then, launch the extension here and change the VSCode setting `razor.languageServer.directory` to point to the Razor executable path you built above and reload the window. -If you need to debug the server, you can set the VSCode setting `razor.languageServer.debug` to true. This will trigger a `Debugger.Launch()` on the server side as it starts. You can also set `razor.trace` to `Verbose` to get more log messages in the output window +If you need to debug the server, you can set the VSCode setting `razor.languageServer.debug` to true. This will trigger a `Debugger.Launch()` on the server side as it starts. You can also set `razor.server.trace` to `Debug` to get more log messages in the output window ### Creating VSIXs @@ -52,4 +52,4 @@ To update the version of the roslyn server used by the extension do the followin 2. In the official build stage, look for the `Publish Assets` step. In there you will see it publishing the `Microsoft.CodeAnalysis.LanguageServer.neutral` package with some version, e.g. `4.6.0-3.23158.4`. Take note of that version number. 3. In the [package.json](package.json) inside the `defaults` section update the `roslyn` key to point to the version number you found above in step 2. 4. Ensure that version of the package is in the proper feeds by running `gulp updateRoslynVersion`. Note: you may need to install the [Azure Artifacts NuGet Credential Provider](https://github.com/microsoft/artifacts-credprovider#installation-on-windows) to run interactive authentication. -5. Build and test the change. If everything looks good, submit a PR. \ No newline at end of file +5. Build and test the change. If everything looks good, submit a PR. diff --git a/l10n/bundle.l10n.json b/l10n/bundle.l10n.json index 54094eb70..2977262bd 100644 --- a/l10n/bundle.l10n.json +++ b/l10n/bundle.l10n.json @@ -47,7 +47,7 @@ "Downloading Razor Telemetry Package": "Downloading Razor Telemetry Package", "Cannot load Razor language server because the directory was not found: '{0}'": "Cannot load Razor language server because the directory was not found: '{0}'", "Could not find '{0}' in or above '{1}'.": "Could not find '{0}' in or above '{1}'.", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Invalid trace setting for Razor language server. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Could not find Razor Language Server executable within directory '{0}'": "Could not find Razor Language Server executable within directory '{0}'", "Server failed to start after retrying 5 times.": "Server failed to start after retrying 5 times.", "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.", diff --git a/package.json b/package.json index 874c2fc52..821209e3a 100644 --- a/package.json +++ b/package.json @@ -1751,21 +1751,20 @@ "description": "%configuration.razor.languageServer.debug%", "order": 90 }, - "razor.trace": { + "razor.server.trace": { + "scope": "window", "type": "string", - "default": "Off", "enum": [ - "Off", - "Messages", - "Verbose" - ], - "enumDescriptions": [ - "%configuration.razor.trace.off%", - "%configuration.razor.trace.messages%", - "%configuration.razor.trace.verbose%" + "Trace", + "Debug", + "Information", + "Warning", + "Error", + "Critical", + "None" ], - "description": "%configuration.razor.trace%", - "order": 90 + "default": "Information", + "description": "%configuration.razor.server.trace%" } } }, @@ -5696,4 +5695,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/razor/src/diagnostics/reportIssuePanel.ts b/src/razor/src/diagnostics/reportIssuePanel.ts index f8fec86a1..982e36263 100644 --- a/src/razor/src/diagnostics/reportIssuePanel.ts +++ b/src/razor/src/diagnostics/reportIssuePanel.ts @@ -5,7 +5,7 @@ import * as vscode from 'vscode'; import { RazorLogger } from '../razorLogger'; -import { Trace } from '../trace'; +import { LogLevel } from '../logLevel'; import { ReportIssueCreator } from './reportIssueCreator'; import { ReportIssueDataCollector } from './reportIssueDataCollector'; import { ReportIssueDataCollectorFactory } from './reportIssueDataCollectorFactory'; @@ -118,7 +118,7 @@ export class ReportIssuePanel { } let panelBodyContent = ''; - if (this.logger.trace.valueOf() === Trace.Verbose) { + if (this.logger.logLevel.valueOf() <= LogLevel.Debug) { const startButtonLabel = vscode.l10n.t('Start'); const startButton = ``; const firstLine = vscode.l10n.t('Press {0}', startButton); @@ -157,8 +157,8 @@ ${privacyAnchor} `; } else { const verbositySettingName = `${RazorLogger.verbositySetting}`; - const currentVerbositySettingValue = `${Trace[this.logger.trace]}`; - const neededVerbositySettingValue = `${Trace[Trace.Verbose]}`; + const currentVerbositySettingValue = `${LogLevel[this.logger.logLevel]}`; + const neededVerbositySettingValue = `${LogLevel[LogLevel.Debug]}`; panelBodyContent = '

' + diff --git a/src/razor/src/extension.ts b/src/razor/src/extension.ts index e90ccbff8..ad888d45d 100644 --- a/src/razor/src/extension.ts +++ b/src/razor/src/extension.ts @@ -36,7 +36,7 @@ import { ProposedApisFeature } from './proposedApisFeature'; import { RazorLanguage } from './razorLanguage'; import { RazorLanguageConfiguration } from './razorLanguageConfiguration'; import { RazorLanguageServerClient } from './razorLanguageServerClient'; -import { resolveRazorLanguageServerTrace } from './razorLanguageServerTraceResolver'; +import { resolveRazorLanguageServerLogLevel } from './razorLanguageServerTraceResolver'; import { RazorLanguageServiceClient } from './razorLanguageServiceClient'; import { RazorLogger } from './razorLogger'; import { RazorReferenceProvider } from './reference/razorReferenceProvider'; @@ -71,14 +71,14 @@ export async function activate( create: () => new vscode.EventEmitter(), }; - const languageServerTrace = resolveRazorLanguageServerTrace(vscodeType); - const logger = new RazorLogger(eventEmitterFactory, languageServerTrace); + const languageServerLogLevel = resolveRazorLanguageServerLogLevel(vscodeType); + const logger = new RazorLogger(eventEmitterFactory, languageServerLogLevel); try { const razorOptions: RazorLanguageServerOptions = resolveRazorLanguageServerOptions( vscodeType, languageServerDir, - languageServerTrace, + languageServerLogLevel, logger ); diff --git a/src/razor/src/trace.ts b/src/razor/src/logLevel.ts similarity index 72% rename from src/razor/src/trace.ts rename to src/razor/src/logLevel.ts index b19d0d33a..93c0493de 100644 --- a/src/razor/src/trace.ts +++ b/src/razor/src/logLevel.ts @@ -3,8 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -export enum Trace { - Off = 0, - Messages = 1, - Verbose = 2, +export enum LogLevel { + Trace = 0, + Debug = 1, + Information = 2, + Warning = 3, + Error = 4, + Critical = 5, + None = 6, } diff --git a/src/razor/src/razorLanguageServerClient.ts b/src/razor/src/razorLanguageServerClient.ts index 292dbf817..9637c6e13 100644 --- a/src/razor/src/razorLanguageServerClient.ts +++ b/src/razor/src/razorLanguageServerClient.ts @@ -12,7 +12,7 @@ import { LanguageClient, ServerOptions } from 'vscode-languageclient/node'; import { RazorLanguage } from './razorLanguage'; import { RazorLanguageServerOptions } from './razorLanguageServerOptions'; import { resolveRazorLanguageServerOptions } from './razorLanguageServerOptionsResolver'; -import { resolveRazorLanguageServerTrace } from './razorLanguageServerTraceResolver'; +import { resolveRazorLanguageServerLogLevel } from './razorLanguageServerTraceResolver'; import { RazorLogger } from './razorLogger'; import { TelemetryReporter as RazorTelemetryReporter } from './telemetryReporter'; import TelemetryReporter from '@vscode/extension-telemetry'; @@ -55,9 +55,9 @@ export class RazorLanguageServerClient implements vscode.Disposable { } public updateTraceLevel() { - const languageServerTrace = resolveRazorLanguageServerTrace(this.vscodeType); + const languageServerLogLevel = resolveRazorLanguageServerLogLevel(this.vscodeType); this.setupLanguageServer(); - this.logger.setTraceLevel(languageServerTrace); + this.logger.setTraceLevel(languageServerLogLevel); } public onStarted(listener: () => Promise) { @@ -211,7 +211,7 @@ export class RazorLanguageServerClient implements vscode.Disposable { } private setupLanguageServer() { - const languageServerTrace = resolveRazorLanguageServerTrace(this.vscodeType); + const languageServerTrace = resolveRazorLanguageServerLogLevel(this.vscodeType); const options: RazorLanguageServerOptions = resolveRazorLanguageServerOptions( this.vscodeType, this.languageServerDir, @@ -227,9 +227,9 @@ export class RazorLanguageServerClient implements vscode.Disposable { this.logger.logMessage(`Razor language server path: ${options.serverPath}`); - args.push('--trace'); - args.push(options.trace.toString()); - this.razorTelemetryReporter.reportTraceLevel(options.trace); + args.push('--logLevel'); + args.push(options.logLevel.toString()); + this.razorTelemetryReporter.reportTraceLevel(options.logLevel); if (options.debug) { this.razorTelemetryReporter.reportDebugLanguageServer(); diff --git a/src/razor/src/razorLanguageServerOptions.ts b/src/razor/src/razorLanguageServerOptions.ts index d8ead0ad9..0a1fe3384 100644 --- a/src/razor/src/razorLanguageServerOptions.ts +++ b/src/razor/src/razorLanguageServerOptions.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { Trace } from './trace'; +import { LogLevel } from './logLevel'; export interface RazorLanguageServerOptions { serverPath: string; outputChannel?: vscode.OutputChannel; debug?: boolean; - trace: Trace; + logLevel: LogLevel; usingOmniSharp: boolean; } diff --git a/src/razor/src/razorLanguageServerOptionsResolver.ts b/src/razor/src/razorLanguageServerOptionsResolver.ts index b9423f5b8..b9ccdfc45 100644 --- a/src/razor/src/razorLanguageServerOptionsResolver.ts +++ b/src/razor/src/razorLanguageServerOptionsResolver.ts @@ -10,13 +10,13 @@ import * as vscodeAdapter from './vscodeAdapter'; import * as vscode from 'vscode'; import { RazorLanguageServerOptions } from './razorLanguageServerOptions'; import { RazorLogger } from './razorLogger'; -import { Trace } from './trace'; +import { LogLevel } from './logLevel'; import { getCSharpDevKit } from '../../utils/getCSharpDevKit'; export function resolveRazorLanguageServerOptions( vscodeApi: vscodeAdapter.api, languageServerDir: string, - trace: Trace, + logLevel: LogLevel, logger: RazorLogger ) { const languageServerExecutablePath = findLanguageServerExecutable(languageServerDir); @@ -28,7 +28,7 @@ export function resolveRazorLanguageServerOptions( return { serverPath: languageServerExecutablePath, debug: debugLanguageServer, - trace, + logLevel: logLevel, outputChannel: logger.outputChannel, usingOmniSharp, } as RazorLanguageServerOptions; diff --git a/src/razor/src/razorLanguageServerTraceResolver.ts b/src/razor/src/razorLanguageServerTraceResolver.ts index a8268770c..b8cd340ce 100644 --- a/src/razor/src/razorLanguageServerTraceResolver.ts +++ b/src/razor/src/razorLanguageServerTraceResolver.ts @@ -3,28 +3,40 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Trace } from './trace'; +import { LogLevel } from './logLevel'; import * as vscodeAdapter from './vscodeAdapter'; import * as vscode from 'vscode'; -export function resolveRazorLanguageServerTrace(vscodeApi: vscodeAdapter.api) { - const languageConfig = vscodeApi.workspace.getConfiguration('razor'); +export function resolveRazorLanguageServerLogLevel(vscodeApi: vscodeAdapter.api) { + const languageConfig = vscodeApi.workspace.getConfiguration('razor.server'); const traceString = languageConfig.get('trace'); - const trace = parseTraceString(traceString); + const logLevel = parseTraceString(traceString); - return trace; + return logLevel; } function parseTraceString(traceString: string | undefined) { switch (traceString) { - case 'Off': - return Trace.Off; - case 'Messages': - return Trace.Messages; - case 'Verbose': - return Trace.Verbose; + case 'Trace': + return LogLevel.Trace; + case 'Verbose': // For importing old config values + case 'Debug': + return LogLevel.Debug; + case 'Messages': // For importing old config values + case 'Information': + return LogLevel.Information; + case 'Warning': + return LogLevel.Warning; + case 'Error': + return LogLevel.Error; + case 'Critical': + return LogLevel.Critical; + case 'Off': // For importing old config values + case 'None': + return LogLevel.None; + default: - console.log(vscode.l10n.t("Invalid trace setting for Razor language server. Defaulting to '{0}'", 'Off')); - return Trace.Off; + console.log(vscode.l10n.t("Invalid razor.server.trace setting. Defaulting to '{0}'", 'Information')); + return LogLevel.Information; } } diff --git a/src/razor/src/razorLogger.ts b/src/razor/src/razorLogger.ts index 970626783..4f4624c23 100644 --- a/src/razor/src/razorLogger.ts +++ b/src/razor/src/razorLogger.ts @@ -8,22 +8,22 @@ import * as path from 'path'; import * as vscodeAdapter from './vscodeAdapter'; import * as vscode from 'vscode'; import { IEventEmitterFactory } from './IEventEmitterFactory'; -import { Trace } from './trace'; +import { LogLevel } from './logLevel'; export class RazorLogger implements vscodeAdapter.Disposable { public static readonly logName = 'Razor Log'; - public static readonly verbositySetting = 'razor.trace'; + public static readonly verbositySetting = 'razor.server.trace'; public verboseEnabled!: boolean; public messageEnabled!: boolean; public readonly outputChannel: vscode.OutputChannel; private readonly onLogEmitter: vscodeAdapter.EventEmitter; - private readonly onTraceLevelChangeEmitter: vscodeAdapter.EventEmitter; + private readonly onTraceLevelChangeEmitter: vscodeAdapter.EventEmitter; - constructor(eventEmitterFactory: IEventEmitterFactory, public trace: Trace) { + constructor(eventEmitterFactory: IEventEmitterFactory, public logLevel: LogLevel) { this.processTraceLevel(); this.onLogEmitter = eventEmitterFactory.create(); - this.onTraceLevelChangeEmitter = eventEmitterFactory.create(); + this.onTraceLevelChangeEmitter = eventEmitterFactory.create(); this.outputChannel = vscode.window.createOutputChannel(RazorLogger.logName); @@ -31,11 +31,11 @@ export class RazorLogger implements vscodeAdapter.Disposable { this.setupToStringOverrides(); } - public setTraceLevel(trace: Trace) { - this.trace = trace; + public setTraceLevel(trace: LogLevel) { + this.logLevel = trace; this.processTraceLevel(); - this.logMessage(`Updated trace level to: ${Trace[this.trace]}`); - this.onTraceLevelChangeEmitter.fire(this.trace); + this.logMessage(`Updated log level to: ${LogLevel[this.logLevel]}`); + this.onTraceLevelChangeEmitter.fire(this.logLevel); } public get onLog() { @@ -109,11 +109,8 @@ ${error.stack}`; this.log('--------------------------------------------------------------------------------'); this.log(`Razor.VSCode version ${packageJsonContents.defaults.razor}`); this.log('--------------------------------------------------------------------------------'); - this.log(`Razor's trace level is currently set to '${Trace[this.trace]}'`); - this.log( - " - To change Razor's trace level set 'razor.trace' to " + - "'Off', 'Messages' or 'Verbose' and then restart VSCode." - ); + this.log(`Razor's log level is currently set to '${LogLevel[this.logLevel]}'`); + this.log(" - To change Razor's log level set 'razor.server.trace' and then restart VSCode."); this.log(" - To report issues invoke the 'Report a Razor issue' command via the command palette."); this.log( '-----------------------------------------------------------------------' + @@ -133,8 +130,8 @@ ${error.stack}`; } private processTraceLevel() { - this.verboseEnabled = this.trace >= Trace.Verbose; - this.messageEnabled = this.trace >= Trace.Messages; + this.verboseEnabled = this.logLevel <= LogLevel.Debug; + this.messageEnabled = this.logLevel <= LogLevel.Information; } } diff --git a/src/razor/src/telemetryReporter.ts b/src/razor/src/telemetryReporter.ts index 5ed562d73..8f7e164ab 100644 --- a/src/razor/src/telemetryReporter.ts +++ b/src/razor/src/telemetryReporter.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { createTelemetryErrorEvent, createTelemetryEvent, HostEventStream } from './hostEventStream'; -import { Trace } from './trace'; +import { LogLevel } from './logLevel'; export class TelemetryReporter { private readonly razorExtensionActivated = createTelemetryEvent('VSCode.Razor.RazorExtensionActivated'); @@ -18,9 +18,9 @@ export class TelemetryReporter { this.eventStream.post(this.razorExtensionActivated); } - public reportTraceLevel(trace: Trace) { + public reportTraceLevel(trace: LogLevel) { const traceLevelEvent = createTelemetryEvent('VSCode.Razor.TraceLevel', { - trace: Trace[trace], + trace: LogLevel[trace], }); this.eventStream.post(traceLevelEvent); } diff --git a/test-plan.md b/test-plan.md index 539073bb4..ae113d935 100644 --- a/test-plan.md +++ b/test-plan.md @@ -463,8 +463,10 @@ Verify each of the test projects above's `project.razor.json` file (ASP.NET Core #### Report a Razor issue Perform the following in any of the above Razor projects. -* Run the `Report a Razor issue` command while `razor.trace` is set to `Off`. Ensure that you get a dialog stating that `razor.trace` must be set to `Verbose`. -* Run the `Report a Razor issue` command while `razor.trace` is set to `Verbose`. Follow the instructions, type a little bit in a .cshtml file when it's recording. Once you stop the recording ensure that the content copied to your clipboard has the following information: + +- Run the `Report a Razor issue` command while `razor.server.trace` is set to `None`. Ensure that you get a dialog stating that `razor.server.trace` must be set to `Debug`. + +- Run the `Report a Razor issue` command while `razor.server.trace` is set to `Debug`. Follow the instructions, type a little bit in a .cshtml file when it's recording. Once you stop the recording ensure that the content copied to your clipboard has the following information: - Razor log output under the **Logs** section - The Razor document content under the **Workspace information** section - Projected CSharp document under the **Workspace information** section @@ -474,12 +476,12 @@ Perform the following in any of the above Razor projects. #### Razor Options -##### razor.trace +##### razor.server.trace This option should always be displayed in the View --> Output --> Razor Log window This option can be set to any of the following values: - * "Off" - Will launch Razor Language server with its log output set to 'Off'. The header in the Razor Log output window will be shown but no other content will be shown. - * "Messages" - Will launch Razor Language server with its log output set to 'Messages'. Limited messages will be shown such as "Opening document xyz in project abc". - * "Verbose" - Will launch Razor Language server with its log output set to 'Verbose'. All logging messages will be shown such as "123 - Synchronizing documentxyz currently ...." + * "None" - Will launch Razor Language server with its log output set to 'Off'. The header in the Razor Log output window will be shown but no other content will be shown. + - "Information" - Will launch Razor Language server with its log output set to 'Information'. Limited messages will be shown such as "Opening document xyz in project abc". + - "Debug" - Will launch Razor Language server with its log output set to 'Debug'. All logging messages will be shown such as "123 - Synchronizing documentxyz currently ...." Changing this option should result in a notification message at the bottom right of the window, prompting for a restart of the Razor Language Server. #### OmniSharp Options diff --git a/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace index bc0225ed1..18b2ef247 100644 --- a/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace +++ b/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace @@ -9,6 +9,6 @@ "dotnet.server.trace": "Trace", "dotnet.server.useOmnisharp": false, "omnisharp.enableLspDriver": false, - "razor.trace": "Verbose" + "razor.server.trace": "Trace" } } From 602daee7534246378bf384b31be9c958c5608651 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Thu, 21 Dec 2023 14:55:19 +1100 Subject: [PATCH 15/29] Change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index edd08a8a5..cbef411c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ## Latest * Update Razor to 7.0.0-preview.23616.1 (PR: [#6760](https://github.com/dotnet/vscode-csharp/pull/6760) * Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) + * Fixed issue where Razor trace level was ignored. New `razor.server.trace` setting created that is not ignored (PR: [dotnet/razor#9745](https://github.com/dotnet/razor/pull/9745)) ## 2.14.8 * Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730)) From 845e94ae4ad86608cc07394e485f67be0831cba1 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Thu, 21 Dec 2023 14:20:18 -0800 Subject: [PATCH 16/29] Update checkForDevCert aka.ms link (#6769) --- src/shared/configurationProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/configurationProvider.ts b/src/shared/configurationProvider.ts index 996bb989f..942f36771 100644 --- a/src/shared/configurationProvider.ts +++ b/src/shared/configurationProvider.ts @@ -271,7 +271,7 @@ export class BaseVsDbgConfigurationProvider implements vscode.DebugConfiguration } } if (result?.title === labelMoreInfo) { - const launchjsonDescriptionURL = 'https://aka.ms/VSCode-CS-LaunchJson#check-for-devcert'; + const launchjsonDescriptionURL = 'https://aka.ms/VSCode-CS-CheckForDevCert'; vscode.env.openExternal(vscode.Uri.parse(launchjsonDescriptionURL)); this.checkForDevCerts(dotnetPath); } From 07e4e7ec35ed5145f22bcad3537386503eb9b1b9 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 22 Dec 2023 10:33:15 -0800 Subject: [PATCH 17/29] Update OmniSharp to 1.39.11 --- .vscode/launch.json | 6 +- CHANGELOG.md | 5 +- package.json | 132 ++++++++++++++++++++++---------------------- 3 files changed, 73 insertions(+), 70 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index cad466968..18212f775 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -145,7 +145,7 @@ { "type": "node", "request": "launch", - "name": "Update package dependencies", + "name": "Update OmniSharp package dependencies", "preLaunchTask": "build", "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js", "args": [ @@ -153,8 +153,8 @@ ], "env": { "NEW_DEPS_ID": "OmniSharp", - "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x64-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x86-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-arm64-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x64-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x86-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-arm64-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-musl-x64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-musl-arm64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-arm64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-x64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-arm64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x64-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x86-net6.0-1.39.10.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-arm64-net6.0-1.39.10.zip", - "NEW_DEPS_VERSION": "1.39.10" + "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip", + "NEW_DEPS_VERSION": "1.39.11" }, "cwd": "${workspaceFolder}" }, diff --git a/CHANGELOG.md b/CHANGELOG.md index edd08a8a5..3fb222d4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,10 @@ ## Latest * Update Razor to 7.0.0-preview.23616.1 (PR: [#6760](https://github.com/dotnet/vscode-csharp/pull/6760) * Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) - +* Update OmniSharp to 1.39.11 (PR: [#6771](https://github.com/dotnet/vscode-csharp/pull/6771)) + * Fix loading AspNetCore projects by shipping the AspNetCore EA library + * Update SDKs and dependencies ([omnisharp-roslyn/#2586](https://github.com/OmniSharp/omnisharp-roslyn/issues/2586), PR: [omnisharp-roslyn/#2588](https://github.com/OmniSharp/omnisharp-roslyn/pull/2588)) + * Updated to latest dotnet-script 1.5.0 (PR: [omnisharp-roslyn/#2585](https://github.com/OmniSharp/omnisharp-roslyn/pull/2585)) ## 2.14.8 * Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730)) * Fix description of debugger `console` setting (PR: [#6726](https://github.com/dotnet/vscode-csharp/pull/6726)) diff --git a/package.json b/package.json index 874c2fc52..b7a4e9ec2 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "defaults": { "roslyn": "4.9.0-3.23611.3", - "omniSharp": "1.39.10", + "omniSharp": "1.39.11", "razor": "7.0.0-preview.23616.1", "razorOmnisharp": "7.0.0-preview.23363.1", "razorTelemetry": "7.0.0-preview.23616.1" @@ -178,104 +178,104 @@ { "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 4.7.2 / x86)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x86-1.39.10.zip", - "installPath": ".omnisharp/1.39.10", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "win32" ], "architectures": [ "x86" ], - "installTestPath": "./.omnisharp/1.39.10/OmniSharp.exe", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.exe", "platformId": "win-x86", "isFramework": true, - "integrity": "C81CE2099AD494EF63F9D88FAA70D55A68CF175810F944526FF94AAC7A5109F9" + "integrity": "DF52F6BCEEF14033E8A8C374EF1B81D223FFD17BA9D7E297CFCF0C4BEBF0A22F" }, { "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 6 / x86)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x86-net6.0-1.39.10.zip", - "installPath": ".omnisharp/1.39.10-net6.0", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-net6.0-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "win32" ], "architectures": [ "x86" ], - "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", "platformId": "win-x86", "isFramework": false, - "integrity": "B7E62415CFC3DAC2154AC636C5BF0FB4B2C9BBF11B5A1FBF72381DDDED59791E" + "integrity": "BAF991481E56A75E2D865648A212310BB8EB9ACA44BABE64AA284C8E044DC844" }, { "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 4.7.2 / x64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x64-1.39.10.zip", - "installPath": ".omnisharp/1.39.10", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "win32" ], "architectures": [ "x86_64" ], - "installTestPath": "./.omnisharp/1.39.10/OmniSharp.exe", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.exe", "platformId": "win-x64", "isFramework": true, - "integrity": "BE0ED10AACEA17E14B78BD0D887DE5935D4ECA3712192A701F3F2100CA3C8B6E" + "integrity": "E1AD559974430C9AA81819F1433583B0EE9A977D2DAAE1DE32D4D408503B2867" }, { "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 6 / x64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-x64-net6.0-1.39.10.zip", - "installPath": ".omnisharp/1.39.10-net6.0", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "win32" ], "architectures": [ "x86_64" ], - "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", "platformId": "win-x64", "isFramework": false, - "integrity": "A73327395E7EF92C1D8E307055463DA412662C03F077ECC743462FD2760BB537" + "integrity": "A71FD29E6CACDF41FD44ACB9F8532BE33DBD4CB313513E47A031443F648BDBAB" }, { "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 4.7.2 / arm64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-arm64-1.39.10.zip", - "installPath": ".omnisharp/1.39.10", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "win32" ], "architectures": [ "arm64" ], - "installTestPath": "./.omnisharp/1.39.10/OmniSharp.exe", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.exe", "platformId": "win-arm64", "isFramework": true, - "integrity": "32FA0067B0639F87760CD1A769B16E6A53588C137C4D31661836CA4FB28D3DD6" + "integrity": "D42BB3A146B9DED5C59630708A6FFB0F76B2067B31AE3A6596596AFFCE7D79C9" }, { "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 6 / arm64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-win-arm64-net6.0-1.39.10.zip", - "installPath": ".omnisharp/1.39.10-net6.0", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "win32" ], "architectures": [ "arm64" ], - "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", "platformId": "win-arm64", "isFramework": false, - "integrity": "433F9B360CAA7B4DDD85C604D5C5542C1A718BCF2E71B2BCFC7526E6D41F4E8F" + "integrity": "FFC67D2A97F8E04161BE2DCA5CE48ECEB1B09A3DD0FCE697122D5B77302FC152" }, { "id": "OmniSharp", "description": "OmniSharp for OSX (Mono / x64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-1.39.10.zip", - "installPath": ".omnisharp/1.39.10", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "darwin" ], @@ -287,48 +287,48 @@ "./mono.osx", "./run" ], - "installTestPath": "./.omnisharp/1.39.10/run", + "installTestPath": "./.omnisharp/1.39.11/run", "platformId": "osx", "isFramework": true, - "integrity": "2CC42F0EC7C30CFA8858501D12ECB6FB685A1FCFB8ECB35698A4B12406551968" + "integrity": "1E339604AE52F531655B57A1058EB56E5CE0E1311C62B4CE16BE7CD0D265AA50" }, { "id": "OmniSharp", "description": "OmniSharp for OSX (.NET 6 / x64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-x64-net6.0-1.39.10.zip", - "installPath": ".omnisharp/1.39.10-net6.0", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "darwin" ], "architectures": [ "x86_64" ], - "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", "platformId": "osx-x64", "isFramework": false, - "integrity": "C9D6E9F2C839A66A7283AE6A9EC545EE049B48EB230D33E91A6322CB67FF9D97" + "integrity": "01571AE3B5DF4345E42B1EBD85601A654985590D403F40D2F802ED3204516350" }, { "id": "OmniSharp", "description": "OmniSharp for OSX (.NET 6 / arm64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-osx-arm64-net6.0-1.39.10.zip", - "installPath": ".omnisharp/1.39.10-net6.0", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "darwin" ], "architectures": [ "arm64" ], - "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", "platformId": "osx-arm64", "isFramework": false, - "integrity": "851350F52F83E3BAD5A92D113E4B9882FCD1DEB16AA84FF94B6F2CEE3C70051E" + "integrity": "9318997071878AB2DD7ECA29F1C797449B6C5454A0CB78BED0D17121BEC37B10" }, { "id": "OmniSharp", "description": "OmniSharp for Linux (Mono / x86)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x86-1.39.10.zip", - "installPath": ".omnisharp/1.39.10", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "linux" ], @@ -340,16 +340,16 @@ "./mono.linux-x86", "./run" ], - "installTestPath": "./.omnisharp/1.39.10/run", + "installTestPath": "./.omnisharp/1.39.11/run", "platformId": "linux-x86", "isFramework": true, - "integrity": "474B1CDBAE64CFEC655FB6B0659BCE481023C48274441C72991E67B6E13E56A1" + "integrity": "9568941017C31318D893669647042065985A0BA871708DA3688208D50CA7F452" }, { "id": "OmniSharp", "description": "OmniSharp for Linux (Mono / x64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x64-1.39.10.zip", - "installPath": ".omnisharp/1.39.10", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "linux" ], @@ -360,32 +360,32 @@ "./mono.linux-x86_64", "./run" ], - "installTestPath": "./.omnisharp/1.39.10/run", + "installTestPath": "./.omnisharp/1.39.11/run", "platformId": "linux-x64", "isFramework": true, - "integrity": "FB4CAA47343265100349375D79DBCCE1868950CED675CB07FCBE8462EDBCDD37" + "integrity": "88B70F9D4D7587562C3F25EC1062E8A8120EBCE7083D56E91D9AE4A6C72E4340" }, { "id": "OmniSharp", "description": "OmniSharp for Linux (.NET 6 / x64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-x64-net6.0-1.39.10.zip", - "installPath": ".omnisharp/1.39.10-net6.0", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "linux" ], "architectures": [ "x86_64" ], - "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", "platformId": "linux-x64", "isFramework": false, - "integrity": "0926D3BEA060BF4373356B2FC0A68C10D0DE1B1150100B551BA5932814CE51E2" + "integrity": "E58BE0F23DD84F2ACCEA245D7DBB8F9DE6ADEA354D44CB2A3F10D7F1326571D9" }, { "id": "OmniSharp", "description": "OmniSharp for Linux (Mono / arm64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-arm64-1.39.10.zip", - "installPath": ".omnisharp/1.39.10", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "linux" ], @@ -396,58 +396,58 @@ "./mono.linux-arm64", "./run" ], - "installTestPath": "./.omnisharp/1.39.10/run", + "installTestPath": "./.omnisharp/1.39.11/run", "platformId": "linux-arm64", "isFramework": true, - "integrity": "478F3594DFD0167E9A56E36F0364A86C73F8132A3E7EA916CA1419EFE141D2CC" + "integrity": "A10A5595AB0B13BD22495A7278995D9711B12F9EDE04AA3BB29CBE8F175EFABA" }, { "id": "OmniSharp", "description": "OmniSharp for Linux (.NET 6 / arm64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-arm64-net6.0-1.39.10.zip", - "installPath": ".omnisharp/1.39.10-net6.0", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "linux" ], "architectures": [ "arm64" ], - "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", "platformId": "linux-arm64", "isFramework": false, - "integrity": "6FB6A572043A74220A92F6C19C7BB0C3743321C7563A815FD2702EF4FA7D688E" + "integrity": "D4794CBA966B9B5D0F731E1606E732D5C231D4B1D345788B837565914D880A0E" }, { "id": "OmniSharp", "description": "OmniSharp for Linux musl (.NET 6 / x64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-musl-x64-net6.0-1.39.10.zip", - "installPath": ".omnisharp/1.39.10-net6.0", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "linux-musl" ], "architectures": [ "x86_64" ], - "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", "platformId": "linux-musl-x64", "isFramework": false, - "integrity": "6BFDA3AD11DBB0C6514B86ECC3E1597CC41C6E309B7575F7C599E07D9E2AE610" + "integrity": "E8F924BB793C60B032FADE805030DF8F8F9B62F7FC32BF3B688EEA1B7E94B5DA" }, { "id": "OmniSharp", "description": "OmniSharp for Linux musl (.NET 6 / arm64)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.10/omnisharp-linux-musl-arm64-net6.0-1.39.10.zip", - "installPath": ".omnisharp/1.39.10-net6.0", + "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip", + "installPath": ".omnisharp/1.39.11", "platforms": [ "linux-musl" ], "architectures": [ "arm64" ], - "installTestPath": "./.omnisharp/1.39.10-net6.0/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", "platformId": "linux-musl-arm64", "isFramework": false, - "integrity": "DA63619EA024EB9BBF6DB5A85C6150CAB5C0BD554544A3596ED1B17F926D6875" + "integrity": "223B58388C0F7226874DCA9053FE10B10739F2E43663DEED3F2F48C892E0D8E6" }, { "id": "Debugger", @@ -5696,4 +5696,4 @@ } ] } -} \ No newline at end of file +} From ff34b312373643a2b9cdac43041811864d138d2f Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 22 Dec 2023 13:00:09 -0800 Subject: [PATCH 18/29] Fix O# net6.0 install paths. --- package.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index b7a4e9ec2..aec62cbc7 100644 --- a/package.json +++ b/package.json @@ -195,14 +195,14 @@ "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 6 / x86)", "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", + "installPath": ".omnisharp/1.39.11-net6.0", "platforms": [ "win32" ], "architectures": [ "x86" ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", "platformId": "win-x86", "isFramework": false, "integrity": "BAF991481E56A75E2D865648A212310BB8EB9ACA44BABE64AA284C8E044DC844" @@ -227,14 +227,14 @@ "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 6 / x64)", "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", + "installPath": ".omnisharp/1.39.11-net6.0", "platforms": [ "win32" ], "architectures": [ "x86_64" ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", "platformId": "win-x64", "isFramework": false, "integrity": "A71FD29E6CACDF41FD44ACB9F8532BE33DBD4CB313513E47A031443F648BDBAB" @@ -259,14 +259,14 @@ "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 6 / arm64)", "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", + "installPath": ".omnisharp/1.39.11-net6.0", "platforms": [ "win32" ], "architectures": [ "arm64" ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", "platformId": "win-arm64", "isFramework": false, "integrity": "FFC67D2A97F8E04161BE2DCA5CE48ECEB1B09A3DD0FCE697122D5B77302FC152" @@ -296,14 +296,14 @@ "id": "OmniSharp", "description": "OmniSharp for OSX (.NET 6 / x64)", "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", + "installPath": ".omnisharp/1.39.11-net6.0", "platforms": [ "darwin" ], "architectures": [ "x86_64" ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", "platformId": "osx-x64", "isFramework": false, "integrity": "01571AE3B5DF4345E42B1EBD85601A654985590D403F40D2F802ED3204516350" @@ -312,14 +312,14 @@ "id": "OmniSharp", "description": "OmniSharp for OSX (.NET 6 / arm64)", "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", + "installPath": ".omnisharp/1.39.11-net6.0", "platforms": [ "darwin" ], "architectures": [ "arm64" ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", "platformId": "osx-arm64", "isFramework": false, "integrity": "9318997071878AB2DD7ECA29F1C797449B6C5454A0CB78BED0D17121BEC37B10" @@ -369,14 +369,14 @@ "id": "OmniSharp", "description": "OmniSharp for Linux (.NET 6 / x64)", "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", + "installPath": ".omnisharp/1.39.11-net6.0", "platforms": [ "linux" ], "architectures": [ "x86_64" ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", "platformId": "linux-x64", "isFramework": false, "integrity": "E58BE0F23DD84F2ACCEA245D7DBB8F9DE6ADEA354D44CB2A3F10D7F1326571D9" @@ -405,14 +405,14 @@ "id": "OmniSharp", "description": "OmniSharp for Linux (.NET 6 / arm64)", "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", + "installPath": ".omnisharp/1.39.11-net6.0", "platforms": [ "linux" ], "architectures": [ "arm64" ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", "platformId": "linux-arm64", "isFramework": false, "integrity": "D4794CBA966B9B5D0F731E1606E732D5C231D4B1D345788B837565914D880A0E" @@ -421,14 +421,14 @@ "id": "OmniSharp", "description": "OmniSharp for Linux musl (.NET 6 / x64)", "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", + "installPath": ".omnisharp/1.39.11-net6.0", "platforms": [ "linux-musl" ], "architectures": [ "x86_64" ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", "platformId": "linux-musl-x64", "isFramework": false, "integrity": "E8F924BB793C60B032FADE805030DF8F8F9B62F7FC32BF3B688EEA1B7E94B5DA" @@ -437,14 +437,14 @@ "id": "OmniSharp", "description": "OmniSharp for Linux musl (.NET 6 / arm64)", "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", + "installPath": ".omnisharp/1.39.11-net6.0", "platforms": [ "linux-musl" ], "architectures": [ "arm64" ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.dll", + "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", "platformId": "linux-musl-arm64", "isFramework": false, "integrity": "223B58388C0F7226874DCA9053FE10B10739F2E43663DEED3F2F48C892E0D8E6" From efb170ed7442af51609a5737a59ba6b27c3df2ea Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 22 Dec 2023 13:29:02 -0800 Subject: [PATCH 19/29] Give ability to specify preview version when updating package dependencies --- .vscode/launch.json | 3 ++- src/tools/updatePackageDependencies.ts | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 18212f775..081a1d555 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -154,7 +154,8 @@ "env": { "NEW_DEPS_ID": "OmniSharp", "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip", - "NEW_DEPS_VERSION": "1.39.11" + "OLD_DEPS_VERSION": "1.39.10", + "NEW_DEPS_VERSION": "1.39.11", }, "cwd": "${workspaceFolder}" }, diff --git a/src/tools/updatePackageDependencies.ts b/src/tools/updatePackageDependencies.ts index 632fdd16b..d93c7bd06 100644 --- a/src/tools/updatePackageDependencies.ts +++ b/src/tools/updatePackageDependencies.ts @@ -26,6 +26,7 @@ const dashedVersionRegExp = /[0-9]+-[0-9]+-[0-9]+/g; export async function updatePackageDependencies(): Promise { const newPrimaryUrls = process.env['NEW_DEPS_URLS']; const newVersion = process.env['NEW_DEPS_VERSION']; + const oldVersion = process.env['OLD_DEPS_VERSION'] ?? ''; // Optional: Will fallback to trying to replace version with a regex. const packageId = process.env['NEW_DEPS_ID']; if ((!packageId && !newPrimaryUrls) || !newVersion) { @@ -51,6 +52,10 @@ export async function updatePackageDependencies(): Promise { throw new Error("Unexpected 'NEW_DEPS_VERSION' value. Expected format similar to: 1.2.3."); } + if (oldVersion.length > 0 && !/^[0-9]+\.[0-9]+\.[0-9]+[-a-zA-Z0-9.]*$/.test(oldVersion)) { + throw new Error("Unexpected 'OLD_DEPS_VERSION' value. Expected format similar to: 1.2.2."); + } + const packageJSON: PackageJSONFile = JSON.parse(fs.readFileSync('package.json').toString()); const eventStream = new EventStream(); @@ -72,9 +77,9 @@ export async function updatePackageDependencies(): Promise { const updateDependency = async (dependency: Package): Promise => { dependency.integrity = await downloadAndGetHash(dependency.url); - dependency.fallbackUrl = replaceVersion(dependency.fallbackUrl, newVersion); - dependency.installPath = replaceVersion(dependency.installPath, newVersion); - dependency.installTestPath = replaceVersion(dependency.installTestPath, newVersion); + dependency.fallbackUrl = replaceVersion(dependency.fallbackUrl, oldVersion, newVersion); + dependency.installPath = replaceVersion(dependency.installPath, oldVersion, newVersion); + dependency.installTestPath = replaceVersion(dependency.installTestPath, oldVersion, newVersion); Object.keys(packageJSON.defaults).forEach((key) => { //Update the version present in the defaults if (key.toLowerCase() == dependency.id.toLowerCase()) { @@ -169,7 +174,7 @@ export async function updatePackageDependencies(): Promise { continue; } - dependency.url = replaceVersion(dependency.url, newVersion); + dependency.url = replaceVersion(dependency.url, oldVersion, newVersion); await updateDependency(dependency); } } @@ -186,14 +191,18 @@ export async function updatePackageDependencies(): Promise { fs.writeFileSync('package.json', content); } -function replaceVersion(fileName: string, newVersion: string): string; -function replaceVersion(fileName: undefined, newVersion: string): undefined; -function replaceVersion(fileName: string | undefined, newVersion: string): string | undefined; -function replaceVersion(fileName: string | undefined, newVersion: string): string | undefined { +function replaceVersion(fileName: string, oldVersion: string, newVersion: string): string; +function replaceVersion(fileName: undefined, oldVersion: string, newVersion: string): undefined; +function replaceVersion(fileName: string | undefined, oldVersion: string, newVersion: string): string | undefined; +function replaceVersion(fileName: string | undefined, oldVersion: string, newVersion: string): string | undefined { if (fileName === undefined) { return undefined; // If the file name is undefined, no version to replace } + if (oldVersion.length > 0) { + return fileName.replaceAll(oldVersion, newVersion); + } + let regex: RegExp = dottedVersionRegExp; let newValue: string = newVersion; if (!dottedVersionRegExp.test(fileName)) { From 144baaf0384a307a37fcd64ef0dc1b18abe86b92 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Thu, 28 Dec 2023 17:26:22 +1100 Subject: [PATCH 20/29] Bump Razor to 7.0.0-preview.23627.2 --- .vscode/launch.json | 8 ++--- package.json | 86 ++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index cad466968..4f6f4741f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -168,8 +168,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/c272788e7d4dae4b7ddaac5f51f98a78/razorlanguageserver-linux-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9391972405d093eaa406482ffe73925e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7d68e714a49ffa67169bdb2f979d9625/razorlanguageserver-linux-musl-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9c1986fb1da8db7882cc4af6e624a92e/razorlanguageserver-linux-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/374d6a0c0ae5b043fa424a89e740e82e/razorlanguageserver-osx-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/44eced55816edabb41d131eec4db442b/razorlanguageserver-osx-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/1e21370d7aa085b5ef9da0708e73707d/razorlanguageserver-platformagnostic-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2b08591e0a9532a95cbb4d961e543624/razorlanguageserver-win-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/b6fc013fa813d42c44ffe33bc31742f9/razorlanguageserver-win-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/21e60c5e4f6423182ea9725cd3d28668/razorlanguageserver-win-x86-7.0.0-preview.23616.1.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.23616.1", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/57a8b1dc12af90bdc1b8e0036d4b5cf8/razorlanguageserver-linux-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b59d0eb28baf935dcb81dc1aa91b8b37/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b6de6303a02473ba8fbe4d127d3d0827/razorlanguageserver-linux-musl-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/a9c955bc5b09ee22f82309ec821ea630/razorlanguageserver-linux-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/0ad87856a78cf034b5e30423f51f42ca/razorlanguageserver-osx-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/d7dbdd01e9d1fc74e44de8bf5c2c3cf4/razorlanguageserver-osx-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/2d81ded18f0c7efa1c7e37489093a613/razorlanguageserver-platformagnostic-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/3f8fd08587afa3b615886dd745723497/razorlanguageserver-win-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5d025f318cb834236a06439eb37ce889/razorlanguageserver-win-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/adb8c2855e48de8cdd7e39eb669583fd/razorlanguageserver-win-x86-7.0.0-preview.23627.2.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.23627.2", "NEW_DEPS_ID": "Razor" }, "cwd": "${workspaceFolder}" @@ -184,8 +184,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2cb789acba83c4d4080cf10b3e91720c/devkittelemetry-linux-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7dc0d68d9ed50a0de44894d0ac7d9fa9/devkittelemetry-linux-musl-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7f3d45705e5ce18781dc69a7bb1084b9/devkittelemetry-linux-musl-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/91916990f7b25c357bb577c60c00e9f5/devkittelemetry-linux-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/09ae5baf1e9f1c894ba269aa4484ca48/devkittelemetry-osx-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/3ab2d6e1d3bdc5575075d9a062a24166/devkittelemetry-osx-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/40b4a00152d07869d12ce44b96572d4c/devkittelemetry-platformagnostic-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/6d5a093349b5e749c44457cb758f718f/devkittelemetry-win-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7e92c77e99d0291a9ab78c8c993315a2/devkittelemetry-win-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/902166e7b43e0a87a62bc9c39aa21c7b/devkittelemetry-win-x86-7.0.0-preview.23616.1.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.23616.1", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/43f1ef568ef88acabea9c481f26fcf7b/devkittelemetry-linux-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/c4ff4d3e1476e78f2d73b48e26c69ef6/devkittelemetry-linux-musl-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/310f2c0528251ca3b879b62f7a434446/devkittelemetry-linux-musl-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/fa99bc6fb3d16f8c44f0ad61023e0589/devkittelemetry-linux-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/6d1472e8f350ab8f388c343db7760c9f/devkittelemetry-osx-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5576ccdc7e3157c034a89ba13a63c915/devkittelemetry-osx-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/e1a9519ed126c32b21eb79758a09d7a6/devkittelemetry-platformagnostic-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/c3b220e7bcc471a816c6d6ba0dc351b0/devkittelemetry-win-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/7933e8f488ff35ed9204db2aaabe6e3b/devkittelemetry-win-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/e2017d3c8ae1a52ced7b31936b2a9d19/devkittelemetry-win-x86-7.0.0-preview.23627.2.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.23627.2", "NEW_DEPS_ID": "RazorTelemetry" }, "cwd": "${workspaceFolder}" diff --git a/package.json b/package.json index 821209e3a..0e0a29bec 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ "defaults": { "roslyn": "4.9.0-3.23611.3", "omniSharp": "1.39.10", - "razor": "7.0.0-preview.23616.1", + "razor": "7.0.0-preview.23627.2", "razorOmnisharp": "7.0.0-preview.23363.1", - "razorTelemetry": "7.0.0-preview.23616.1" + "razorTelemetry": "7.0.0-preview.23627.2" }, "main": "./dist/extension", "l10n": "./l10n", @@ -608,7 +608,7 @@ { "id": "Razor", "description": "Razor Language Server (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/b6fc013fa813d42c44ffe33bc31742f9/razorlanguageserver-win-x64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5d025f318cb834236a06439eb37ce889/razorlanguageserver-win-x64-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "win32" @@ -616,12 +616,12 @@ "architectures": [ "x86_64" ], - "integrity": "642B8B4B823099FB1EA7B95A41D7C50CEE7B7FF6A3C73282D70AADD40FA7109D" + "integrity": "C4868EDA9D4E004FD97B5498B471C6B866E32242E6F829C7945DF206C6132C63" }, { "id": "Razor", "description": "Razor Language Server (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/21e60c5e4f6423182ea9725cd3d28668/razorlanguageserver-win-x86-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/adb8c2855e48de8cdd7e39eb669583fd/razorlanguageserver-win-x86-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "win32" @@ -629,12 +629,12 @@ "architectures": [ "x86" ], - "integrity": "B028CE8B8532D3BFCBD6FC7EB2CB68BAB8B4BB4BA768FE73E12BC0DDC88C2637" + "integrity": "57788B1E123D9099EC7B7A800532F81FFA05A7555073606417BED9F2A9FC0722" }, { "id": "Razor", "description": "Razor Language Server (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2b08591e0a9532a95cbb4d961e543624/razorlanguageserver-win-arm64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/3f8fd08587afa3b615886dd745723497/razorlanguageserver-win-arm64-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "win32" @@ -642,12 +642,12 @@ "architectures": [ "arm64" ], - "integrity": "DCD0ACD9B8D1F5BA5850FE572CC1172EA81B82C8CB33E1BE2714E0C212495612" + "integrity": "E9CFA28A88E48D1A15208B4466E46E82F61CFF3A395C270AE28DBE535882C578" }, { "id": "Razor", "description": "Razor Language Server (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9c1986fb1da8db7882cc4af6e624a92e/razorlanguageserver-linux-x64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/a9c955bc5b09ee22f82309ec821ea630/razorlanguageserver-linux-x64-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "linux" @@ -658,12 +658,12 @@ "binaries": [ "./rzls" ], - "integrity": "36EDB3660807BB2F8B4F269B597E788BAC345EEA738BAF38009D0B68975A23D4" + "integrity": "F69C8C28080D6B93367856CC084B65A719EF7F6F66DBA7521520D84824147EBC" }, { "id": "Razor", "description": "Razor Language Server (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/c272788e7d4dae4b7ddaac5f51f98a78/razorlanguageserver-linux-arm64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/57a8b1dc12af90bdc1b8e0036d4b5cf8/razorlanguageserver-linux-arm64-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "linux" @@ -674,12 +674,12 @@ "binaries": [ "./rzls" ], - "integrity": "B0CF33B87FDD344BDDEA9044512901A95F8F46E2F6D0AF3A3A0CCB3EF9F3B8BC" + "integrity": "ED6CE8A36F6C0CF77E1012B03078BE745D3F7045EB8A71FAA31D32E948591692" }, { "id": "Razor", "description": "Razor Language Server (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7d68e714a49ffa67169bdb2f979d9625/razorlanguageserver-linux-musl-x64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b6de6303a02473ba8fbe4d127d3d0827/razorlanguageserver-linux-musl-x64-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -690,12 +690,12 @@ "binaries": [ "./rzls" ], - "integrity": "BA502DC10AF08C85EE2AA76329642128F3BC16A70E4D2FE5A4B45827A2DC6C86" + "integrity": "A7FC04E2FA595EA722C6F792989D10127DBE5F3F9F783C54DDB71654BA011298" }, { "id": "Razor", "description": "Razor Language Server (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9391972405d093eaa406482ffe73925e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b59d0eb28baf935dcb81dc1aa91b8b37/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -706,12 +706,12 @@ "binaries": [ "./rzls" ], - "integrity": "D9138F3E9CDAD94564A742CC1FC65746DF54AA261850038C84A8488BC6884F4A" + "integrity": "FF6B50056B128F675A29D89496328BF473929298FC83C06CEE387C15A698CBB5" }, { "id": "Razor", "description": "Razor Language Server (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/44eced55816edabb41d131eec4db442b/razorlanguageserver-osx-x64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/d7dbdd01e9d1fc74e44de8bf5c2c3cf4/razorlanguageserver-osx-x64-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -722,12 +722,12 @@ "binaries": [ "./rzls" ], - "integrity": "366D14A4BD06DD565E1AE46CC802D857D792692406986D1CFA3DF239CBCB4566" + "integrity": "849FE69AA1012F65F66E402129D5934BEE363DB9D119A139AB8EF60FCC35CB03" }, { "id": "Razor", "description": "Razor Language Server (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/374d6a0c0ae5b043fa424a89e740e82e/razorlanguageserver-osx-arm64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/0ad87856a78cf034b5e30423f51f42ca/razorlanguageserver-osx-arm64-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -738,12 +738,12 @@ "binaries": [ "./rzls" ], - "integrity": "828DD72BB38AA64A15DEB706C90738098FE5528A1D41F4DDE7FB84D5325FCC59" + "integrity": "AEF2F022652082D044F1CDB873F78701DAB3054DC9537ADA94527EC7A9D8F292" }, { "id": "Razor", "description": "Razor Language Server (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/1e21370d7aa085b5ef9da0708e73707d/razorlanguageserver-platformagnostic-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/2d81ded18f0c7efa1c7e37489093a613/razorlanguageserver-platformagnostic-7.0.0-preview.23627.2.zip", "installPath": ".razor", "platforms": [ "neutral" @@ -754,7 +754,7 @@ "binaries": [ "./rzls" ], - "integrity": "275038BCCC4B25BBCA3004117F6FCF594C2BDC45CDE96C7751882EF2FFEA6F6C" + "integrity": "D630874B6235B49D42219A3F22C84C5D25120BCD60ACEEA5D8ED4F14743A9BE1" }, { "id": "RazorOmnisharp", @@ -885,7 +885,7 @@ { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7e92c77e99d0291a9ab78c8c993315a2/devkittelemetry-win-x64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/7933e8f488ff35ed9204db2aaabe6e3b/devkittelemetry-win-x64-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -893,12 +893,12 @@ "architectures": [ "x86_64" ], - "integrity": "F049007CFC25253F8899FC125F46A14B4197C29A19B0ED412B9A57BC47E66B8B" + "integrity": "741CB272144F024337C767A9671F78466A3FFA52C202C0469BFE106732CEF2DB" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/902166e7b43e0a87a62bc9c39aa21c7b/devkittelemetry-win-x86-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/e2017d3c8ae1a52ced7b31936b2a9d19/devkittelemetry-win-x86-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -906,12 +906,12 @@ "architectures": [ "x86" ], - "integrity": "6EB981D3B773C505C6F2E54105508832AB0AD1D395C9342F52E56A771BCCAF99" + "integrity": "643C2EBE68EA1DFE576A97F001068F36764B5F17CDD7C38C63C39B041C78A52C" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/6d5a093349b5e749c44457cb758f718f/devkittelemetry-win-arm64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/c3b220e7bcc471a816c6d6ba0dc351b0/devkittelemetry-win-arm64-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -919,12 +919,12 @@ "architectures": [ "arm64" ], - "integrity": "66C8C930D5C651B7D7A76BD4982D3F9B601E73B4E6C6E469B1D34A7B58EACBFC" + "integrity": "B44112658B9F35DFD173DC29D35EEE61711C68EABA069806259A36A8D4728EDB" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/91916990f7b25c357bb577c60c00e9f5/devkittelemetry-linux-x64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/fa99bc6fb3d16f8c44f0ad61023e0589/devkittelemetry-linux-x64-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -932,12 +932,12 @@ "architectures": [ "x86_64" ], - "integrity": "869415FDF3F43806C8F15F665C2B9463D8C92C24C923275F9FE187EF0208F4B9" + "integrity": "727059EC37646BAC666EB0DF6070F787DBE53C14FE61643CB140B34EEAA85643" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2cb789acba83c4d4080cf10b3e91720c/devkittelemetry-linux-arm64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/43f1ef568ef88acabea9c481f26fcf7b/devkittelemetry-linux-arm64-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -945,12 +945,12 @@ "architectures": [ "arm64" ], - "integrity": "742A93ED6E506F3DE6713D9B89BA73C4766CB421DF84E92DC76008FF61D6E10F" + "integrity": "A100A9935A00AB5215DBEDB4DA9E7DB8E14136C2CC34379514AD618CC11FA878" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7f3d45705e5ce18781dc69a7bb1084b9/devkittelemetry-linux-musl-x64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/310f2c0528251ca3b879b62f7a434446/devkittelemetry-linux-musl-x64-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -958,12 +958,12 @@ "architectures": [ "x86_64" ], - "integrity": "BCBAEB6B4618ACECF586C434A2E36D749B24832E3B5F7320A2BDBDE7A9DE02EA" + "integrity": "841C940A91995C8E044BFA37DDCC1823995FAA9F25620F1C8FA335C5049113FE" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7dc0d68d9ed50a0de44894d0ac7d9fa9/devkittelemetry-linux-musl-arm64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/c4ff4d3e1476e78f2d73b48e26c69ef6/devkittelemetry-linux-musl-arm64-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -971,12 +971,12 @@ "architectures": [ "arm64" ], - "integrity": "194A28447DE77DFBB268A47C828BA547D71C6A0A4D2C55D311D933F44CB0EFB6" + "integrity": "4FE513AB3715EC9B9F1471112C65D35AF568C2A45174DBB9D3034C57F51B68F3" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/3ab2d6e1d3bdc5575075d9a062a24166/devkittelemetry-osx-x64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5576ccdc7e3157c034a89ba13a63c915/devkittelemetry-osx-x64-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -984,12 +984,12 @@ "architectures": [ "x86_64" ], - "integrity": "C3C6C5CF49F918A6D222280A64F847A40B400771E7D900BB57D66743F616C5D7" + "integrity": "4934DB5D0751F91D0380A10BA8F2781EC48CAF2227C6E98435D865FB5DF6B8BC" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/09ae5baf1e9f1c894ba269aa4484ca48/devkittelemetry-osx-arm64-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/6d1472e8f350ab8f388c343db7760c9f/devkittelemetry-osx-arm64-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -997,12 +997,12 @@ "architectures": [ "arm64" ], - "integrity": "5AEA32548A44B40FEC676D40BBA76920F3114D9B13015319C3B91324C1A95AFE" + "integrity": "8B0767718888820789EDA8BFE60623E3643105E6BC28198D78C7B1D02415D99A" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/40b4a00152d07869d12ce44b96572d4c/devkittelemetry-platformagnostic-7.0.0-preview.23616.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/e1a9519ed126c32b21eb79758a09d7a6/devkittelemetry-platformagnostic-7.0.0-preview.23627.2.zip", "installPath": ".razortelemetry", "platforms": [ "netural" @@ -1010,7 +1010,7 @@ "architectures": [ "neutral" ], - "integrity": "6D791D0323F87A6198231C251910F5F60C5C4D35FB34A79302B5E58F722A75FA" + "integrity": "33DD915C16DC0C29463F8157F3EE93506FDFDA6DC7981B81409E75BE545126D3" } ], "engines": { @@ -5695,4 +5695,4 @@ } ] } -} +} \ No newline at end of file From 70c3a7967cf27386acb8bc0b23e2e45db9da58d2 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Thu, 28 Dec 2023 17:29:10 +1100 Subject: [PATCH 21/29] Update change log --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbef411c2..8855842ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,9 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) ## Latest -* Update Razor to 7.0.0-preview.23616.1 (PR: [#6760](https://github.com/dotnet/vscode-csharp/pull/6760) -* Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) +* Update Razor to 7.0.0-preview.23627.2 (PR: [#6770](https://github.com/dotnet/vscode-csharp/pull/6770) * Fixed issue where Razor trace level was ignored. New `razor.server.trace` setting created that is not ignored (PR: [dotnet/razor#9745](https://github.com/dotnet/razor/pull/9745)) +* Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) ## 2.14.8 * Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730)) From 33d6c79cc44ec2e77ea343365839fcdaecc060fc Mon Sep 17 00:00:00 2001 From: David Barbet Date: Wed, 3 Jan 2024 16:02:49 -0800 Subject: [PATCH 22/29] Fix command enablement by using specific activation contexts for O#, Roslyn standalone, and Roslyn devkit --- .../omnisharpCommands.integration.test.ts | 49 +++++++++++++++++++ package.json | 43 +++++++--------- src/lsptoolshost/roslynLanguageServer.ts | 7 ++- src/main.ts | 3 ++ .../commandEnablement.integration.test.ts | 46 +++++++++++++++++ 5 files changed, 123 insertions(+), 25 deletions(-) create mode 100644 omnisharptest/omnisharpIntegrationTests/omnisharpCommands.integration.test.ts create mode 100644 test/integrationTests/commandEnablement.integration.test.ts diff --git a/omnisharptest/omnisharpIntegrationTests/omnisharpCommands.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/omnisharpCommands.integration.test.ts new file mode 100644 index 000000000..a1b2e370a --- /dev/null +++ b/omnisharptest/omnisharpIntegrationTests/omnisharpCommands.integration.test.ts @@ -0,0 +1,49 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { expect, test, beforeAll, afterAll, describe } from '@jest/globals'; +import * as vscode from 'vscode'; +import { activateCSharpExtension } from './integrationHelpers'; +import testAssetWorkspace from './testAssets/activeTestAssetWorkspace'; + +describe(`Command Enablement: ${testAssetWorkspace.description}`, function () { + beforeAll(async function () { + const activation = await activateCSharpExtension(); + await testAssetWorkspace.restore(); + await testAssetWorkspace.waitForIdle(activation.eventStream); + }); + + afterAll(async () => { + await testAssetWorkspace.cleanupWorkspace(); + }); + + test('Only expected commands are available', async function () { + const commands = await vscode.commands.getCommands(true); + + // Ensure the O# commands are available. + expect(commands).toContain('o.restart'); + expect(commands).toContain('o.pickProjectAndStart'); + expect(commands).toContain('o.fixAll.solution'); + expect(commands).toContain('o.fixAll.project'); + expect(commands).toContain('o.fixAll.document'); + expect(commands).toContain('o.reanalyze.allProjects'); + expect(commands).toContain('o.reanalyze.currentProject'); + expect(commands).toContain('dotnet.generateAssets'); + expect(commands).toContain('dotnet.restore.project'); + expect(commands).toContain('dotnet.restore.all'); + expect(commands).toContain('dotnet.test.runTestsInContext'); + expect(commands).toContain('dotnet.test.debugTestsInContext'); + expect(commands).toContain('csharp.listProcess'); + expect(commands).toContain('csharp.listRemoteProcess'); + expect(commands).toContain('csharp.listRemoteDockerProcess'); + expect(commands).toContain('csharp.attachToProcess'); + expect(commands).toContain('csharp.reportIssue'); + expect(commands).toContain('csharp.showDecompilationTerms'); + + // Ensure the non-O# commands are not available. + expect(commands).not.toContain('dotnet.openSolution'); + expect(commands).not.toContain('dotnet.restartServer'); + }); +}); diff --git a/package.json b/package.json index aec62cbc7..51516e354 100644 --- a/package.json +++ b/package.json @@ -2008,49 +2008,49 @@ "command": "o.restart", "title": "%command.o.restart%", "category": "OmniSharp", - "enablement": "config.dotnet.server.useOmnisharp" + "enablement": "dotnet.server.activationContext == 'OmniSharp'" }, { "command": "o.pickProjectAndStart", "title": "%command.o.pickProjectAndStart%", "category": "OmniSharp", - "enablement": "config.dotnet.server.useOmnisharp" + "enablement": "dotnet.server.activationContext == 'OmniSharp'" }, { "command": "dotnet.openSolution", "title": "%command.dotnet.openSolution%", "category": ".NET", - "enablement": "!config.dotnet.server.useOmnisharp && dotnet.server.activatedStandalone" + "enablement": "dotnet.server.activationContext == 'Roslyn'" }, { "command": "o.fixAll.solution", "title": "%command.o.fixAll.solution%", "category": "OmniSharp", - "enablement": "config.dotnet.server.useOmnisharp" + "enablement": "dotnet.server.activationContext == 'OmniSharp'" }, { "command": "o.fixAll.project", "title": "%command.o.fixAll.project%", "category": "OmniSharp", - "enablement": "config.dotnet.server.useOmnisharp" + "enablement": "dotnet.server.activationContext == 'OmniSharp'" }, { "command": "o.fixAll.document", "title": "%command.o.fixAll.document%", "category": "OmniSharp", - "enablement": "config.dotnet.server.useOmnisharp" + "enablement": "dotnet.server.activationContext == 'OmniSharp'" }, { "command": "o.reanalyze.allProjects", "title": "%command.o.reanalyze.allProjects%", "category": "OmniSharp", - "enablement": "config.dotnet.server.useOmnisharp" + "enablement": "dotnet.server.activationContext == 'OmniSharp'" }, { "command": "o.reanalyze.currentProject", "title": "%command.o.reanalyze.currentProject%", "category": "OmniSharp", - "enablement": "config.dotnet.server.useOmnisharp" + "enablement": "dotnet.server.activationContext == 'OmniSharp'" }, { "command": "dotnet.generateAssets", @@ -2061,18 +2061,13 @@ "command": "dotnet.restore.project", "title": "%command.dotnet.restore.project%", "category": ".NET", - "enablement": "dotnet.server.activatedStandalone" + "enablement": "dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'" }, { "command": "dotnet.restore.all", "title": "%command.dotnet.restore.all%", "category": ".NET", - "enablement": "dotnet.server.activatedStandalone" - }, - { - "command": "csharp.downloadDebugger", - "title": "%command.csharp.downloadDebugger%", - "category": "Debug" + "enablement": "dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'" }, { "command": "csharp.listProcess", @@ -2103,7 +2098,7 @@ "command": "csharp.showDecompilationTerms", "title": "%command.csharp.showDecompilationTerms%", "category": "CSharp", - "enablement": "config.dotnet.server.useOmnisharp" + "enablement": "dotnet.server.activationContext == 'OmniSharp'" }, { "command": "extension.showRazorCSharpWindow", @@ -2124,19 +2119,19 @@ "command": "dotnet.test.runTestsInContext", "title": "%command.dotnet.test.runTestsInContext%", "category": ".NET", - "enablement": "dotnet.server.activatedStandalone" + "enablement": "dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'" }, { "command": "dotnet.test.debugTestsInContext", "title": "%command.dotnet.test.debugTestsInContext%", "category": ".NET", - "enablement": "dotnet.server.activatedStandalone" + "enablement": "dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'" }, { "command": "dotnet.restartServer", "title": "%command.dotnet.restartServer%", "category": ".NET", - "enablement": "!config.dotnet.server.useOmnisharp" + "enablement": "dotnet.server.activationContext != 'OmniSharp'" } ], "keybindings": [ @@ -5638,15 +5633,15 @@ "commandPalette": [ { "command": "dotnet.test.runTestsInContext", - "when": "editorLangId == csharp && dotnet.server.activatedStandalone" + "when": "editorLangId == csharp && dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'" }, { "command": "dotnet.test.debugTestsInContext", - "when": "editorLangId == csharp && dotnet.server.activatedStandalone" + "when": "editorLangId == csharp && dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'" }, { "command": "o.restart", - "when": "config.dotnet.server.useOmnisharp" + "when": "dotnet.server.activationContext == 'OmniSharp'" }, { "command": "csharp.listProcess", @@ -5678,12 +5673,12 @@ "editor/context": [ { "command": "dotnet.test.runTestsInContext", - "when": "editorLangId == csharp && dotnet.server.activatedStandalone", + "when": "editorLangId == csharp && dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'", "group": "2_dotnet@1" }, { "command": "dotnet.test.debugTestsInContext", - "when": "editorLangId == csharp && dotnet.server.activatedStandalone", + "when": "editorLangId == csharp && dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'", "group": "2_dotnet@2" } ] diff --git a/src/lsptoolshost/roslynLanguageServer.ts b/src/lsptoolshost/roslynLanguageServer.ts index f007b8093..4afd344f4 100644 --- a/src/lsptoolshost/roslynLanguageServer.ts +++ b/src/lsptoolshost/roslynLanguageServer.ts @@ -518,6 +518,9 @@ export class RoslynLanguageServer { _channel.appendLine('Activating C# + C# Dev Kit...'); } + // Set command enablement to use DevKit commands. + vscode.commands.executeCommand('setContext', 'dotnet.server.activationContext', 'RoslynDevKit'); + const csharpDevKitArgs = this.getCSharpDevKitExportArgs(); args = args.concat(csharpDevKitArgs); @@ -525,7 +528,9 @@ export class RoslynLanguageServer { } else { // C# Dev Kit is not installed - continue C#-only activation. _channel.appendLine('Activating C# standalone...'); - vscode.commands.executeCommand('setContext', 'dotnet.server.activatedStandalone', true); + + // Set command enablement to use roslyn standalone commands. + vscode.commands.executeCommand('setContext', 'dotnet.server.activationContext', 'Roslyn'); _wasActivatedWithCSharpDevkit = false; } diff --git a/src/main.ts b/src/main.ts index 07899f3e1..cc882f601 100644 --- a/src/main.ts +++ b/src/main.ts @@ -184,6 +184,9 @@ export async function activate( roslynLanguageServerEvents ); } else { + // Set command enablement to use O# commands. + vscode.commands.executeCommand('setContext', 'dotnet.server.activationContext', 'OmniSharp'); + const dotnetChannelObserver = new DotNetChannelObserver(dotnetChannel); const dotnetLoggerObserver = new DotnetLoggerObserver(dotnetChannel); eventStream.subscribe(dotnetChannelObserver.post); diff --git a/test/integrationTests/commandEnablement.integration.test.ts b/test/integrationTests/commandEnablement.integration.test.ts new file mode 100644 index 000000000..8d77d4e79 --- /dev/null +++ b/test/integrationTests/commandEnablement.integration.test.ts @@ -0,0 +1,46 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { expect, test, beforeAll, afterAll, describe } from '@jest/globals'; +import * as vscode from 'vscode'; +import { activateCSharpExtension } from './integrationHelpers'; +import testAssetWorkspace from './testAssets/testAssetWorkspace'; + +describe(`Command Enablement: ${testAssetWorkspace.description}`, function () { + beforeAll(async function () { + await activateCSharpExtension(); + }); + + afterAll(async () => { + await testAssetWorkspace.cleanupWorkspace(); + }); + + test('Only expected commands are available', async function () { + const commands = await vscode.commands.getCommands(true); + + // Ensure the standalone Roslyn commands are available. + expect(commands).toContain('dotnet.openSolution'); + expect(commands).toContain('dotnet.restartServer'); + expect(commands).toContain('dotnet.generateAssets'); + expect(commands).toContain('dotnet.restore.project'); + expect(commands).toContain('dotnet.restore.all'); + expect(commands).toContain('dotnet.test.runTestsInContext'); + expect(commands).toContain('dotnet.test.debugTestsInContext'); + expect(commands).toContain('csharp.listProcess'); + expect(commands).toContain('csharp.listRemoteProcess'); + expect(commands).toContain('csharp.listRemoteDockerProcess'); + expect(commands).toContain('csharp.attachToProcess'); + expect(commands).toContain('csharp.reportIssue'); + + // Ensure the O#-only commands are not available. + expect(commands).not.toContain('o.restart'); + expect(commands).not.toContain('o.pickProjectAndStart'); + expect(commands).not.toContain('o.fixAll.solution'); + expect(commands).not.toContain('o.fixAll.project'); + expect(commands).not.toContain('o.fixAll.document'); + expect(commands).not.toContain('o.reanalyze.allProjects'); + expect(commands).not.toContain('o.reanalyze.currentProject'); + }); +}); From 48ff7af1a64b858678dc73cd7218ba8141117baa Mon Sep 17 00:00:00 2001 From: David Barbet Date: Wed, 3 Jan 2024 18:18:39 -0800 Subject: [PATCH 23/29] Add codelens integration test --- src/lsptoolshost/commands.ts | 3 +- .../codelens.integration.test.ts | 93 +++++++++++++++++++ test/integrationTests/integrationHelpers.ts | 26 ++++++ .../unitTests.integration.test.ts | 28 +----- 4 files changed, 122 insertions(+), 28 deletions(-) create mode 100644 test/integrationTests/codelens.integration.test.ts diff --git a/src/lsptoolshost/commands.ts b/src/lsptoolshost/commands.ts index b96c40809..a22c74127 100644 --- a/src/lsptoolshost/commands.ts +++ b/src/lsptoolshost/commands.ts @@ -72,10 +72,11 @@ async function peekReferencesCallback(uriStr: string, serverPosition: languageCl uri, vscodeApiPosition ); + if (references && Array.isArray(references)) { // The references could come back after the document has moved to a new state (that may not even contain the position). // This is fine - the VSCode API is resilient to that scenario and will not crash. - vscode.commands.executeCommand('editor.action.showReferences', uri, vscodeApiPosition, references); + await vscode.commands.executeCommand('editor.action.showReferences', uri, vscodeApiPosition, references); } } diff --git a/test/integrationTests/codelens.integration.test.ts b/test/integrationTests/codelens.integration.test.ts new file mode 100644 index 000000000..18f2ee32a --- /dev/null +++ b/test/integrationTests/codelens.integration.test.ts @@ -0,0 +1,93 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as lsp from 'vscode-languageserver-protocol'; +import * as vscode from 'vscode'; +import * as path from 'path'; +import { describe, beforeAll, beforeEach, afterAll, test, expect } from '@jest/globals'; +import testAssetWorkspace from './testAssets/testAssetWorkspace'; +import { activateCSharpExtension, getCodeLensesAsync, openFileInWorkspaceAsync } from './integrationHelpers'; + +describe(`[${testAssetWorkspace.description}] Test CodeLens`, function () { + beforeAll(async function () { + await activateCSharpExtension(); + }); + + beforeEach(async function () { + const fileName = path.join('src', 'app', 'reference.cs'); + await openFileInWorkspaceAsync(fileName); + }); + + afterAll(async () => { + await testAssetWorkspace.cleanupWorkspace(); + }); + + test('CodeLens references are displayed', async () => { + const codeLenses = await getCodeLensesAsync(); + expect(codeLenses).toHaveLength(4); + + const fooPosition: lsp.Position = { line: 4, character: 17 }; + const fooRange = new vscode.Range( + new vscode.Position(fooPosition.line, fooPosition.character), + new vscode.Position(fooPosition.line, fooPosition.character + 3) + ); + + const fooBazPosition: lsp.Position = { line: 6, character: 20 }; + const fooBazRange = new vscode.Range( + new vscode.Position(fooBazPosition.line, fooBazPosition.character), + new vscode.Position(fooBazPosition.line, fooBazPosition.character + 3) + ); + + const barPosition: lsp.Position = { line: 9, character: 17 }; + const barRange = new vscode.Range( + new vscode.Position(barPosition.line, barPosition.character), + new vscode.Position(barPosition.line, barPosition.character + 3) + ); + + const barBarPosition: lsp.Position = { line: 11, character: 15 }; + const barBarRange = new vscode.Range( + new vscode.Position(barBarPosition.line, barBarPosition.character), + new vscode.Position(barBarPosition.line, barBarPosition.character + 3) + ); + + // Foo references + expect(codeLenses[0].command?.command).toBe('roslyn.client.peekReferences'); + expect(codeLenses[0].command?.title).toBe('1 reference'); + expect(codeLenses[0].command?.arguments![1]).toEqual(fooPosition); + expect(codeLenses[0].range).toEqual(fooRange); + + // For.Baz references + expect(codeLenses[1].command?.command).toBe('roslyn.client.peekReferences'); + expect(codeLenses[1].command?.title).toBe('1 reference'); + expect(codeLenses[1].command?.arguments![1]).toEqual(fooBazPosition); + expect(codeLenses[1].range).toEqual(fooBazRange); + + // Bar references + expect(codeLenses[2].command?.command).toBe('roslyn.client.peekReferences'); + expect(codeLenses[2].command?.title).toBe('1 reference'); + expect(codeLenses[2].command?.arguments![1]).toEqual(barPosition); + expect(codeLenses[2].range).toEqual(barRange); + + // Bar.Bar references + expect(codeLenses[3].command?.command).toBe('roslyn.client.peekReferences'); + expect(codeLenses[3].command?.title).toBe('0 references'); + expect(codeLenses[3].command?.arguments![1]).toEqual(barBarPosition); + expect(codeLenses[3].range).toEqual(barBarRange); + }); + + test('CodeLens references selected', async () => { + const codeLenses = await getCodeLensesAsync(); + const peekCommand = codeLenses[0].command!; + + // There's no way to directly test that the peek window correctly opens, so just assert that nothing threw an error. + await expect( + vscode.commands.executeCommand>( + peekCommand.command, + peekCommand.arguments![0], + peekCommand.arguments![1] + ) + ).resolves.toBeUndefined(); + }); +}); diff --git a/test/integrationTests/integrationHelpers.ts b/test/integrationTests/integrationHelpers.ts index 2eb851abd..46ef6cdd4 100644 --- a/test/integrationTests/integrationHelpers.ts +++ b/test/integrationTests/integrationHelpers.ts @@ -80,6 +80,32 @@ export function isSlnWithGenerator(workspace: typeof vscode.workspace) { return isGivenSln(workspace, 'slnWithGenerator'); } +export async function getCodeLensesAsync(): Promise { + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + throw new Error('No active editor'); + } + + // The number of code lens items to resolve. Set to a high number so we get pretty much everything in the document. + const resolvedItemCount = 100; + + const codeLenses = ( + await vscode.commands.executeCommand( + 'vscode.executeCodeLensProvider', + activeEditor.document.uri, + resolvedItemCount + ) + ); + return codeLenses.sort((a, b) => { + const rangeCompare = a.range.start.compareTo(b.range.start); + if (rangeCompare !== 0) { + return rangeCompare; + } + + return a.command!.title.localeCompare(b.command!.command); + }); +} + function isGivenSln(workspace: typeof vscode.workspace, expectedProjectFileName: string) { const primeWorkspace = workspace.workspaceFolders![0]; const projectFileName = primeWorkspace.uri.fsPath.split(path.sep).pop(); diff --git a/test/integrationTests/unitTests.integration.test.ts b/test/integrationTests/unitTests.integration.test.ts index c2e64b1ed..403226b8c 100644 --- a/test/integrationTests/unitTests.integration.test.ts +++ b/test/integrationTests/unitTests.integration.test.ts @@ -7,7 +7,7 @@ import * as vscode from 'vscode'; import * as path from 'path'; import { describe, beforeAll, beforeEach, afterAll, test, expect } from '@jest/globals'; import testAssetWorkspace from './testAssets/testAssetWorkspace'; -import { activateCSharpExtension, openFileInWorkspaceAsync } from './integrationHelpers'; +import { activateCSharpExtension, getCodeLensesAsync, openFileInWorkspaceAsync } from './integrationHelpers'; import { TestProgress } from '../../src/lsptoolshost/roslynProtocol'; describe(`[${testAssetWorkspace.description}] Test Unit Testing`, function () { @@ -124,29 +124,3 @@ describe(`[${testAssetWorkspace.description}] Test Unit Testing`, function () { expect(testResults?.testsSkipped).toEqual(0); }); }); - -async function getCodeLensesAsync(): Promise { - const activeEditor = vscode.window.activeTextEditor; - if (!activeEditor) { - throw new Error('No active editor'); - } - - // The number of code lens items to resolve. Set to a high number so we get pretty much everything in the document. - const resolvedItemCount = 100; - - const codeLenses = ( - await vscode.commands.executeCommand( - 'vscode.executeCodeLensProvider', - activeEditor.document.uri, - resolvedItemCount - ) - ); - return codeLenses.sort((a, b) => { - const rangeCompare = a.range.start.compareTo(b.range.start); - if (rangeCompare !== 0) { - return rangeCompare; - } - - return a.command!.title.localeCompare(b.command!.command); - }); -} From 4286765381788161afae0b02a56b00ca35e4c233 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Thu, 4 Jan 2024 17:33:13 -0800 Subject: [PATCH 24/29] Review feedback --- .../omnisharpCommands.integration.test.ts | 36 +++++++------------ package.json | 4 +-- src/lsptoolshost/roslynLanguageServer.ts | 2 +- .../commandEnablement.integration.test.ts | 33 +++++++---------- test/integrationTests/expectedCommands.ts | 29 +++++++++++++++ 5 files changed, 57 insertions(+), 47 deletions(-) create mode 100644 test/integrationTests/expectedCommands.ts diff --git a/omnisharptest/omnisharpIntegrationTests/omnisharpCommands.integration.test.ts b/omnisharptest/omnisharpIntegrationTests/omnisharpCommands.integration.test.ts index a1b2e370a..9423560ad 100644 --- a/omnisharptest/omnisharpIntegrationTests/omnisharpCommands.integration.test.ts +++ b/omnisharptest/omnisharpIntegrationTests/omnisharpCommands.integration.test.ts @@ -7,6 +7,7 @@ import { expect, test, beforeAll, afterAll, describe } from '@jest/globals'; import * as vscode from 'vscode'; import { activateCSharpExtension } from './integrationHelpers'; import testAssetWorkspace from './testAssets/activeTestAssetWorkspace'; +import { CommonCommands, OmniSharpCommands, RoslynCommands } from '../../test/integrationTests/expectedCommands'; describe(`Command Enablement: ${testAssetWorkspace.description}`, function () { beforeAll(async function () { @@ -19,31 +20,20 @@ describe(`Command Enablement: ${testAssetWorkspace.description}`, function () { await testAssetWorkspace.cleanupWorkspace(); }); - test('Only expected commands are available', async function () { + test('Omnisharp commands are available', async function () { const commands = await vscode.commands.getCommands(true); - // Ensure the O# commands are available. - expect(commands).toContain('o.restart'); - expect(commands).toContain('o.pickProjectAndStart'); - expect(commands).toContain('o.fixAll.solution'); - expect(commands).toContain('o.fixAll.project'); - expect(commands).toContain('o.fixAll.document'); - expect(commands).toContain('o.reanalyze.allProjects'); - expect(commands).toContain('o.reanalyze.currentProject'); - expect(commands).toContain('dotnet.generateAssets'); - expect(commands).toContain('dotnet.restore.project'); - expect(commands).toContain('dotnet.restore.all'); - expect(commands).toContain('dotnet.test.runTestsInContext'); - expect(commands).toContain('dotnet.test.debugTestsInContext'); - expect(commands).toContain('csharp.listProcess'); - expect(commands).toContain('csharp.listRemoteProcess'); - expect(commands).toContain('csharp.listRemoteDockerProcess'); - expect(commands).toContain('csharp.attachToProcess'); - expect(commands).toContain('csharp.reportIssue'); - expect(commands).toContain('csharp.showDecompilationTerms'); + // Ensure O# commands are available. + OmniSharpCommands.forEach((command) => { + expect(commands).toContain(command); + }); + CommonCommands.forEach((command) => { + expect(commands).toContain(command); + }); - // Ensure the non-O# commands are not available. - expect(commands).not.toContain('dotnet.openSolution'); - expect(commands).not.toContain('dotnet.restartServer'); + // Ensure Roslyn standalone commands are not available. + RoslynCommands.forEach((command) => { + expect(commands).not.toContain(command); + }); }); }); diff --git a/package.json b/package.json index 51516e354..c621d235c 100644 --- a/package.json +++ b/package.json @@ -5673,12 +5673,12 @@ "editor/context": [ { "command": "dotnet.test.runTestsInContext", - "when": "editorLangId == csharp && dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'", + "when": "editorLangId == csharp && (dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp')", "group": "2_dotnet@1" }, { "command": "dotnet.test.debugTestsInContext", - "when": "editorLangId == csharp && dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'", + "when": "editorLangId == csharp && (dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp')", "group": "2_dotnet@2" } ] diff --git a/src/lsptoolshost/roslynLanguageServer.ts b/src/lsptoolshost/roslynLanguageServer.ts index 4afd344f4..f91efcb26 100644 --- a/src/lsptoolshost/roslynLanguageServer.ts +++ b/src/lsptoolshost/roslynLanguageServer.ts @@ -518,7 +518,7 @@ export class RoslynLanguageServer { _channel.appendLine('Activating C# + C# Dev Kit...'); } - // Set command enablement to use DevKit commands. + // Set command enablement as soon as we know devkit is available. vscode.commands.executeCommand('setContext', 'dotnet.server.activationContext', 'RoslynDevKit'); const csharpDevKitArgs = this.getCSharpDevKitExportArgs(); diff --git a/test/integrationTests/commandEnablement.integration.test.ts b/test/integrationTests/commandEnablement.integration.test.ts index 8d77d4e79..3e245c655 100644 --- a/test/integrationTests/commandEnablement.integration.test.ts +++ b/test/integrationTests/commandEnablement.integration.test.ts @@ -7,6 +7,7 @@ import { expect, test, beforeAll, afterAll, describe } from '@jest/globals'; import * as vscode from 'vscode'; import { activateCSharpExtension } from './integrationHelpers'; import testAssetWorkspace from './testAssets/testAssetWorkspace'; +import { CommonCommands, OmniSharpCommands, RoslynCommands } from './expectedCommands'; describe(`Command Enablement: ${testAssetWorkspace.description}`, function () { beforeAll(async function () { @@ -17,30 +18,20 @@ describe(`Command Enablement: ${testAssetWorkspace.description}`, function () { await testAssetWorkspace.cleanupWorkspace(); }); - test('Only expected commands are available', async function () { + test('Roslyn commands are available', async function () { const commands = await vscode.commands.getCommands(true); // Ensure the standalone Roslyn commands are available. - expect(commands).toContain('dotnet.openSolution'); - expect(commands).toContain('dotnet.restartServer'); - expect(commands).toContain('dotnet.generateAssets'); - expect(commands).toContain('dotnet.restore.project'); - expect(commands).toContain('dotnet.restore.all'); - expect(commands).toContain('dotnet.test.runTestsInContext'); - expect(commands).toContain('dotnet.test.debugTestsInContext'); - expect(commands).toContain('csharp.listProcess'); - expect(commands).toContain('csharp.listRemoteProcess'); - expect(commands).toContain('csharp.listRemoteDockerProcess'); - expect(commands).toContain('csharp.attachToProcess'); - expect(commands).toContain('csharp.reportIssue'); + RoslynCommands.forEach((command) => { + expect(commands).toContain(command); + }); + CommonCommands.forEach((command) => { + expect(commands).toContain(command); + }); - // Ensure the O#-only commands are not available. - expect(commands).not.toContain('o.restart'); - expect(commands).not.toContain('o.pickProjectAndStart'); - expect(commands).not.toContain('o.fixAll.solution'); - expect(commands).not.toContain('o.fixAll.project'); - expect(commands).not.toContain('o.fixAll.document'); - expect(commands).not.toContain('o.reanalyze.allProjects'); - expect(commands).not.toContain('o.reanalyze.currentProject'); + // Ensure O# commands are not available. + OmniSharpCommands.forEach((command) => { + expect(commands).not.toContain(command); + }); }); }); diff --git a/test/integrationTests/expectedCommands.ts b/test/integrationTests/expectedCommands.ts new file mode 100644 index 000000000..f8f0d6b61 --- /dev/null +++ b/test/integrationTests/expectedCommands.ts @@ -0,0 +1,29 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export const OmniSharpCommands = [ + 'o.restart', + 'o.pickProjectAndStart', + 'o.fixAll.solution', + 'o.fixAll.project', + 'o.fixAll.document', + 'o.reanalyze.allProjects', + 'o.reanalyze.currentProject', +]; + +export const RoslynCommands = ['dotnet.openSolution', 'dotnet.restartServer']; + +export const CommonCommands = [ + 'dotnet.generateAssets', + 'dotnet.restore.project', + 'dotnet.restore.all', + 'dotnet.test.runTestsInContext', + 'dotnet.test.debugTestsInContext', + 'csharp.listProcess', + 'csharp.listRemoteProcess', + 'csharp.listRemoteDockerProcess', + 'csharp.attachToProcess', + 'csharp.reportIssue', +]; From a49fd293bbbec41e53a7df53ce6d91737fab671c Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Fri, 5 Jan 2024 23:08:14 +0000 Subject: [PATCH 25/29] Localization result of 5946723b75d4c7ae53715944e5d292ea760ccb84. --- l10n/bundle.l10n.cs.json | 2 +- l10n/bundle.l10n.de.json | 2 +- l10n/bundle.l10n.es.json | 2 +- l10n/bundle.l10n.fr.json | 2 +- l10n/bundle.l10n.it.json | 2 +- l10n/bundle.l10n.ja.json | 2 +- l10n/bundle.l10n.ko.json | 2 +- l10n/bundle.l10n.pl.json | 2 +- l10n/bundle.l10n.pt-br.json | 2 +- l10n/bundle.l10n.ru.json | 2 +- l10n/bundle.l10n.tr.json | 2 +- l10n/bundle.l10n.zh-cn.json | 2 +- l10n/bundle.l10n.zh-tw.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/l10n/bundle.l10n.cs.json b/l10n/bundle.l10n.cs.json index de3f619f9..c568f2178 100644 --- a/l10n/bundle.l10n.cs.json +++ b/l10n/bundle.l10n.cs.json @@ -66,7 +66,7 @@ "Ignore": "Ignorovat", "Ignoring non-parseable lines in envFile {0}: {1}.": "Ignorování neanalyzovatelných řádků v souboru envFile {0}: {1}", "Invalid project index": "Neplatný index projektu", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Neplatné nastavení trasování pro jazykový server Razor. Nastavuje se výchozí {0}.", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "Jde o chybu, nebo žádost o funkci?", "Logs": "Protokoly", "Machine information": "Informace o počítači", diff --git a/l10n/bundle.l10n.de.json b/l10n/bundle.l10n.de.json index 200b89f46..b0af044ba 100644 --- a/l10n/bundle.l10n.de.json +++ b/l10n/bundle.l10n.de.json @@ -66,7 +66,7 @@ "Ignore": "Ignorieren", "Ignoring non-parseable lines in envFile {0}: {1}.": "Nicht parsebare Zeilen in envFile {0} werden ignoriert: {1}.", "Invalid project index": "Ungültiger Projektindex", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Ungültige Ablaufverfolgungseinstellung für den Razor-Sprachserver. Standardeinstellung: \"{0}\"", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "Handelt es sich um einen Fehler oder eine Featureanforderung?", "Logs": "Protokolle", "Machine information": "Computerinformationen", diff --git a/l10n/bundle.l10n.es.json b/l10n/bundle.l10n.es.json index 932deab1a..75c5c55bf 100644 --- a/l10n/bundle.l10n.es.json +++ b/l10n/bundle.l10n.es.json @@ -66,7 +66,7 @@ "Ignore": "Ignorar", "Ignoring non-parseable lines in envFile {0}: {1}.": "Se omitirán las líneas de envFile {0}: {1} que no se puedan analizar.", "Invalid project index": "Índice de proyecto no válido", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Configuración de seguimiento no válida para el servidor de lenguaje Razor. El valor predeterminado es '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "¿Se trata de una solicitud de error o característica?", "Logs": "Registros", "Machine information": "Información del equipo", diff --git a/l10n/bundle.l10n.fr.json b/l10n/bundle.l10n.fr.json index a1d2684ac..bb65300e7 100644 --- a/l10n/bundle.l10n.fr.json +++ b/l10n/bundle.l10n.fr.json @@ -66,7 +66,7 @@ "Ignore": "Ignorer", "Ignoring non-parseable lines in envFile {0}: {1}.": "Lignes non analysables ignorées dans envFile {0} : {1}.", "Invalid project index": "Index de projet non valide", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Paramètre de trace non valide pour le serveur de langage Razor. La valeur par défaut est '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "S’agit-il d’une demande de bogue ou de fonctionnalité ?", "Logs": "Journaux", "Machine information": "Informations sur l'ordinateur", diff --git a/l10n/bundle.l10n.it.json b/l10n/bundle.l10n.it.json index fba7afacb..540e59949 100644 --- a/l10n/bundle.l10n.it.json +++ b/l10n/bundle.l10n.it.json @@ -66,7 +66,7 @@ "Ignore": "Ignora", "Ignoring non-parseable lines in envFile {0}: {1}.": "Le righe non analizzabili in envFile {0}: {1} verranno ignorate.", "Invalid project index": "Indice di progetto non valido", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Impostazione di traccia non valida per il server di linguaggio Razor. Impostazione predefinita su '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "Si tratta di una richiesta di bug o funzionalità?", "Logs": "Log", "Machine information": "Informazioni computer", diff --git a/l10n/bundle.l10n.ja.json b/l10n/bundle.l10n.ja.json index a37caae3e..f7034f456 100644 --- a/l10n/bundle.l10n.ja.json +++ b/l10n/bundle.l10n.ja.json @@ -66,7 +66,7 @@ "Ignore": "無視", "Ignoring non-parseable lines in envFile {0}: {1}.": "envFile {0} 内の解析できない行を無視します: {1}", "Invalid project index": "無効なプロジェクト インデックス", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Razor 言語サーバーのトレース設定が無効です。既定は '{0}' です", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "これはバグまたは機能の要求ですか?", "Logs": "ログ", "Machine information": "コンピューター情報", diff --git a/l10n/bundle.l10n.ko.json b/l10n/bundle.l10n.ko.json index 49cb0d522..290b874e4 100644 --- a/l10n/bundle.l10n.ko.json +++ b/l10n/bundle.l10n.ko.json @@ -66,7 +66,7 @@ "Ignore": "무시", "Ignoring non-parseable lines in envFile {0}: {1}.": "envFile {0}: {1}에서 구문 분석할 수 없는 행을 무시합니다.", "Invalid project index": "잘못된 프로젝트 인덱스", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Razor 언어 서버에 대한 추적 설정이 잘못되었습니다. 기본값을 '{0}'(으)로 설정", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "버그인가요, 기능 요청인가요?", "Logs": "로그", "Machine information": "컴퓨터 정보", diff --git a/l10n/bundle.l10n.pl.json b/l10n/bundle.l10n.pl.json index 4232d0b03..4b2b2bff0 100644 --- a/l10n/bundle.l10n.pl.json +++ b/l10n/bundle.l10n.pl.json @@ -66,7 +66,7 @@ "Ignore": "Ignoruj", "Ignoring non-parseable lines in envFile {0}: {1}.": "Ignorowanie wierszy, których nie przeanalizowano w pliku envFile {0}: {1}.", "Invalid project index": "Nieprawidłowy indeks projektu", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Nieprawidłowe ustawienie śledzenia dla serwera języka Razor. Powrót do domyślnej wartości „{0}”", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "Czy jest to żądanie dotyczące usterki czy funkcji?", "Logs": "Dzienniki", "Machine information": "Informacje o maszynie", diff --git a/l10n/bundle.l10n.pt-br.json b/l10n/bundle.l10n.pt-br.json index f3b7150eb..495189556 100644 --- a/l10n/bundle.l10n.pt-br.json +++ b/l10n/bundle.l10n.pt-br.json @@ -66,7 +66,7 @@ "Ignore": "Ignorar", "Ignoring non-parseable lines in envFile {0}: {1}.": "Ignorando linhas não analisáveis no envFile {0}: {1}.", "Invalid project index": "Índice de projeto inválido", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Configuração de rastreamento inválida para servidor de idioma Razor. Padrão para '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "Isso é uma solicitação de bug ou recurso?", "Logs": "Logs", "Machine information": "Informações do computador", diff --git a/l10n/bundle.l10n.ru.json b/l10n/bundle.l10n.ru.json index 74594633f..2c2ab34d3 100644 --- a/l10n/bundle.l10n.ru.json +++ b/l10n/bundle.l10n.ru.json @@ -66,7 +66,7 @@ "Ignore": "Игнорировать", "Ignoring non-parseable lines in envFile {0}: {1}.": "Пропускаются строки, не поддающиеся анализу, в envFile {0}: {1}", "Invalid project index": "Недопустимый индекс проекта", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Недопустимый параметр трассировки для языкового сервера Razor. Установлено значение по умолчанию \"{0}\"", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "Это сообщение об ошибке или запрос новой возможности?", "Logs": "Журналы", "Machine information": "Сведения о компьютере", diff --git a/l10n/bundle.l10n.tr.json b/l10n/bundle.l10n.tr.json index 9179e51c3..51c5375d1 100644 --- a/l10n/bundle.l10n.tr.json +++ b/l10n/bundle.l10n.tr.json @@ -66,7 +66,7 @@ "Ignore": "Yoksay", "Ignoring non-parseable lines in envFile {0}: {1}.": "envFile {0} dosyasındaki ayrıştırılamayan satırlar yok sayılıyor: {1}.", "Invalid project index": "Geçersiz proje dizini", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Razor dil sunucusu için geçersiz izleme ayarı. Varsayılan olarak '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "Bu bir Hata bildirimi mi Özellik isteği mi?", "Logs": "Günlükler", "Machine information": "Makine bilgileri", diff --git a/l10n/bundle.l10n.zh-cn.json b/l10n/bundle.l10n.zh-cn.json index 3dbb9b2fc..3173715a4 100644 --- a/l10n/bundle.l10n.zh-cn.json +++ b/l10n/bundle.l10n.zh-cn.json @@ -66,7 +66,7 @@ "Ignore": "忽略", "Ignoring non-parseable lines in envFile {0}: {1}.": "忽略 envFile {0} 中不可分析的行: {1}", "Invalid project index": "项目索引无效", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Razor 语言服务器的跟踪设置无效。默认为“{0}”", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "这是 Bug 或功能请求吗?", "Logs": "日志", "Machine information": "计算机信息", diff --git a/l10n/bundle.l10n.zh-tw.json b/l10n/bundle.l10n.zh-tw.json index 76c311b66..f82be1253 100644 --- a/l10n/bundle.l10n.zh-tw.json +++ b/l10n/bundle.l10n.zh-tw.json @@ -66,7 +66,7 @@ "Ignore": "略過", "Ignoring non-parseable lines in envFile {0}: {1}.": "正在忽略 envFile {0} 中無法剖析的行: {1}。", "Invalid project index": "無效的專案索引", - "Invalid trace setting for Razor language server. Defaulting to '{0}'": "Razor 語言伺服器的追蹤設定無效。預設為 '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", "Is this a Bug or Feature request?": "這是 Bug 或功能要求嗎?", "Logs": "記錄", "Machine information": "電腦資訊", From 5ba2dfecc0c693f2110ea1981a25560820e2a889 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Sun, 7 Jan 2024 12:10:29 +0000 Subject: [PATCH 26/29] Localization result of 0b6abde7226c5cbfa7799cfe5bfee9d0f4accb3d. --- l10n/bundle.l10n.cs.json | 2 +- l10n/bundle.l10n.de.json | 2 +- l10n/bundle.l10n.es.json | 2 +- l10n/bundle.l10n.fr.json | 2 +- l10n/bundle.l10n.it.json | 2 +- l10n/bundle.l10n.ja.json | 2 +- l10n/bundle.l10n.ko.json | 2 +- l10n/bundle.l10n.pl.json | 2 +- l10n/bundle.l10n.pt-br.json | 2 +- l10n/bundle.l10n.ru.json | 2 +- l10n/bundle.l10n.tr.json | 2 +- l10n/bundle.l10n.zh-cn.json | 2 +- l10n/bundle.l10n.zh-tw.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/l10n/bundle.l10n.cs.json b/l10n/bundle.l10n.cs.json index c568f2178..f919345e4 100644 --- a/l10n/bundle.l10n.cs.json +++ b/l10n/bundle.l10n.cs.json @@ -66,7 +66,7 @@ "Ignore": "Ignorovat", "Ignoring non-parseable lines in envFile {0}: {1}.": "Ignorování neanalyzovatelných řádků v souboru envFile {0}: {1}", "Invalid project index": "Neplatný index projektu", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Návrat k výchozí hodnotě „{0}“", "Is this a Bug or Feature request?": "Jde o chybu, nebo žádost o funkci?", "Logs": "Protokoly", "Machine information": "Informace o počítači", diff --git a/l10n/bundle.l10n.de.json b/l10n/bundle.l10n.de.json index b0af044ba..46e3dfbae 100644 --- a/l10n/bundle.l10n.de.json +++ b/l10n/bundle.l10n.de.json @@ -66,7 +66,7 @@ "Ignore": "Ignorieren", "Ignoring non-parseable lines in envFile {0}: {1}.": "Nicht parsebare Zeilen in envFile {0} werden ignoriert: {1}.", "Invalid project index": "Ungültiger Projektindex", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Ungültige razor.server.trace-Einstellung. Standardmäßig wird \"{0}\" verwendet.", "Is this a Bug or Feature request?": "Handelt es sich um einen Fehler oder eine Featureanforderung?", "Logs": "Protokolle", "Machine information": "Computerinformationen", diff --git a/l10n/bundle.l10n.es.json b/l10n/bundle.l10n.es.json index 75c5c55bf..d24d7f11b 100644 --- a/l10n/bundle.l10n.es.json +++ b/l10n/bundle.l10n.es.json @@ -66,7 +66,7 @@ "Ignore": "Ignorar", "Ignoring non-parseable lines in envFile {0}: {1}.": "Se omitirán las líneas de envFile {0}: {1} que no se puedan analizar.", "Invalid project index": "Índice de proyecto no válido", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Configuración razor.server.trace no válida. El valor predeterminado pasa a ser \"{0}\"", "Is this a Bug or Feature request?": "¿Se trata de una solicitud de error o característica?", "Logs": "Registros", "Machine information": "Información del equipo", diff --git a/l10n/bundle.l10n.fr.json b/l10n/bundle.l10n.fr.json index bb65300e7..b024f775e 100644 --- a/l10n/bundle.l10n.fr.json +++ b/l10n/bundle.l10n.fr.json @@ -66,7 +66,7 @@ "Ignore": "Ignorer", "Ignoring non-parseable lines in envFile {0}: {1}.": "Lignes non analysables ignorées dans envFile {0} : {1}.", "Invalid project index": "Index de projet non valide", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Paramètre razor.server.trace non valide. La valeur par défaut est '{0}'", "Is this a Bug or Feature request?": "S’agit-il d’une demande de bogue ou de fonctionnalité ?", "Logs": "Journaux", "Machine information": "Informations sur l'ordinateur", diff --git a/l10n/bundle.l10n.it.json b/l10n/bundle.l10n.it.json index 540e59949..57951fb4c 100644 --- a/l10n/bundle.l10n.it.json +++ b/l10n/bundle.l10n.it.json @@ -66,7 +66,7 @@ "Ignore": "Ignora", "Ignoring non-parseable lines in envFile {0}: {1}.": "Le righe non analizzabili in envFile {0}: {1} verranno ignorate.", "Invalid project index": "Indice di progetto non valido", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Impostazione razor.server.trace non valida. Impostazione predefinita su '{0}'", "Is this a Bug or Feature request?": "Si tratta di una richiesta di bug o funzionalità?", "Logs": "Log", "Machine information": "Informazioni computer", diff --git a/l10n/bundle.l10n.ja.json b/l10n/bundle.l10n.ja.json index f7034f456..4305ad28a 100644 --- a/l10n/bundle.l10n.ja.json +++ b/l10n/bundle.l10n.ja.json @@ -66,7 +66,7 @@ "Ignore": "無視", "Ignoring non-parseable lines in envFile {0}: {1}.": "envFile {0} 内の解析できない行を無視します: {1}", "Invalid project index": "無効なプロジェクト インデックス", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "razor.server.trace 設定が無効です。既定値は '{0}' です", "Is this a Bug or Feature request?": "これはバグまたは機能の要求ですか?", "Logs": "ログ", "Machine information": "コンピューター情報", diff --git a/l10n/bundle.l10n.ko.json b/l10n/bundle.l10n.ko.json index 290b874e4..d7cd435f2 100644 --- a/l10n/bundle.l10n.ko.json +++ b/l10n/bundle.l10n.ko.json @@ -66,7 +66,7 @@ "Ignore": "무시", "Ignoring non-parseable lines in envFile {0}: {1}.": "envFile {0}: {1}에서 구문 분석할 수 없는 행을 무시합니다.", "Invalid project index": "잘못된 프로젝트 인덱스", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "razor.server.trace 설정이 잘못되었습니다. 기본값은 '{0}'입니다.", "Is this a Bug or Feature request?": "버그인가요, 기능 요청인가요?", "Logs": "로그", "Machine information": "컴퓨터 정보", diff --git a/l10n/bundle.l10n.pl.json b/l10n/bundle.l10n.pl.json index 4b2b2bff0..d1591f793 100644 --- a/l10n/bundle.l10n.pl.json +++ b/l10n/bundle.l10n.pl.json @@ -66,7 +66,7 @@ "Ignore": "Ignoruj", "Ignoring non-parseable lines in envFile {0}: {1}.": "Ignorowanie wierszy, których nie przeanalizowano w pliku envFile {0}: {1}.", "Invalid project index": "Nieprawidłowy indeks projektu", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Nieprawidłowe ustawienie razor.server.trace. Wartość domyślna to „{0}”", "Is this a Bug or Feature request?": "Czy jest to żądanie dotyczące usterki czy funkcji?", "Logs": "Dzienniki", "Machine information": "Informacje o maszynie", diff --git a/l10n/bundle.l10n.pt-br.json b/l10n/bundle.l10n.pt-br.json index 495189556..fea817118 100644 --- a/l10n/bundle.l10n.pt-br.json +++ b/l10n/bundle.l10n.pt-br.json @@ -66,7 +66,7 @@ "Ignore": "Ignorar", "Ignoring non-parseable lines in envFile {0}: {1}.": "Ignorando linhas não analisáveis no envFile {0}: {1}.", "Invalid project index": "Índice de projeto inválido", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Configuração razor.server.trace inválida. Definindo como padrão '{0}'", "Is this a Bug or Feature request?": "Isso é uma solicitação de bug ou recurso?", "Logs": "Logs", "Machine information": "Informações do computador", diff --git a/l10n/bundle.l10n.ru.json b/l10n/bundle.l10n.ru.json index 2c2ab34d3..009c396d9 100644 --- a/l10n/bundle.l10n.ru.json +++ b/l10n/bundle.l10n.ru.json @@ -66,7 +66,7 @@ "Ignore": "Игнорировать", "Ignoring non-parseable lines in envFile {0}: {1}.": "Пропускаются строки, не поддающиеся анализу, в envFile {0}: {1}", "Invalid project index": "Недопустимый индекс проекта", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Недопустимый параметр razor.server.trace. Применяется значение по умолчанию \"{0}\"", "Is this a Bug or Feature request?": "Это сообщение об ошибке или запрос новой возможности?", "Logs": "Журналы", "Machine information": "Сведения о компьютере", diff --git a/l10n/bundle.l10n.tr.json b/l10n/bundle.l10n.tr.json index 51c5375d1..dddbb3f87 100644 --- a/l10n/bundle.l10n.tr.json +++ b/l10n/bundle.l10n.tr.json @@ -66,7 +66,7 @@ "Ignore": "Yoksay", "Ignoring non-parseable lines in envFile {0}: {1}.": "envFile {0} dosyasındaki ayrıştırılamayan satırlar yok sayılıyor: {1}.", "Invalid project index": "Geçersiz proje dizini", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "Geçersiz razor.server.trace ayarı. Varsayılan '{0}' değerini alıyor", "Is this a Bug or Feature request?": "Bu bir Hata bildirimi mi Özellik isteği mi?", "Logs": "Günlükler", "Machine information": "Makine bilgileri", diff --git a/l10n/bundle.l10n.zh-cn.json b/l10n/bundle.l10n.zh-cn.json index 3173715a4..e376462a0 100644 --- a/l10n/bundle.l10n.zh-cn.json +++ b/l10n/bundle.l10n.zh-cn.json @@ -66,7 +66,7 @@ "Ignore": "忽略", "Ignoring non-parseable lines in envFile {0}: {1}.": "忽略 envFile {0} 中不可分析的行: {1}", "Invalid project index": "项目索引无效", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "razor.server.trace 设置无效。默认为“{0}”", "Is this a Bug or Feature request?": "这是 Bug 或功能请求吗?", "Logs": "日志", "Machine information": "计算机信息", diff --git a/l10n/bundle.l10n.zh-tw.json b/l10n/bundle.l10n.zh-tw.json index f82be1253..20261b6f7 100644 --- a/l10n/bundle.l10n.zh-tw.json +++ b/l10n/bundle.l10n.zh-tw.json @@ -66,7 +66,7 @@ "Ignore": "略過", "Ignoring non-parseable lines in envFile {0}: {1}.": "正在忽略 envFile {0} 中無法剖析的行: {1}。", "Invalid project index": "無效的專案索引", - "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'", + "Invalid razor.server.trace setting. Defaulting to '{0}'": "無效的 razor.server.trace 設定。正在預設為 '{0}'", "Is this a Bug or Feature request?": "這是 Bug 或功能要求嗎?", "Logs": "記錄", "Machine information": "電腦資訊", From 83f2476589e04d451b0d399f57a49ec33397036a Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 8 Jan 2024 16:40:49 -0800 Subject: [PATCH 27/29] Update Roslyn version to 4.10.0-1.24058.1 --- CHANGELOG.md | 8 +++++++- package.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6d2dedfd..ef41d47f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,19 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) ## Latest +* Update Roslyn to 4.10.0-1.24058.1 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) + * Fix error when a source generated file was present in find references or go to definition requests (PR: [#71395](https://github.com/dotnet/roslyn/pull/71395)) + * Remove usages of incorrectly licensed library (Microsoft.VisualStudio.LanguageServer.Protocol) for serialization of LSP json messages (PR: [#68990](https://github.com/dotnet/roslyn/pull/68990)) + * Add custom Roslyn serialization code for LSP json messages (PR: [#71141](https://github.com/dotnet/roslyn/pull/71141)) + * Use named executables for the language server process on Windows and Linux (PR: [#71007](https://github.com/dotnet/roslyn/pull/71007)) + * Add back LSP request telemetry in CLaSP queue (PR: [#71157](https://github.com/dotnet/roslyn/pull/71157)) * Update Razor to 7.0.0-preview.23627.2 (PR: [#6770](https://github.com/dotnet/vscode-csharp/pull/6770) * Fixed issue where Razor trace level was ignored. New `razor.server.trace` setting created that is not ignored (PR: [dotnet/razor#9745](https://github.com/dotnet/razor/pull/9745)) -* Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) * Update OmniSharp to 1.39.11 (PR: [#6771](https://github.com/dotnet/vscode-csharp/pull/6771)) * Fix loading AspNetCore projects by shipping the AspNetCore EA library * Update SDKs and dependencies ([omnisharp-roslyn/#2586](https://github.com/OmniSharp/omnisharp-roslyn/issues/2586), PR: [omnisharp-roslyn/#2588](https://github.com/OmniSharp/omnisharp-roslyn/pull/2588)) * Updated to latest dotnet-script 1.5.0 (PR: [omnisharp-roslyn/#2585](https://github.com/OmniSharp/omnisharp-roslyn/pull/2585)) + ## 2.14.8 * Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730)) * Fix description of debugger `console` setting (PR: [#6726](https://github.com/dotnet/vscode-csharp/pull/6726)) diff --git a/package.json b/package.json index 24f1040b3..d5c3793ba 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ } }, "defaults": { - "roslyn": "4.9.0-3.23611.3", + "roslyn": "4.10.0-1.24058.1", "omniSharp": "1.39.11", "razor": "7.0.0-preview.23627.2", "razorOmnisharp": "7.0.0-preview.23363.1", From e043d3e7fa4ca8938907167cb80b8f43eba94c33 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 8 Jan 2024 16:49:56 -0800 Subject: [PATCH 28/29] Update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef41d47f1..2bce9aa35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,18 +6,23 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) ## Latest -* Update Roslyn to 4.10.0-1.24058.1 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736)) +* Update Roslyn to 4.10.0-1.24058.1 (PR: [#6791](https://github.com/dotnet/vscode-csharp/pull/6791)) * Fix error when a source generated file was present in find references or go to definition requests (PR: [#71395](https://github.com/dotnet/roslyn/pull/71395)) * Remove usages of incorrectly licensed library (Microsoft.VisualStudio.LanguageServer.Protocol) for serialization of LSP json messages (PR: [#68990](https://github.com/dotnet/roslyn/pull/68990)) * Add custom Roslyn serialization code for LSP json messages (PR: [#71141](https://github.com/dotnet/roslyn/pull/71141)) * Use named executables for the language server process on Windows and Linux (PR: [#71007](https://github.com/dotnet/roslyn/pull/71007)) * Add back LSP request telemetry in CLaSP queue (PR: [#71157](https://github.com/dotnet/roslyn/pull/71157)) +* Fix command enablement by using specific activation contexts for O#, Roslyn standalone, and Roslyn devkit (PR: [#6782](https://github.com/dotnet/vscode-csharp/pull/6782)) * Update Razor to 7.0.0-preview.23627.2 (PR: [#6770](https://github.com/dotnet/vscode-csharp/pull/6770) * Fixed issue where Razor trace level was ignored. New `razor.server.trace` setting created that is not ignored (PR: [dotnet/razor#9745](https://github.com/dotnet/razor/pull/9745)) * Update OmniSharp to 1.39.11 (PR: [#6771](https://github.com/dotnet/vscode-csharp/pull/6771)) * Fix loading AspNetCore projects by shipping the AspNetCore EA library * Update SDKs and dependencies ([omnisharp-roslyn/#2586](https://github.com/OmniSharp/omnisharp-roslyn/issues/2586), PR: [omnisharp-roslyn/#2588](https://github.com/OmniSharp/omnisharp-roslyn/pull/2588)) * Updated to latest dotnet-script 1.5.0 (PR: [omnisharp-roslyn/#2585](https://github.com/OmniSharp/omnisharp-roslyn/pull/2585)) +* Update checkForDevCert aka.ms link (PR: [#6769](https://github.com/dotnet/vscode-csharp/pull/6769)) +* Support debug apps running under mono runtime using vsdbg (PR: [#6752](https://github.com/dotnet/vscode-csharp/pull/6752)) +* Update debugger to 2.9.1 (PR: [#6765](https://github.com/dotnet/vscode-csharp/pull/6765)) +* Remove check for projectPath for resolveDebugConfiguration (PR: [#6754](https://github.com/dotnet/vscode-csharp/pull/6754)) ## 2.14.8 * Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730)) From 9cc41f6d2535a5cb5533dc5ae8f3a10ade16e7b5 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Tue, 5 Dec 2023 12:09:21 -0800 Subject: [PATCH 29/29] Address restore feedback --- src/lsptoolshost/restore.ts | 4 ++-- src/lsptoolshost/roslynProtocol.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lsptoolshost/restore.ts b/src/lsptoolshost/restore.ts index 1aa32cdb0..5b7cabbf8 100644 --- a/src/lsptoolshost/restore.ts +++ b/src/lsptoolshost/restore.ts @@ -10,7 +10,7 @@ import { RestoreParams, RestorePartialResult, RestoreRequest, - ProjectHasUnresolvedDependenciesRequest, + ProjectNeedsRestoreRequest, } from './roslynProtocol'; import path = require('path'); @@ -32,7 +32,7 @@ export function registerRestoreCommands( }) ); - languageServer.registerOnRequest(ProjectHasUnresolvedDependenciesRequest.type, async (params) => { + languageServer.registerOnRequest(ProjectNeedsRestoreRequest.type, async (params) => { await restore(languageServer, restoreChannel, params.projectFilePaths, false); }); } diff --git a/src/lsptoolshost/roslynProtocol.ts b/src/lsptoolshost/roslynProtocol.ts index 70fba0a01..1f1e98cf3 100644 --- a/src/lsptoolshost/roslynProtocol.ts +++ b/src/lsptoolshost/roslynProtocol.ts @@ -163,7 +163,7 @@ export interface RestorePartialResult { message: string; } -export interface UnresolvedProjectDependenciesParams { +export interface ProjectNeedsRestoreName { /** * The set of projects that have unresolved dependencies and require a restore. */ @@ -268,8 +268,8 @@ export namespace RestorableProjects { export const type = new lsp.RequestType0(method); } -export namespace ProjectHasUnresolvedDependenciesRequest { - export const method = 'workspace/_roslyn_projectHasUnresolvedDependencies'; +export namespace ProjectNeedsRestoreRequest { + export const method = 'workspace/_roslyn_projectNeedsRestore'; export const messageDirection: lsp.MessageDirection = lsp.MessageDirection.serverToClient; - export const type = new lsp.RequestType(method); + export const type = new lsp.RequestType(method); }