diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index 84f1786bd2171..7db10e91e68b3 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -119,6 +119,13 @@ jobs:
inputs:
artifact: Mono_Offsets_${{monoCrossAOTTargetOS}}
path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles'
+
+ - ${{ if eq(parameters.buildingOnSourceBuildImage, true) }}:
+ - template: /eng/common/templates/steps/source-build.yml
+ parameters:
+ platform:
+ buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
+ nonPortable: true
- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}:
- script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO
@@ -140,10 +147,11 @@ jobs:
displayName: Install native dependencies
# Build
- - 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 }}
+ - ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}:
+ - 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 }}
- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}:
- script: |
diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml
index 289f7d0033e9c..420ba301ad12e 100644
--- a/eng/pipelines/global-build.yml
+++ b/eng/pipelines/global-build.yml
@@ -133,5 +133,4 @@ jobs:
- SourceBuild_Linux_x64
jobParameters:
nameSuffix: SourceBuild
- buildArgs: -subset clr+libs+host+packs /p:DotNetBuildFromSource=true --portableBuild false
timeoutInMinutes: 90
diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index d2bf43486924a..718ee61b34ac7 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -320,6 +320,19 @@ stages:
isOfficialAllConfigurations: true
liveRuntimeBuildConfig: release
+ #
+ # Build Sourcebuild leg
+ #
+ - template: /eng/pipelines/common/platform-matrix.yml
+ parameters:
+ jobTemplate: /eng/pipelines/common/global-build-job.yml
+ buildConfig: Release
+ helixQueueGroup: ci
+ platforms:
+ - SourceBuild_Linux_x64
+ jobParameters:
+ nameSuffix: SourceBuild
+
#
# Installer Build
#
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
index 19c48f2ec850c..15d09343b0503 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
@@ -60,6 +60,7 @@
true
10.0.19041.1
14.28.29715.1
+ 1.8.0.0
@@ -161,7 +162,7 @@
-
+
diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
index 50733c31fe058..b8a6013e42048 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -101,7 +101,8 @@
+ GeneratePathProperty="true"
+ Condition="'$(DotNetBuildFromSource)' != 'true'" />
@@ -129,7 +130,7 @@
+ ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86') and '$(DotNetBuildFromSource)' != 'true'">