Skip to content

Commit 701cb07

Browse files
[main] Source code updates from dotnet/dotnet (#79313)
* [VMR] Codeflow 9eec48b-9eec48b [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 274568 No dependency updates to commit --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 7ef7c59 commit 701cb07

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

eng/Publishing.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
</PropertyGroup>
66

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

1213
<FilesToPublishToSymbolServer Include="$(ArtifactsBinDir)**/Microsoft.Build.Tasks.CodeAnalysis.pdb" />

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="25bec1af21db71468c5c2c3a588dd54d0e058e9d" BarId="271417" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="f451e5d3036a4f140a989e0a7f3f1ae432420e71" BarId="274568" />
44
<ProductDependencies>
55
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
66
<Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">

src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
<PublishDir Condition="'$(RuntimeIdentifier)' == ''">$(ArtifactsDir)/LanguageServer/$(Configuration)/$(TargetFramework)/neutral</PublishDir>
4646

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

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

0 commit comments

Comments
 (0)