diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 003ac28af6fc3..6991ef37d9f4f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -148,6 +148,8 @@ jobs:
configuration: Debug
testArguments: --testCoreClr --helixQueueName OSX.1014.Amd64.Open
+- template: eng/common/templates/jobs/source-build.yml
+
# Build Correctness Jobs
- job: Correctness_Determinism
@@ -198,30 +200,6 @@ jobs:
publishLocation: Container
condition: succeeded()
-- job: Correctness_SourceBuild
- pool:
- name: NetCorePublic-Pool
- queue: BuildPool.Ubuntu.1604.amd64.Open
- timeoutInMinutes: 90
- steps:
- - template: eng/pipelines/checkout-unix-task.yml
-
- - script: ./eng/cibuild.sh --configuration Debug --prepareMachine --binaryLog --sourceBuild
- displayName: Build
-
- - template: eng/pipelines/publish-logs.yml
- parameters:
- jobName: Correctness_SourceBuild
- configuration: Release
- - task: PublishBuildArtifacts@1
- displayName: Publish Logs
- inputs:
- PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/Debug'
- ArtifactName: 'SourceBuild_Test'
- publishLocation: Container
- continueOnError: true
- condition: not(succeeded())
-
- job: Correctness_Rebuild
pool:
name: NetCorePublic-Pool
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 56440adf5b831..1c75a28d358f9 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -20,4 +20,14 @@
Condition="'@(SourceBuildPatchFile)' != ''" />
+
+
+
+ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Compilers.sln"
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 353d58bb198d3..e022e12b53836 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,11 +1,6 @@
-
- https://github.com/dotnet/source-build
- c06ae1212bd69e9fe52bed0b0a7d79cc8ea39054
-
-
https://github.com/dotnet/xliff-tasks
7e80445ee82adbf9a8e6ae601ac5e239d982afaa
diff --git a/eng/build.sh b/eng/build.sh
index 322aad8047184..864b0dd3e9b61 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -229,6 +229,9 @@ function MakeBootstrapBuild {
}
function BuildSolution {
+ local solution="Compilers.sln"
+ echo "$solution:"
+
InitializeToolset
local toolset_build_proj=$_InitializeToolset
@@ -238,6 +241,8 @@ function BuildSolution {
export RoslynCommandLineLogFile="$log_dir/vbcscompiler.log"
fi
+ local projects="$repo_root/$solution"
+
UNAME="$(uname)"
# NuGet often exceeds the limit of open files on Mac and Linux
# https://github.com/NuGet/Home/issues/2163
@@ -288,6 +293,7 @@ function BuildSolution {
MSBuild $toolset_build_proj \
$bl \
/p:Configuration=$configuration \
+ /p:Projects="$projects" \
/p:RepoRoot="$repo_root" \
/p:Restore=$restore \
/p:Build=$build \