Skip to content

Commit fb832cf

Browse files
committed
Skip libs native runtime packages in source-index-stage job
Fixes official build regression introduced in 21fb96b
1 parent 9a1411a commit fb832cf

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

eng/pipelines/runtime-official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ extends:
5151
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
5252
- template: /eng/common/templates/job/source-index-stage1.yml
5353
parameters:
54-
sourceIndexBuildCommand: build.cmd -subset libs.sfx+libs.oob -binarylog -os linux -ci
54+
sourceIndexBuildCommand: build.cmd -subset libs.sfx+libs.oob -binarylog -os linux -ci /p:SkipLibrariesNativeRuntimePackages=true
5555

5656
#
5757
# Build CoreCLR

src/libraries/oob-all.proj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
$(MSBuildThisFileDirectory)*\src\**\*.shproj;
1414
shims\src\*.csproj" />
1515

16+
<!-- During an official build, build the identity package only in the allconfigurations build, otherwise always. -->
17+
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj"
18+
Condition="'$(SkipLibrariesNativeRuntimePackages)' != 'true' and
19+
(
20+
'$(BuildingAnOfficialBuildLeg)' != 'true' or
21+
'$(BuildAllConfigurations)' == 'true'
22+
)" />
23+
1624
<!-- Build these packages in the allconfigurations leg only. -->
1725
<ProjectReference Remove="Microsoft.Internal.Runtime.AspNetCore.Transport\src\Microsoft.Internal.Runtime.AspNetCore.Transport.proj;
1826
Microsoft.Internal.Runtime.WindowsDesktop.Transport\src\Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj"
@@ -21,10 +29,6 @@
2129
<!-- Skip these projects during source-build as they rely on external prebuilts. -->
2230
<ProjectReference Remove="Microsoft.Extensions.DependencyInjection.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj"
2331
Condition="'$(DotNetBuildFromSource)' == 'true'" />
24-
25-
<!-- During an official build, build the identity package only in the allconfigurations build, otherwise always. -->
26-
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj"
27-
Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or '$(BuildAllConfigurations)' == 'true'" />
2832
</ItemGroup>
2933

3034
</Project>

src/libraries/oob-src.proj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@
1717

1818
<!-- During an official Build, build the rid specific package matching the OutputRID only outside of an allconfigurations build and only when targeting the CoreCLR runtime.
1919
The limitation on the CoreCLR runtime is entirely artificial but avoids duplicate assets being publish. -->
20-
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.$(OutputRID).*.proj" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or
21-
('$(BuildAllConfigurations)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)')" />
20+
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.$(OutputRID).*.proj"
21+
Condition="'$(SkipLibrariesNativeRuntimePackages)' != 'true' and
22+
(
23+
'$(BuildingAnOfficialBuildLeg)' != 'true' or
24+
(
25+
'$(BuildAllConfigurations)' != 'true' and
26+
'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'
27+
)
28+
)" />
2229

2330
<!-- Don't build task and tools project in the NetCoreAppCurrent vertical. -->
2431
<ProjectReference Remove="Microsoft.XmlSerializer.Generator\src\Microsoft.XmlSerializer.Generator.csproj" />

0 commit comments

Comments
 (0)