Skip to content

Commit 0db23bd

Browse files
authored
[automated] Merge branch 'main' => 'prerelease' (#8442)
2 parents 525f7b2 + 036eb23 commit 0db23bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+352
-180
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ out
1515
.razorDevKit/
1616
.razorExtension/
1717
.vscode-test/
18+
.roslynCopilot/
1819
msbuild/signing/signJs/*.log
1920
msbuild/signing/signVsix/*.log
2021
dist/

.vscode/launch.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,33 @@
9292
"preLaunchTask": "packageDev",
9393
"internalConsoleOptions": "openOnSessionStart"
9494
},
95+
{
96+
"name": "[Razor Cohost] Run Current File Integration Test",
97+
"type": "extensionHost",
98+
"request": "launch",
99+
"runtimeExecutable": "${execPath}",
100+
"args": [
101+
// Launch VSCode using a specific profile to ensure that user settings are not used.
102+
// This profile must be imported into vscode before running this launch configuration.
103+
// The profile can be found under /test/csharp-test-profile.
104+
"--profile",
105+
"csharp-test-profile",
106+
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace",
107+
"--extensionDevelopmentPath=${workspaceRoot}",
108+
"--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests",
109+
"--log",
110+
"ms-dotnettools.csharp:trace"
111+
],
112+
"env": {
113+
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
114+
"TEST_FILE_FILTER": "${file}"
115+
},
116+
"sourceMaps": true,
117+
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
118+
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
119+
"preLaunchTask": "packageDev",
120+
"internalConsoleOptions": "openOnSessionStart"
121+
},
95122
{
96123
"name": "[O#] Run Current File Integration Tests",
97124
"type": "extensionHost",
@@ -197,6 +224,15 @@
197224
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
198225
"args": ["test:integration:razor"],
199226
"cwd": "${workspaceFolder}"
227+
},
228+
{
229+
"type": "node",
230+
"request": "launch",
231+
"name": "Razor Cohost integration tests",
232+
"preLaunchTask": "build",
233+
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
234+
"args": ["test:integration:razor:cohost"],
235+
"cwd": "${workspaceFolder}"
200236
}
201237
],
202238
"inputs": [

CHANGELOG.md

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,34 @@
33
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

6+
# 2.87.x
7+
* Bump Roslyn to 5.0.0-2.25371.17 (PR: [#8436](https://github.com/dotnet/vscode-csharp/pull/8436))
8+
* Fix exception in additional file diagnostics (PR: [#79501](https://github.com/dotnet/roslyn/pull/79501))
9+
* Simplify stale project handling in hot reload(PR: [#79386](https://github.com/dotnet/roslyn/pull/79386))
10+
* Fix static extension method not showing up on enum type(PR: [#79454](https://github.com/dotnet/roslyn/pull/79454))
11+
* Update 'use auto property' to respect user options around `this.` for property access.(PR: [#79405](https://github.com/dotnet/roslyn/pull/79405))
12+
* Fix make-readonly with spans.(PR: [#79393](https://github.com/dotnet/roslyn/pull/79393))
13+
* Change how trailing trivia is preserved in use-auto-prop(PR: [#79425](https://github.com/dotnet/roslyn/pull/79425))
14+
* Special case a few well-known immutable types in use-auto-prop(PR: [#79422](https://github.com/dotnet/roslyn/pull/79422))
15+
* Preserve comments when switching to auto props(PR: [#79420](https://github.com/dotnet/roslyn/pull/79420))
16+
* Support interpolated string handlers in extension blocks(PR: [#78425](https://github.com/dotnet/roslyn/pull/78425))
17+
* Offer 'implement interface' when inside a type's body(PR: [#79382](https://github.com/dotnet/roslyn/pull/79382))
18+
* EnC support for project level changes(PR: [#79239](https://github.com/dotnet/roslyn/pull/79239))
19+
* Ensure generated types come after top level statements(PR: [#79378](https://github.com/dotnet/roslyn/pull/79378))
20+
* Allow user to still create a new field/prop when offering to initialize an existing prop(PR: [#79376](https://github.com/dotnet/roslyn/pull/79376))
21+
* Fix crash in replace property with methods(PR: [#79358](https://github.com/dotnet/roslyn/pull/79358))
22+
* Fix issue offering to remove nullable cast in a ternary expression(PR: [#79355](https://github.com/dotnet/roslyn/pull/79355))
23+
* Fix 'use var' with spans(PR: [#79348](https://github.com/dotnet/roslyn/pull/79348))
24+
* Fix not offering to remove unnecessary nullable pragmas(PR: [#79356](https://github.com/dotnet/roslyn/pull/79356))
25+
* Fix crash in use-null-prop fixer(PR: [#79340](https://github.com/dotnet/roslyn/pull/79340))
26+
* Update debugger to v2.86.0(PR: [#8424](https://github.com/dotnet/vscode-csharp/pull/8424))
27+
* Bump Razor to 10.0.0-preview.25368.1 (PR: [#8430](https://github.com/dotnet/vscode-csharp/pull/8430))
28+
* Fixing override completion in VSCode when LSP is enabled (PR: [#12039](https://github.com/dotnet/razor/pull/12039))
29+
* [Cohost] Fix rename and unskip test (PR: [#11952](https://github.com/dotnet/razor/pull/11952))
30+
* Ensure unique file paths for non-file Uris (PR: [#12037](https://github.com/dotnet/razor/pull/12037))
31+
* Fix completion of hyphenated items (PR: [#12035](https://github.com/dotnet/razor/pull/12035))
32+
* Allow completion items to add using directives (PR: [#12034](https://github.com/dotnet/razor/pull/12034))
33+
634
# 2.86.x
735
* Bump Roslyn to 5.0.0-1.25361.2 (PR: [#8416](https://github.com/dotnet/vscode-csharp/pull/8416))
836
* Fix issue with diagnostics when renaming a file (case change only) (PR: [#79298](https://github.com/dotnet/roslyn/pull/79298))
@@ -24,9 +52,24 @@
2452
* Merge 'extension operators' into 'main'(PR: [#79151](https://github.com/dotnet/roslyn/pull/79151))
2553
* Extensions: interceptors(PR: [#79010](https://github.com/dotnet/roslyn/pull/79010))
2654
* Small but trivial allocation improvement in FileWatchedReferenceFactory.StopWatchingReference(PR: [#79140](https://github.com/dotnet/roslyn/pull/79140))
27-
* Slight allocation reduction in CommandLineParser.FlattenArgs(PR: [#79139](https://github.com/dotnet/roslyn/pull/79139))
28-
* Fix promptForDevKitDebugConfigurations without CDK installed(PR: [#8390](https://github.com/dotnet/vscode-csharp/pull/8390))
29-
* Remove Razor ForceRuntimeCodeGeneration flag(PR: [#8398](https://github.com/dotnet/vscode-csharp/pull/8398))
55+
* Slight allocation reduction in CommandLineParser.FlattenArgs (PR: [#79139](https://github.com/dotnet/roslyn/pull/79139))
56+
* Fix promptForDevKitDebugConfigurations without CDK installed (PR: [#8390](https://github.com/dotnet/vscode-csharp/pull/8390))
57+
* Remove Razor ForceRuntimeCodeGeneration flag (PR: [#8398](https://github.com/dotnet/vscode-csharp/pull/8398))
58+
* Bump Razor to 10.0.0-preview.25329.6 (PR: [#8413](https://github.com/dotnet/vscode-csharp/pull/8413))
59+
* Use snippet InsertText in directive attributes to insert equals and quotes (PR: [#12010](https://github.com/dotnet/razor/pull/12010))
60+
* Fix edit mapping for Html documents (PR: [#12027](https://github.com/dotnet/razor/pull/12027))
61+
* Don't show HTML snippets in style, script, or html comment blocks (PR: [#12021](https://github.com/dotnet/razor/pull/12021))
62+
* Allow our VS Code extension to report telemetry (through Roslyn) (PR: [#12015](https://github.com/dotnet/razor/pull/12015))
63+
* Hard code ForceRuntimeCodeGeneration feature flag in all cases (PR: [#12007](https://github.com/dotnet/razor/pull/12007))
64+
* Report cohost status in initialize telemetry (PR: [#12001](https://github.com/dotnet/razor/pull/12001))
65+
* Implement "Extract to Foo.razor.css" code action (PR: [#11989](https://github.com/dotnet/razor/pull/11989))
66+
* Filter all html diagnostics out if they're reported in a comment (PR: [#12002](https://github.com/dotnet/razor/pull/12002))
67+
* Analyzer redirector (PR: [#11972](https://github.com/dotnet/razor/pull/11972))
68+
* Partial fix for https://github.com/dotnet/vscode-csharp/issues/7678 (PR: [#11681](https://github.com/dotnet/razor/pull/11681))
69+
* Simplify tag to self-closing code action (PR: [#11802](https://github.com/dotnet/razor/pull/11802))
70+
* Bind directive attribute `event` parameter HTML event completions (PR: [#11804](https://github.com/dotnet/razor/pull/11804))
71+
* Allow Razor completion items on deletion (PR: [#11991](https://github.com/dotnet/razor/pull/11991))
72+
3073

3174
# 2.85.x
3275
* Bump Roslyn to 5.0.0-1.25326.2 (PR: [#8386](https://github.com/dotnet/vscode-csharp/pull/8386))

azure-pipelines/test-matrix.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
RazorTests:
2929
npmCommand: test:integration:razor
3030
isIntegration: true
31+
RazorCohostTests:
32+
npmCommand: test:integration:razor:cohost
33+
isIntegration: true
3134
pool: ${{ parameters.pool }}
3235
${{ if parameters.containerName }}:
3336
container: ${{ parameters.containerName }}

l10n/bundle.l10n.pl.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"'{0}' was not set in the debug configuration.": "Element „{0}” nie został ustawiony w konfiguracji debugowania.",
66
".NET NuGet Restore": "Przywracanie menedżera NuGet platformy .NET",
77
".NET Test Log": "Dziennik testów platformy .NET",
8-
".NET: Generate Assets for Build and Debug": ".NET: Generate Assets for Build and Debug",
8+
".NET: Generate Assets for Build and Debug": ".NET: Generuj zasoby na potrzeby kompilacji i debugowania",
99
"1 reference": "1 odwołanie",
1010
"A valid dotnet installation could not be found: {0}": "Nie można odnaleźć prawidłowej instalacji dotnet: {0}",
1111
"Active File Context": "Kontekst aktywnego pliku",
@@ -99,7 +99,7 @@
9999
"More Information": "Więcej informacji",
100100
"Name not defined in current configuration.": "Nazwa nie jest zdefiniowana w bieżącej konfiguracji.",
101101
"Nested Code Action": "Akcja kodu zagnieżdżonego",
102-
"No": "No",
102+
"No": "Nie",
103103
"No executable projects": "Brak projektów wykonywalnych",
104104
"No launchable target found for '{0}'": "Nie znaleziono elementu docelowego możliwego do uruchomienia w przypadku „{0}”",
105105
"No launchable target found.": "Nie znaleziono elementu docelowego możliwego do uruchomienia.",
@@ -172,7 +172,7 @@
172172
"Synchronization timed out": "Przekroczono limit czasu synchronizacji",
173173
"Test run already in progress": "Przebieg testu jest już w toku",
174174
"Text editor must be focused to fix all issues": "Edytor tekstu musi mieć fokus, aby rozwiązać wszystkie problemy",
175-
"The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?": "The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?",
175+
"The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?": "Polecenie „{0}” nie jest zalecane do użycia podczas instalowania rozszerzenia zestawu deweloperskiego języka C#. Czy zamiast tego chcesz kompilować i debugować przy użyciu konfiguracji dynamicznej?",
176176
"The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "Nie można zlokalizować zestawu .NET Core SDK: {0}. Debugowanie platformy .NET Core nie zostanie włączone. Upewnij się, że zestaw .NET Core SDK jest zainstalowany i znajduje się w ścieżce.",
177177
"The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "Zestaw .NET Core SDK znajdujący się w ścieżce jest za stary. Debugowanie platformy .NET Core nie zostanie włączone. Minimalna obsługiwana wersja to {0}.",
178178
"The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "Rozszerzenie języka C# dla edytora Visual Studio Code jest niezgodne w przypadku {0} {1}z rozszerzeniami zdalnymi edytora VS Code. Aby zobaczyć dostępne obejścia, kliknij pozycję „{2}”.",

0 commit comments

Comments
 (0)