diff options
author | Jo Shields <directhex@apebox.org> | 2021-07-08 22:29:30 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-08 22:29:30 +0300 |
commit | d841f5e17897be5ef6aef5031b8a03ed3d8fd8dd (patch) | |
tree | 6a43274bc74503a425fa14e804b0347d4d94a118 /eng | |
parent | ab64ce5f71479549222c99da3a15fd56f8328fe4 (diff) |
Ship a .framework version of Mono (#53370)
Additionally ship Mono on iOS/tvOS/MacCatalyst as a .framework bundle
Fixes #42846
Diffstat (limited to 'eng')
-rw-r--r-- | eng/liveBuilds.targets | 2 | ||||
-rw-r--r-- | eng/pipelines/common/global-build-job.yml | 8 | ||||
-rw-r--r-- | eng/pipelines/mono/templates/build-job.yml | 12 | ||||
-rw-r--r-- | eng/pipelines/runtime-staging.yml | 2 |
4 files changed, 21 insertions, 3 deletions
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 01a0c6aac67..fb05c25a395 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -109,6 +109,8 @@ <IsNative>true</IsNative> </RuntimeFiles> + <FrameworkReleaseFiles Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoArtifactsPath)\Mono.release.framework\*.*" /> + <FrameworkDebugFiles Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoArtifactsPath)\Mono.debug.framework\*.*" /> <MonoIncludeFiles Condition="'$(TargetsMobile)' == 'true'" Include="$(MonoArtifactsPath)\include\**\*.*" /> </ItemGroup> diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 96c116eb872..84f1786bd21 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -83,6 +83,12 @@ jobs: ${{ if ne(parameters.isOfficialBuild, true) }}: value: '' + - name: _buildDarwinFrameworksParameter + ${{ if in(parameters.osGroup, 'iOS', 'tvOS', 'MacCatalyst')}}: + value: /p:BuildDarwinFrameworks=true + ${{ if notin(parameters.osGroup, 'iOS', 'tvOS', 'MacCatalyst')}}: + value: '' + - name: _richCodeNavigationParam ${{ if eq(parameters.enableRichCodeNavigation, true) }}: value: /p:EnableRichCodeNavigation=true @@ -134,7 +140,7 @@ jobs: displayName: Install native dependencies # Build - - script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) + - script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter) displayName: Build product ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}: continueOnError: ${{ parameters.shouldContinueOnError }} diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index ef9af237168..bdb15a09a66 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -63,6 +63,8 @@ jobs: value: '' - name: msCorDbi value: '+mono.mscordbi' + - name: darwinFrameworks + value: '' - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - name: officialBuildIdArg value: '/p:officialBuildId=$(Build.BuildNumber)' @@ -76,15 +78,23 @@ jobs: - ${{ if eq(parameters.osGroup, 'tvOS') }}: - name: osOverride value: -os tvOS + - name: darwinFrameworks + value: /p:BuildDarwinFrameworks=true - ${{ if eq(parameters.osGroup, 'tvOSSimulator') }}: - name: osOverride value: -os tvOSSimulator + - name: darwinFrameworks + value: /p:BuildDarwinFrameworks=true - ${{ if eq(parameters.osGroup, 'iOS') }}: - name: osOverride value: -os iOS + - name: darwinFrameworks + value: /p:BuildDarwinFrameworks=true - ${{ if eq(parameters.osGroup, 'iOSSimulator') }}: - name: osOverride value: -os iOSSimulator + - name: darwinFrameworks + value: /p:BuildDarwinFrameworks=true - ${{ if eq(parameters.osGroup, 'Android') }}: - name: osOverride value: -os Android @@ -136,7 +146,7 @@ jobs: # Build - ${{ if ne(parameters.osGroup, 'windows') }}: - - script: ./build$(scriptExt) -subset mono$(msCorDbi) -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) + - script: ./build$(scriptExt) -subset mono$(msCorDbi) -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) $(darwinFrameworks) displayName: Build product - ${{ if eq(parameters.osGroup, 'windows') }}: - script: build$(scriptExt) -subset mono$(msCorDbi) -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 666641354bf..f58caca2899 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -119,7 +119,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunAOTCompilation=true /p:MonoForceInterpreter=true + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildDarwinFrameworks=true timeoutInMinutes: 180 condition: >- or( |