From 0e1b32b8ee7e2c3571439c51e49adb6b7c893356 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 29 Sep 2021 15:48:16 -0500 Subject: [PATCH] [ArPow] Add support to build source-build from specific installer commit (#12186) * Add support to build source-build from specific installer commit * Fix nuget.client repo name --- eng/SourceBuild.Version.Details.xml | 228 ------------------ eng/Version.Details.xml | 25 ++ .../job/source-build-create-tarball.yml | 2 +- .../job/source-build-run-tarball-build.yml | 2 +- ...ourceBuildIntermediateNupkgDependencies.cs | 10 +- .../tools/SourceBuildArcadeTarball.targets | 13 +- .../tarball/content/repos/diagnostics.proj | 2 - .../0001-Remove-netcoreapp2.1-TFM.patch | 25 -- 8 files changed, 41 insertions(+), 266 deletions(-) delete mode 100644 eng/SourceBuild.Version.Details.xml delete mode 100644 src/SourceBuild/tarball/patches/diagnostics/0001-Remove-netcoreapp2.1-TFM.patch diff --git a/eng/SourceBuild.Version.Details.xml b/eng/SourceBuild.Version.Details.xml deleted file mode 100644 index 63a9498c4..000000000 --- a/eng/SourceBuild.Version.Details.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - - https://github.com/dotnet/windowsdesktop - dc5a8543e1367534ad435199cb03bf5f6c2d6e70 - - - https://github.com/dotnet/windowsdesktop - dc5a8543e1367534ad435199cb03bf5f6c2d6e70 - - - https://github.com/dotnet/windowsdesktop - dc5a8543e1367534ad435199cb03bf5f6c2d6e70 - - - https://github.com/dotnet/windowsdesktop - dc5a8543e1367534ad435199cb03bf5f6c2d6e70 - - - https://github.com/dotnet/runtime - 826f81a11ad17f415668fe1cb934bdaf00d36ea2 - - - - https://github.com/dotnet/runtime - 826f81a11ad17f415668fe1cb934bdaf00d36ea2 - - - https://github.com/dotnet/runtime - 826f81a11ad17f415668fe1cb934bdaf00d36ea2 - - - https://github.com/dotnet/runtime - 826f81a11ad17f415668fe1cb934bdaf00d36ea2 - - - https://github.com/dotnet/runtime - 826f81a11ad17f415668fe1cb934bdaf00d36ea2 - - - https://github.com/dotnet/runtime - 826f81a11ad17f415668fe1cb934bdaf00d36ea2 - - - - - https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 - - - https://github.com/dotnet/runtime - 826f81a11ad17f415668fe1cb934bdaf00d36ea2 - - - https://github.com/dotnet/aspnetcore - 4ab0cf33ecb1c25a38422f5b11810e4c8a91d8eb - - - https://github.com/dotnet/aspnetcore - 4ab0cf33ecb1c25a38422f5b11810e4c8a91d8eb - - - https://github.com/dotnet/aspnetcore - 4ab0cf33ecb1c25a38422f5b11810e4c8a91d8eb - - - https://github.com/dotnet/aspnetcore - 4ab0cf33ecb1c25a38422f5b11810e4c8a91d8eb - - - - https://github.com/dotnet/aspnetcore - 4ab0cf33ecb1c25a38422f5b11810e4c8a91d8eb - - - https://github.com/dotnet/aspnetcore - 4ab0cf33ecb1c25a38422f5b11810e4c8a91d8eb - - - https://github.com/dotnet/test-templates - c40ef7e056b48e011c43a21354d6790ba6b8b4fc - - - https://github.com/dotnet/test-templates - c40ef7e056b48e011c43a21354d6790ba6b8b4fc - - - https://github.com/dotnet/test-templates - c40ef7e056b48e011c43a21354d6790ba6b8b4fc - - - - https://github.com/dotnet/templating - 73e74bdd2ab3a3f5b2197f3e60aaafb4eae5e302 - - - https://github.com/dotnet/templating - 73e74bdd2ab3a3f5b2197f3e60aaafb4eae5e302 - - - - https://github.com/dotnet/sdk - 279a14389ff6c1394e782346be347f467f4332c6 - - - - https://github.com/dotnet/sdk - 279a14389ff6c1394e782346be347f467f4332c6 - - - - https://github.com/dotnet/winforms - 67d6ec1fce873047bb96f8a2a6b993f46079464f - - - https://github.com/dotnet/wpf - 7a877ae32a152e575deb857dff833047652f97ce - - - https://github.com/dotnet/fsharp - f0b5108c92b92ba5ee440228aadba3bae79b43a3 - - - https://github.com/dotnet/fsharp - f0b5108c92b92ba5ee440228aadba3bae79b43a3 - - - - https://github.com/microsoft/vstest - d6f64b37c2cfee76c8b1269d688384ced30ecd21 - - - - https://github.com/dotnet/linker - d51cc207fac85547787bbba83f54f69d8e72e9f5 - - linker - - - https://github.com/dotnet/roslyn - 2cb3d482e3c09760d1b204c597be93f49dba3349 - - - - https://github.com/dotnet/msbuild - 9f83c725ff188ea0d68b306997328581935a7813 - - - - https://github.com/nuget/nuget.client - e685bdb6d7b4d1f3664f6542f50b84376a19341c - - - - https://github.com/Microsoft/ApplicationInsights-dotnet - 53b80940842204f78708a538628288ff5d741a1d - - - - https://github.com/aspnet/xdt - 698fdad58fa64a55f16cd9562c90224cc498ed02 - - - - https://github.com/dotnet/emsdk - 9838ec0843442f761488cfec9cf34612c9f675e6 - - - https://github.com/dotnet/source-build - a0b571f88fe49c8ab83787442f96244bb3dcb5f6 - - - - - - https://github.com/dotnet/clicommandlineparser - 3198bf5660cad3dab85f5475bf1fda9688146e3f - - - - https://github.com/dotnet/diagnostics - e0189ea53737fbb0cc110dab56c260ef2a6f5b74 - - - - https://github.com/dotnet/symreader - 762d5fd3115959f44050557fb984137c3834d5c0 - - - - https://github.com/dotnet/deployment-tools - 7431bf2f3c204cbbc326c8d55ce4ac5cad7661d6 - - - - - - https://github.com/dotnet/arcade - c575da80f465e0b5fb98f416be92bb98b2f54b41 - - - - https://github.com/dotnet/arcade - c575da80f465e0b5fb98f416be92bb98b2f54b41 - - - - https://github.com/dotnet/arcade - c575da80f465e0b5fb98f416be92bb98b2f54b41 - - - https://github.com/dotnet/source-build-reference-packages - bf115027178d7d42cfa2fbe417e011864c06cc6c - - - - https://github.com/dotnet/sourcelink - 6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9 - - - - https://github.com/dotnet/xliff-tasks - bc3233146e1fcd393ed471d5005333c83363e0fe - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 730d0e960..96eaa9851 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -20,6 +20,7 @@ https://github.com/dotnet/runtime 826f81a11ad17f415668fe1cb934bdaf00d36ea2 + https://github.com/dotnet/runtime @@ -128,6 +129,7 @@ https://github.com/microsoft/vstest d6f64b37c2cfee76c8b1269d688384ced30ecd21 + https://github.com/dotnet/linker @@ -148,6 +150,7 @@ https://github.com/nuget/nuget.client e685bdb6d7b4d1f3664f6542f50b84376a19341c + https://github.com/Microsoft/ApplicationInsights-dotnet @@ -157,6 +160,7 @@ https://github.com/dotnet/xdt 698fdad58fa64a55f16cd9562c90224cc498ed02 + https://github.com/dotnet/emsdk @@ -167,6 +171,26 @@ 3fb25b8db3bec654e37e71a5b2b7fde14444bc2f + + https://github.com/dotnet/clicommandlineparser + 3198bf5660cad3dab85f5475bf1fda9688146e3f + + + + https://github.com/dotnet/deployment-tools + 7431bf2f3c204cbbc326c8d55ce4ac5cad7661d6 + + + + https://github.com/dotnet/diagnostics + f758ec93e1098e5bcbc4550f8a36c6cd1ce04918 + + + + https://github.com/dotnet/symreader + 7b9791daa3a3477eb22ec805946c9fff8b42d8ca + + @@ -186,6 +210,7 @@ https://github.com/dotnet/source-build-reference-packages bf115027178d7d42cfa2fbe417e011864c06cc6c + https://github.com/dotnet/sourcelink diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 94c41721b..428271393 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -60,7 +60,7 @@ jobs: # This prevents allocation of additional agents if the tarball build legs should be skipped. # Only build the tarball if the PR touches source-build source. - script: | - if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*\|"filename": "eng/SourceBuild.Version.Details.xml"' + if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*' then echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" fi diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index c2dffd56c..a6d2f8690 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -30,7 +30,7 @@ jobs: Fedora33-Offline: _runOnline: false _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - timeoutInMinutes: 180 + timeoutInMinutes: 210 variables: _TarballDir: $(Build.StagingDirectory)/tarball _BuildConfig: Release diff --git a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs index fbd497b72..59f7eb499 100644 --- a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs +++ b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs @@ -59,8 +59,14 @@ namespace Microsoft.DotNet.SourceBuild.Tasks if (sourceBuildElement == null) { - // Ignore element: doesn't represent a source-build dependency. - return null; + // Workaround for https://github.com/dotnet/source-build/issues/2481 + sourceBuildElement = d.Element(CreateQualifiedName("SourceBuildTarball")); + + if (sourceBuildElement == null) + { + // Ignore element: doesn't represent a source-build dependency. + return null; + } } string repoName = sourceBuildElement.Attribute("RepoName")?.Value; diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 31e204344..f07718f1a 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -142,6 +142,12 @@ WorkingDirectory="$(RepoRoot)" Condition="$(IsRootRepo) == 'true'" /> + + + - - - $(StandardSourceBuildArgs) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(ProjectDirectory)eng\common\build$(ShellExtension) $(BuildCommandArgs) $(ProjectDirectory)global.json diff --git a/src/SourceBuild/tarball/patches/diagnostics/0001-Remove-netcoreapp2.1-TFM.patch b/src/SourceBuild/tarball/patches/diagnostics/0001-Remove-netcoreapp2.1-TFM.patch deleted file mode 100644 index f2a7ff29d..000000000 --- a/src/SourceBuild/tarball/patches/diagnostics/0001-Remove-netcoreapp2.1-TFM.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 80ac1836aa29bce1c8de0fbc920dd83e57ff8d37 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 27 Aug 2021 01:56:03 +0000 -Subject: [PATCH] Remove netcoreapp2.1 TFM - ---- - .../Microsoft.Diagnostics.NETCore.Client.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj -index ffba4a8a..40dd2361 100644 ---- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj -+++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj -@@ -1,7 +1,7 @@ -  - - Library -- netstandard2.0;netcoreapp2.1 -+ netstandard2.0 - Microsoft.Diagnostics.NETCore.Client - .NET Core Diagnostics Client Library - 0.2.0 --- -2.29.2 -