Skip to content

Commit 95baa95

Browse files
authored
Merge pull request #7120 from dotnet/main
Merge main to prerelease
2 parents f5667e0 + c6f2948 commit 95baa95

33 files changed

+654
-189
lines changed

.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ pipelines:
1010
lastModifiedDate: 2024-03-18
1111
armory:
1212
lastModifiedDate: 2024-03-18
13+
psscriptanalyzer:
14+
lastModifiedDate: 2024-04-19
1315
binary:
1416
credscan:
1517
lastModifiedDate: 2024-03-18
1618
binskim:
1719
lastModifiedDate: 2024-03-18
20+
spotbugs:
21+
lastModifiedDate: 2024-04-19
1822
1264:
1923
retail:
2024
source:

.config/guardian/.gdnbaselines

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
],
2222
"tool": "credscan",
2323
"ruleId": "CSCAN-GENERAL0020",
24-
"createdDate": "2024-03-27 17:49:11Z",
25-
"expirationDate": "2024-09-13 17:51:28Z",
26-
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-27 17:51:28Z"
24+
"createdDate": "2024-04-19 18:19:20Z",
25+
"expirationDate": "2024-10-06 18:25:02Z",
26+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-19 18:25:02Z"
2727
}
2828
}
2929
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ node_modules
44
out
55
.roslyn/
66
.roslynDevKit/
7+
.xamlTools/
78
.omnisharp/
89
.omnisharp-*/
910
.vs/

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
# Latest
7+
* XAML IntelliSense for .NET MAUI (Issue: [#565](https://github.com/microsoft/vscode-dotnettools/issues/565))
8+
* Controlled by preview feature flag `dotnet.enableXamlToolsPreview` which is on by default
9+
* Requires C# Dev Kit and .NET MAUI extensions
10+
* Update Roslyn to 4.11.0-2.24259.4 (PR: [#7117](https://github.com/dotnet/vscode-csharp/pull/7117))
11+
* Shrink the size and remove unnecessary dependencies in the build host (PR: [#73393](https://github.com/dotnet/roslyn/pull/73393))
12+
* Make fix-all code action more parallel (PR: [#73356](https://github.com/dotnet/roslyn/pull/73356))
13+
* Allow use of more Hot Reload brokered services by LSP (for VS Code) (PR: [#73240](https://github.com/dotnet/roslyn/pull/73240))
14+
* Improve parallel processing in FAR (PR: [#73253](https://github.com/dotnet/roslyn/pull/73253))
15+
* Improve parallel processing in NavTo (PR: [#73249](https://github.com/dotnet/roslyn/pull/73249))
16+
* Add temporary option, `dotnet.server.suppressLspErrorToasts` to allow suppression of recoverable LSP error toasts (PR: [#7106](https://github.com/dotnet/vscode-csharp/pull/7106))
17+
* Update Debugger to v2.30.0 (PR: [#7101](https://github.com/dotnet/vscode-csharp/pull/7101))
18+
* Adds support for disabling implict evaluation of properties and functions (Issue: [#3173](https://github.com/dotnet/vscode-csharp/pull/3173))
19+
* Don't download razor telemetry if disabled by vscode (PR: [#7092](https://github.com/dotnet/vscode-csharp/pull/7092))
20+
21+
# 2.29.11
722
* List solution filter files (.slnf) in the 'Open Solution' command. (PR: [#7082](https://github.com/dotnet/vscode-csharp/pull/7082))
823
* No longer activate on the presence of .sln or .slnf files (PR: [#7081](https://github.com/dotnet/vscode-csharp/pull/7081))
924
* Update Debugger Packages to v2.28.1 (PR: [#7072](https://github.com/dotnet/vscode-csharp/pull/7072))

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ To package this extension, we need to create VSIX Packages. The VSIX packages ca
146146

147147
## Updating the `Roslyn` Language Server Version
148148

149+
In order to pull in new packages from upstreams into the msft_consumption feed we use for restoring, you will need to be a member of the 'CSharp VS Code Extension contributors' group in the [Azure Devops instance](https://dev.azure.com/azure-public/vside/_settings/teams).
150+
149151
To update the version of the roslyn server used by the extension do the following:
150152
1. Find the the Roslyn signed build you want from [here](https://dnceng.visualstudio.com/internal/_build?definitionId=327&_a=summary). Typically the latest successful build of main is fine.
151153
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.

0 commit comments

Comments
 (0)