Skip to content

Commit b350d9d

Browse files
committed
Include include folder in runtime pack on all Mono platforms
Closes: dotnet#46461
1 parent e86511e commit b350d9d

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

eng/liveBuilds.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@
115115

116116
<FrameworkReleaseFiles Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoArtifactsPath)\Mono.release.framework\*.*" />
117117
<FrameworkDebugFiles Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoArtifactsPath)\Mono.debug.framework\*.*" />
118-
<MonoIncludeFiles Condition="'$(TargetsMobile)' == 'true'"
119-
Include="$(MonoArtifactsPath)\include\**\*.*" />
118+
<MonoIncludeFiles Include="$(MonoArtifactsPath)\include\**\*.*" />
120119
</ItemGroup>
121120

122121
<Error Condition="'@(RuntimeFiles)' == ''" Text="The '$(RuntimeFlavor)' subset must be built before building this project." />

src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<TargetPath>tools</TargetPath>
6767
</RuntimeFiles>
6868

69-
<RuntimeFiles Condition="'$(TargetsMobile)' == 'true'"
69+
<RuntimeFiles
7070
Include="@(MonoIncludeFiles)"
7171
ExcludeFromDataFiles="true">
7272
<TargetPath>runtimes/$(RuntimeIdentifier)/native/include/%(RecursiveDir)</TargetPath>

src/mono/mono.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,7 @@
918918
<Copy SourceFiles="@(_MonoIncludeArtifacts)"
919919
DestinationFiles="@(_MonoIncludeArtifacts->'$(RuntimeBinDir)include\%(RecursiveDir)%(Filename)%(Extension)')"
920920
SkipUnchangedFiles="true"
921-
Condition="'$(MonoGenerateOffsetsOSGroups)' == '' and ('$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true' or '$(TargetsBrowser)' == 'true')"/>
921+
Condition="'$(MonoGenerateOffsetsOSGroups)' == ''"/>
922922

923923
<Copy SourceFiles="@(_MonoRuntimeBuildArtifacts)"
924924
DestinationFiles="@(_MonoRuntimeBuildArtifacts->'$(RuntimeBinDir)build\%(RecursiveDir)%(Filename)%(Extension)')"

0 commit comments

Comments
 (0)