Skip to content

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

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
merged 3 commits into from
Jul 9, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb5e86b
[VMR] Codeflow 9eec48b-9eec48b
dotnet-maestro[bot] Jul 9, 2025
ba5a7f3
Merge main into darc-main-1f889ce5-ce30-4176-88e0-521290fe03ae
dotnet-maestro[bot] Jul 9, 2025
4375ade
Update dependencies from https://github.com/dotnet/dotnet build 274568
dotnet-maestro[bot] Jul 9, 2025
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
5 changes: 3 additions & 2 deletions eng/Publishing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
</PropertyGroup>

<!-- Update Artifacts with Kind=Package to have additional metadata item Category="ToolingPackage".
Depending on channel configuration, this means that these assets could be pushed to a different feed. -->
<ItemGroup>
Depending on channel configuration, this means that these assets could be pushed to a different feed.
Do not include these for source-only builds since these files aren't intended to be published in that mode. -->
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<Artifact Update="@(Artifact->WithMetadataValue('Kind', 'Package'))" Category="ToolingPackage" />

<FilesToPublishToSymbolServer Include="$(ArtifactsBinDir)**/Microsoft.Build.Tasks.CodeAnalysis.pdb" />
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="roslyn" Sha="25bec1af21db71468c5c2c3a588dd54d0e058e9d" BarId="271417" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="f451e5d3036a4f140a989e0a7f3f1ae432420e71" BarId="274568" />
<ProductDependencies>
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
<Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">
Expand Down
8 changes: 4 additions & 4 deletions ...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<PublishDir Condition="'$(RuntimeIdentifier)' == ''">$(ArtifactsDir)/LanguageServer/$(Configuration)/$(TargetFramework)/neutral</PublishDir>

<!-- List of runtime identifiers that we want to publish an executable for. -->
<!-- When building a VMR vertical, we don't need to pack everything. Just pack the passed in TargetRid or BaseRid.
TargetRid and BaseRid are provided to roslyn via the build arguments passed in the VMR orchestrator's repo project.
<!-- When building a VMR vertical, we don't need to pack everything. Just pack the passed in TargetRid or PortableTargetRid.
TargetRid and PortableTargetRid are provided to roslyn via the build arguments passed in the VMR orchestrator's repo project.
https://github.com/dotnet/dotnet/blob/main/repo-projects/roslyn.proj. For definitions of the TargetRid
and other common properties, see https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/Unified-Build-Controls.md -->
<RuntimeIdentifiers Condition="'$(TargetRid)' != ''">$(TargetRid)</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(BaseRid)' != ''">$(BaseRid)</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(TargetRid)' == '' and '$(BaseRid)' == ''">win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(PortableTargetRid)' != ''">$(PortableTargetRid)</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(TargetRid)' == '' and '$(PortableTargetRid)' == ''">win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>

<!-- These indicate that the runtime/apphost packages should not be downloaded as part of build/restore -->
<EnableRuntimePackDownload>false</EnableRuntimePackDownload>
Expand Down