diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd6b69fd8..cd761f457 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -196,18 +196,18 @@ - + https://github.com/dotnet/arcade - 5d3e421833a18b48eed5bda24f4d5f65a75cf970 + 37e6d5179448c5255f1517834463210dcc45963a - + https://github.com/dotnet/arcade - 5d3e421833a18b48eed5bda24f4d5f65a75cf970 + 37e6d5179448c5255f1517834463210dcc45963a - + https://github.com/dotnet/arcade - 5d3e421833a18b48eed5bda24f4d5f65a75cf970 + 37e6d5179448c5255f1517834463210dcc45963a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4f3cc0be7..65bc7363b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22375.4 + 7.0.0-beta.22376.3 diff --git a/eng/common/build.sh b/eng/common/build.sh index 55b298f16..9031d41ea 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -19,6 +19,9 @@ usage() echo "Actions:" echo " --restore Restore dependencies (short: -r)" echo " --build Build solution (short: -b)" + echo " --source-build Source-build the solution (short: -sb)" + echo " Will additionally trigger the following actions: --restore, --build, --pack" + echo " If --configuration is not set explicitly, will also set it to 'Release'" echo " --rebuild Rebuild solution" echo " --test Run all unit tests in the solution (short: -t)" echo " --integrationTest Run all integration tests in the solution" @@ -55,6 +58,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" restore=false build=false +source_build=false rebuild=false test=false integration_test=false @@ -73,7 +77,7 @@ exclude_ci_binary_log=false pipelines_log=false projects='' -configuration='Debug' +configuration='' prepare_machine=false verbosity='minimal' runtime_source_feed='' @@ -119,6 +123,12 @@ while [[ $# > 0 ]]; do -pack) pack=true ;; + -sourcebuild|-sb) + build=true + source_build=true + restore=true + pack=true + ;; -test|-t) test=true ;; @@ -168,6 +178,10 @@ while [[ $# > 0 ]]; do shift done +if [[ -z "$configuration" ]]; then + if [[ "$source_build" = true ]]; then configuration="Release"; else configuration="Debug"; fi +fi + if [[ "$ci" == true ]]; then pipelines_log=true node_reuse=false @@ -205,6 +219,7 @@ function Build { /p:RepoRoot="$repo_root" \ /p:Restore=$restore \ /p:Build=$build \ + /p:ArcadeBuildFromSource=$source_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ diff --git a/global.json b/global.json index 3f183baa7..c91c1f157 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22375.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22375.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22376.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22376.3" } }