Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions eng/Subsets.props
Original file line number Diff line number Diff line change
Expand Up @@ -752,10 +752,10 @@
</ItemGroup>
<ItemGroup>
<!--
When we're building in the VMR, we need to provide a crossgen2 that runs on the host machine for downstream repos to use to R2R their code.
In non-VMR builds, downstream repos can use the crossgen2 built for the target host SDK from another build leg, but in the VMR we need to provide one to use.
When BuildHostTools is enabled, we need to provide a crossgen2 that runs on the host machine for downstream repos to use to R2R their code.
Non-VMR builds normally use the crossgen2 built for the target host SDK from another build leg, but builds without one can opt in.
-->
<ProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and '$(TargetsMobile)' != 'true' and '$(TargetsLinuxBionic)' != 'true' and '$(BuildHostTools)' == 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.Host.sfxproj" Category="packs" />
<ProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and ('$(TargetsMobile)' != 'true' or '$(TargetOS)' == 'browser') and '$(TargetsLinuxBionic)' != 'true' and '$(BuildHostTools)' == 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.Host.sfxproj" Category="packs" />
</ItemGroup>
<ItemGroup>
<SharedFrameworkProjectToBuild Condition="'$(_BuildHostPack)' == 'true'" Include="$(InstallerProjectRoot)pkg\archives\dotnet-nethost.proj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
platforms:
- browser_wasm
jobParameters:
buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:BuildHostTools=true
nameSuffix: wasm_coreclr
isOfficialBuild: false
postBuildSteps:
Expand All @@ -41,4 +41,5 @@ jobs:
artifactName: BrowserWasmCoreCLR
sdkDirName: dotnet-none
includeRefPack: false
includeCrossgen2Pack: true
publishCoreClrRuntimePack: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
runtimeFlavor: 'mono'
sdkDirName: 'dotnet-latest'
includeRefPack: true
includeCrossgen2Pack: false
# The Mono (default) build installs the wasm-tools workload, whose manifest now includes the
# CoreCLR browser-wasm runtime pack (Microsoft.NETCore.App.Runtime.browser-wasm). A Mono-only
# build doesn't produce that pack, so download it from the CoreCLR build job and stage it into
Expand Down Expand Up @@ -51,6 +52,15 @@ steps:
- script: cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.ref $(Build.SourcesDirectory)/artifacts/staging
displayName: "Stage ref pack directory"

- ${{ if eq(parameters.includeCrossgen2Pack, true) }}:
- script: >-
find $(Build.SourcesDirectory)/artifacts/packages/${{ parameters.configForBuild }}/Shipping -maxdepth 1
-name 'Microsoft.NETCore.App.Crossgen2.*.nupkg' -not -name '*.symbols.nupkg'
-exec cp {} $(Build.SourcesDirectory)/artifacts/staging/built-nugets \; &&
test -n "$(find $(Build.SourcesDirectory)/artifacts/staging/built-nugets -maxdepth 1
-name 'Microsoft.NETCore.App.Crossgen2.*.nupkg' -not -name '*.symbols.nupkg' -print -quit)"
displayName: "Stage Crossgen2 pack"

# Publish the CoreCLR browser-wasm runtime pack nuget on its own so the Mono build job can stage
# it into its local feed for the wasm-tools workload install.
- ${{ if eq(parameters.publishCoreClrRuntimePack, true) }}:
Expand Down
Loading