Skip to content

Commit 9343b2f

Browse files
authored
Fix duplicated assets in official build (#89188)
The additional osx-x64 and osx-arm64 legs added for NativeAOT in #89018 caused the `runtime.osx-*.Microsoft.DotNet.ILCompiler` and runtime.osx-*.runtime.native.System.IO.Ports` packages to be duplicated. This change makes sure we only publish them from one leg (the CoreCLR one).
1 parent 7036cba commit 9343b2f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

eng/pipelines/runtime-official.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ extends:
117117
- linux_bionic_arm64
118118
- linux_bionic_x64
119119
jobParameters:
120-
buildArgs: -s clr.nativeaotlibs+clr.nativeaotruntime+libs+packs -c $(_BuildConfig) /p:BuildNativeAOTRuntimePack=true
120+
buildArgs: -s clr.nativeaotlibs+clr.nativeaotruntime+libs+packs -c $(_BuildConfig) /p:BuildNativeAOTRuntimePack=true /p:SkipLibrariesNativeRuntimePackages=true
121121
nameSuffix: AllSubsets_NativeAOT
122122
isOfficialBuild: ${{ variables.isOfficialBuild }}
123123
extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml

src/installer/pkg/projects/nativeaot-packages.proj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />
33

4-
<ItemGroup>
4+
<ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true'">
55
<Project Include="Microsoft.DotNet.ILCompiler\Microsoft.DotNet.ILCompiler.pkgproj" />
6-
<ProjectReference Condition="'$(BuildNativeAOTRuntimePack)' != 'true'" Include="@(Project)" />
6+
<ProjectReference Include="@(Project)" />
77
<ProjectReference Include="@(Project)" AdditionalProperties="PackageTargetRuntime=$(OutputRID)" />
88
</ItemGroup>
99

0 commit comments

Comments
 (0)