Skip to content
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

Jump to bottom

Skip libs native runtime packages build in source-index-stage job #85239

Merged
merged 2 commits into from
Apr 24, 2023
Merged

Skip libs native runtime packages build in source-index-stage job #85239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a1411a
Revert "Fix source-index-stage1 official build (#85215)"
ViktorHofer Apr 24, 2023
fb832cf
Skip libs native runtime packages in source-index-stage job
ViktorHofer Apr 24, 2023
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/pipelines/runtime-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ extends:
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
- template: /eng/common/templates/job/source-index-stage1.yml
parameters:
sourceIndexBuildCommand: build.cmd -subset libs.native+libs.sfx+libs.oob -binarylog -os linux -ci
sourceIndexBuildCommand: build.cmd -subset libs.sfx+libs.oob -binarylog -os linux -ci /p:SkipLibrariesNativeRuntimePackages=true

#
# Build CoreCLR
Expand Down
12 changes: 8 additions & 4 deletions src/libraries/oob-all.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
$(MSBuildThisFileDirectory)*\src\**\*.shproj;
shims\src\*.csproj" />

<!-- During an official build, build the identity package only in the allconfigurations build, otherwise always. -->
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj"
Condition="'$(SkipLibrariesNativeRuntimePackages)' != 'true' and
(
'$(BuildingAnOfficialBuildLeg)' != 'true' or
'$(BuildAllConfigurations)' == 'true'
)" />

<!-- Build these packages in the allconfigurations leg only. -->
<ProjectReference Remove="Microsoft.Internal.Runtime.AspNetCore.Transport\src\Microsoft.Internal.Runtime.AspNetCore.Transport.proj;
Microsoft.Internal.Runtime.WindowsDesktop.Transport\src\Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj"
Expand All @@ -21,10 +29,6 @@
<!-- Skip these projects during source-build as they rely on external prebuilts. -->
<ProjectReference Remove="Microsoft.Extensions.DependencyInjection.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj"
Condition="'$(DotNetBuildFromSource)' == 'true'" />

<!-- During an official build, build the identity package only in the allconfigurations build, otherwise always. -->
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj"
Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or '$(BuildAllConfigurations)' == 'true'" />
</ItemGroup>

</Project>
11 changes: 9 additions & 2 deletions src/libraries/oob-src.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,15 @@

<!-- 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.
The limitation on the CoreCLR runtime is entirely artificial but avoids duplicate assets being publish. -->
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.$(OutputRID).*.proj" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or
('$(BuildAllConfigurations)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)')" />
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.$(OutputRID).*.proj"
Condition="'$(SkipLibrariesNativeRuntimePackages)' != 'true' and
(
'$(BuildingAnOfficialBuildLeg)' != 'true' or
(
'$(BuildAllConfigurations)' != 'true' and
'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'
)
)" />

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