From 12c30eeb324e9ef755f2c4db1e014ebd6e45d09d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:44:29 -0700 Subject: [PATCH 1/8] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220413.1 (#13623) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22208.1 -> To Version 6.0.0-servicing.22213.1 Co-authored-by: dotnet-maestro[bot] --- 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 131a316f0..cf180107c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - e5429803f3e9064da8a857b561a07489800f3f29 + 60845bf36f0dd6dd310070548a58cb8ad3ab513c From 3ddadcc14fa8d48f661d109ca48904b428db0d05 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Apr 2022 13:33:27 -0700 Subject: [PATCH 2/8] Update all workloads to the April release of 6.0.300 manifests --- eng/Versions.props | 14 +++++++------- src/redist/targets/BundledManifests.targets | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 74baf5b81..0c8afac5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,13 +176,13 @@ - 6.0.200-preview.13.2747 - 31.0.200-preview.13.41 - 15.2.301-preview.13.2 - 15.2.301-preview.13.2 - 12.1.301-preview.13.2 - 15.2.301-preview.13.2 - $(MicrosoftNETCoreAppRefPackageVersion) + 6.0.300-rc.1.5355 + 32.0.300-rc.1.4 + 15.4.100-rc.1.125 + 15.4.100-rc.1.125 + 12.3.100-rc.1.125 + 15.4.100-rc.1.125 + 6.0.4 6.0.4 $(MicrosoftNETWorkloadEmscriptenManifest60200Version) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 3618623f1..7b8536e48 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,13 +1,13 @@ - - - - - - - - + + + + + + + + From fc36133df95827a16ad57e8bf8abdeb49aa6afc9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Apr 2022 16:49:20 -0700 Subject: [PATCH 3/8] Update Version.Details.xml --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 057327f53..0cd745f93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,7 +166,7 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk 52e9452f82e26f9fcae791e84c082ae22f1ef66f From 9563e594c5a7a945df14f775eda7680a5faaf8ec Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 13 Apr 2022 17:43:13 -0700 Subject: [PATCH 4/8] [release/6.0.1xx] Retry source-build artifacts download on failure (#13591) * retry source-built artifacts download with curl --- src/SourceBuild/tarball/content/prep.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index e3225d309..56e00219f 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -79,13 +79,13 @@ while read -r line; do if [[ $line == *"Private.SourceBuilt.Artifacts"* ]]; then if [ "$downloadArtifacts" == "true" ]; then echo " Downloading source-built artifacts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) fi fi if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then if [ "$downloadPrebuilts" == "true" ]; then echo " Downloading source-built prebuilts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) fi fi done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt From 9104a1f6e4ee461f9b650eafde0187ad58863100 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 13 Apr 2022 21:49:19 -0500 Subject: [PATCH 5/8] Add patch for linker prebuilt (#13630) --- ...e-BannedApiAnalyzers-usage-in-source.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch diff --git a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch new file mode 100644 index 000000000..f7d7668dc --- /dev/null +++ b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Wed, 13 Apr 2022 21:30:39 +0000 +Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build + +Removes prebuilt. +Patch for https://github.com/dotnet/linker/pull/2742 +--- + src/linker/Mono.Linker.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj +index 391300aa..d276003e 100644 +--- a/src/linker/Mono.Linker.csproj ++++ b/src/linker/Mono.Linker.csproj +@@ -31,7 +31,7 @@ + + + +- ++ + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From 6ac60f74ebab454c7924eb1df20239d238a7f7cc Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 13 Apr 2022 23:55:34 -0700 Subject: [PATCH 6/8] Restore the version.details.xml file --- 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 cf180107c..131a316f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - 60845bf36f0dd6dd310070548a58cb8ad3ab513c + e5429803f3e9064da8a857b561a07489800f3f29 From 934c23764044ed14f69962ddc54e992c25e417ab Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 14 Apr 2022 09:45:34 -0500 Subject: [PATCH 7/8] Update source-built artifacts version (#13638) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 74baf5b81..65684028e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.1-1 + 6.0.104 From 8ed3ae9f13375dfca27de419dea303ac4a02f2aa Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Apr 2022 13:17:10 -0700 Subject: [PATCH 8/8] Fix the source build leg for the 300 workloads --- .../Arcade/tools/TextOnlyPackages.csproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index f7cad5354..7faf06dfb 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -11,14 +11,14 @@ should be added to source-build-reference-packages. --> - - - - - - - - + + + + + + + +