From 6b3a3050c70577bd1b3fd7611eef56679e22a4f1 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 24 Feb 2021 06:19:32 -0500 Subject: [PATCH] Enable source-build through arcade (#1823) Co-authored-by: Marek Safar --- LICENSE => LICENSE.txt | 0 build.cmd | 2 +- build.sh | 2 +- eng/Build.props | 17 +++++++++++++++++ eng/SourceBuild.props | 8 ++++++++ eng/SourceBuildPrebuiltBaseline.xml | 5 +++++ eng/Version.Details.xml | 5 +++++ eng/azure-pipelines.yml | 16 ++++++++++++++++ 8 files changed, 53 insertions(+), 2 deletions(-) rename LICENSE => LICENSE.txt (100%) create mode 100644 eng/Build.props create mode 100644 eng/SourceBuild.props create mode 100644 eng/SourceBuildPrebuiltBaseline.xml diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/build.cmd b/build.cmd index e21182c8ad77..675fdf83f6a0 100644 --- a/build.cmd +++ b/build.cmd @@ -1,2 +1,2 @@ @echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -projects """%~dp0illink.sln""" -restore -build %*" +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*" diff --git a/build.sh b/build.sh index 228566129d25..8477d5af8817 100755 --- a/build.sh +++ b/build.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -"$scriptroot/eng/common/build.sh" --projects "$scriptroot/illink.sln" --build --restore $@ +"$scriptroot/eng/common/build.sh" --build --restore $@ diff --git a/eng/Build.props b/eng/Build.props new file mode 100644 index 000000000000..737c13e43e44 --- /dev/null +++ b/eng/Build.props @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props new file mode 100644 index 000000000000..80661de2fec1 --- /dev/null +++ b/eng/SourceBuild.props @@ -0,0 +1,8 @@ + + + + linker + true + + + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml new file mode 100644 index 000000000000..c1b6dfbf0538 --- /dev/null +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1df24bb9192e..0903c9937ad2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,6 +6,7 @@ https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe + https://github.com/dotnet/arcade @@ -14,6 +15,10 @@ https://github.com/dotnet/runtime 49cfb3507c586b539d0652814defbbc9e3073f16 + diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index d0cc1db10302..655eeab95a4e 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -45,6 +45,8 @@ stages: testResultsFormat: vstest enablePublishBuildAssets: true # generate build manifests and publish to BAR in internal builds enableMicrobuild: true # only affects internal builds + # See https://github.com/dotnet/source-build/issues/2049 + # enableSourceBuild: true jobs: @@ -85,6 +87,20 @@ stages: ${{ if eq(variables.officialBuild, 'true') }}: displayName: Build and publish illink.sln $(_BuildConfig) + - job: SourceBuild_Managed + displayName: Source-Build (Managed) + pool: + vmImage: ubuntu-20.04 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + workspace: + clean: all + steps: + - checkout: self + submodules: true + - template: /eng/common/templates/steps/source-build.yml + parameters: + enablePublishTestResults: true + - ${{ if eq(variables.officialBuild, 'false') }}: - job: Linux condition: eq(variables.officialBuild, 'false')