From ce4a3f937c55f99eac0841c29f8f82140d010bbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 21:07:50 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/symreader build 20221003.2 Microsoft.SourceBuild.Intermediate.symreader From Version 1.4.0-beta2-21475-02 -> To Version 2.0.0-beta-22503-02 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2d119fed..32893c1d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ 4b8fe3ff0cfb2b38901803c798c647ca8123c222 - + https://github.com/dotnet/symreader - 7b9791daa3a3477eb22ec805946c9fff8b42d8ca + 0c29b7109c054bdc578e917515ae7e8635b9cb9d From 19d1ea1d2db87ae411d0a6fb14c7511e73a6a5a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 12:27:49 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/source-build-externals build 20230328.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23171.1 -> To Version 8.0.0-alpha.1.23178.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32893c1d0..c7b3b14c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ b60c95e1ce736630d17e16626c59e3dd85ebae2b - + https://github.com/dotnet/source-build-externals - 4b8fe3ff0cfb2b38901803c798c647ca8123c222 + cbd9d61c5a92d7e4a0548a2c8ff4d1a28aaf6379 From 3af87c5033dc590f7728254eeecec80ad521005c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 16:36:54 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230329.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23178.5 -> To Version 8.0.0-alpha.1.23179.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7b3b14c1..9d85945b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 60137c7c084e98ce5ab35473f9a5302b0a988d01 + bc5210a7b68c43bcf9d9687b9268a4665126c583 From 59fe62dcea014991467e759d947864d1db5e3d13 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 29 Mar 2023 17:14:30 +0000 Subject: [PATCH 4/7] Fix if statements --- src/SourceBuild/content/prep.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 7149f2e3a..0207fe7e4 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -69,14 +69,14 @@ fi # Check if Private.SourceBuilt artifacts archive exists artifactsBaseFileName="Private.SourceBuilt.Artifacts" packagesArchiveDir="$SCRIPT_ROOT/prereqs/packages/archive/" -if [[ "$downloadArtifacts" == "true" && -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]]; then +if [ "$downloadArtifacts" == "true" ] && [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded" downloadArtifacts=false fi # Check if Private.SourceBuilt prebuilts archive exists prebuiltsBaseFileName="Private.SourceBuilt.Prebuilts" -if [[ "$downloadPrebuilts" == "true" && -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]]; then +if [ "$downloadPrebuilts" == "true" ] && [ -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]; then echo " Private.SourceBuilt.Prebuilts.*.tar.gz exists...it will not be downloaded" downloadPrebuilts=false fi From 1058636ca0a83ccdfae8b1bd38535b8337e3a574 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 12:23:13 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/arcade build 20230327.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23174.1 -> To Version 8.0.0-beta.23177.4 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23172-02 -> To Version 1.2.0-beta-23175-02 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d85945b0..4de3f5618 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 1177b37e60c7271ab461098aefbdd03edc15b90d + 747f53d751983dd062f39f4654bff074536e0012 - + https://github.com/dotnet/arcade - 1177b37e60c7271ab461098aefbdd03edc15b90d + 747f53d751983dd062f39f4654bff074536e0012 - + https://github.com/dotnet/arcade - 1177b37e60c7271ab461098aefbdd03edc15b90d + 747f53d751983dd062f39f4654bff074536e0012 https://github.com/dotnet/arcade-services @@ -223,14 +223,14 @@ bc5210a7b68c43bcf9d9687b9268a4665126c583 - + https://github.com/dotnet/sourcelink - a86ac5afc76f4afbd3dd59029a00857cc3eeb6e3 + ccfca8dce5f7525433756281c2c275386348a9ad - + https://github.com/dotnet/xliff-tasks - f2ad3b152aac2a3f1c620178e9004b1f84ccfd1d + f8afbbadc5b87ae70b8993f4a9cfa54fb820d6ce diff --git a/eng/Versions.props b/eng/Versions.props index 1f44f72e7..d77fd40ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23174.1 + 8.0.0-beta.23177.4 diff --git a/global.json b/global.json index df9ab0d5a..93b4ed949 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23174.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23174.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23177.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23177.4" } } From 6af27326cfe3114e7089b8644385c82abb20e254 Mon Sep 17 00:00:00 2001 From: Ilya Leoshkevich Date: Thu, 30 Mar 2023 16:59:14 +0200 Subject: [PATCH 6/7] Support private feeds in prep.sh (#14330) Co-authored-by: Michael Simons --- src/SourceBuild/content/prep.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 0207fe7e4..bbe545d0d 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -10,10 +10,13 @@ usage() { echo " Prepares the environment to be built by downloading Private.SourceBuilt.Artifacts.*.tar.gz and" echo " installing the version of dotnet referenced in global.json" echo "options:" - echo " --no-artifacts Exclude the download of the previously source-built artifacts archive." - echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts" - echo " --no-prebuilts Exclude the download of the prebuilts archive." - echo " --no-sdk Exclude the download of the .NET SDK." + echo " --no-artifacts Exclude the download of the previously source-built artifacts archive." + echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts" + echo " --no-prebuilts Exclude the download of the prebuilts archive." + echo " --no-sdk Exclude the download of the .NET SDK." + echo " --runtime-source-feed URL of a remote server or a local directory, from which SDKs and" + echo " runtimes can be downloaded" + echo " --runtime-source-feed-key Key for accessing the above server, if necessary" echo "" } @@ -21,6 +24,8 @@ buildBootstrap=true downloadArtifacts=true downloadPrebuilts=true installDotnet=true +runtime_source_feed='' +runtime_source_feed_key='' positional_args=() while :; do if [ $# -le 0 ]; then @@ -44,6 +49,14 @@ while :; do --no-sdk) installDotnet=false ;; + --runtime-source-feed) + runtime_source_feed=$2 + shift + ;; + --runtime-source-feed-key) + runtime_source_feed_key=$2 + shift + ;; *) positional_args+=("$1") ;; From cf2718da56fe4d100d092de22772ac5905465adc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 30 Mar 2023 15:56:51 -0500 Subject: [PATCH 7/7] Remove SourceBuildTarball usage in Version.Details.xml (#15960) --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d85945b0..f75e9a8e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,7 +63,7 @@ https://github.com/dotnet/aspnetcore d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 - + https://github.com/dotnet/aspnetcore @@ -154,7 +154,7 @@ https://github.com/dotnet/msbuild e7de1330724224a542668e1ef82c997613c7080c - + https://github.com/nuget/nuget.client @@ -221,7 +221,7 @@ https://github.com/dotnet/source-build-reference-packages bc5210a7b68c43bcf9d9687b9268a4665126c583 - + https://github.com/dotnet/sourcelink