Skip to content

[main] Source code updates from dotnet/dotnet #20135

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
T-Gro merged 10 commits into from
Aug 5, 2026
Merged

[main] Source code updates from dotnet/dotnet #20135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
697a1fc
Backflow from https://github.com/dotnet/dotnet / 322f500 build 325363
dotnet-maestro[bot] Aug 4, 2026
8485fe8
Update dependencies from build 325363
dotnet-maestro[bot] Aug 4, 2026
e7ccfa6
Remove duplicate System.Security.Cryptography.Xml PackageReference (f…
Copilot Aug 4, 2026
8bad312
Merge remote-tracking branch 'origin/main' into darc-main-3b2c11a2-af…
invalid-email-address Aug 4, 2026
65d91b1
Pin transitive MessagePack in CLaSP Proxy project (fix NU1902/NU1903)
Copilot Aug 4, 2026
a135602
Merge 'Implement direct delegates (#19993)' into darc-main branch
invalid-email-address Aug 4, 2026
575ff10
Fix duplicate PackageReference in CLaSP Proxy under CPM (NU1504/NU1008)
invalid-email-address Aug 4, 2026
b537a45
Restore pull-requests: write for release-notes check comment step
invalid-email-address Aug 4, 2026
2c10ea7
Merge remote-tracking branch 'origin/main' into darc-main-3b2c11a2-af…
invalid-email-address Aug 4, 2026
dac2389
Update dependencies from build 325626
dotnet-maestro[bot] Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ function Process-Arguments() {
}

foreach ($property in $properties) {
if (!$property.StartsWith("/p:", "InvariantCultureIgnoreCase")) {
if (!$property.StartsWith("/p:", "InvariantCultureIgnoreCase") -and !$property.StartsWith("/clp:", "InvariantCultureIgnoreCase")) {
Write-Host "Invalid argument: $property"
Print-Usage
exit 1
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ This file should be imported by eng/Versions.props
<MicrosoftCodeAnalysisCSharpPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion>5.10.0-1.26365.3</MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.10.0-1.26365.3</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion>5.10.0-1.26365.3</MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion>
<!-- dotnet-runtime dependencies -->
<SystemCollectionsImmutablePackageVersion>10.0.8</SystemCollectionsImmutablePackageVersion>
<SystemCompositionPackageVersion>10.0.8</SystemCompositionPackageVersion>
Expand Down Expand Up @@ -55,9 +55,9 @@ This file should be imported by eng/Versions.props
<MicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(MicrosoftCodeAnalysisEditorFeaturesPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
<MicrosoftVisualStudioLanguageServicesExternalAccessVersion>$(MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion)</MicrosoftVisualStudioLanguageServicesExternalAccessVersion>
<MicrosoftCodeAnalysisFeaturesVersion>$(MicrosoftCodeAnalysisFeaturesPackageVersion)</MicrosoftCodeAnalysisFeaturesVersion>
<MicrosoftVisualStudioLanguageServicesVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</MicrosoftVisualStudioLanguageServicesVersion>
<MicrosoftVisualStudioLanguageServicesExternalAccessVersion>$(MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion)</MicrosoftVisualStudioLanguageServicesExternalAccessVersion>
<!-- dotnet-runtime dependencies -->
<SystemCollectionsImmutableVersion>$(SystemCollectionsImmutablePackageVersion)</SystemCollectionsImmutableVersion>
<SystemCompositionVersion>$(SystemCompositionPackageVersion)</SystemCompositionVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="cb8306a63c5cf24e9381108a3a9eb58907fd0f60" BarId="323048" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="aedf05ae4b6c7f74f789e64a0a8d9d169414f04f" BarId="325626" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.10.0-preview-26357-08">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<PropertyGroup>
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
<FSharpPreReleaseIteration>7</FSharpPreReleaseIteration>
<PreReleaseVersionLabel>preview$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
<FSharpPreReleaseIteration>1</FSharpPreReleaseIteration>
<PreReleaseVersionLabel>rc$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
<!-- F# Version components -->
<FSMajorVersion>11</FSMajorVersion>
<FSMinorVersion>0</FSMinorVersion>
Expand Down
3 changes: 3 additions & 0 deletions eng/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ while [[ $# > 0 ]]; do
/p:*)
properties+=("$1")
;;
/clp:*)
properties+=("$1")
;;
*)
echo "Invalid argument: $1"
usage
Expand Down
2 changes: 2 additions & 0 deletions ...verProtocol.Framework.Proxy/Microsoft.CommonLanguageServerProtocol.Framework.Proxy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.CommonLanguageServerProtocol.Framework" PrivateAssets="all" />
<!-- Pin the transitive MessagePack (via Microsoft.CommonLanguageServerProtocol.Framework) to a patched version. Older versions (< 2.5.301) have known vulnerabilities (NU1902/NU1903). -->
<PackageReference Include="MessagePack" PrivateAssets="all" />
<!-- Pinned below the central version to match the LSP framework's VS 17.x baseline. -->
<PackageReference Include="Microsoft.VisualStudio.Threading" VersionOverride="17.12.21" />
</ItemGroup>
Expand Down
Loading