|
 |
417dba |
From 7365824ddc6ed66152cfc50f4c8508368953099c Mon Sep 17 00:00:00 2001
|
|
|
417dba |
From: Omair Majid <omajid@redhat.com>
|
|
|
417dba |
Date: Tue, 9 Nov 2021 08:39:27 -0500
|
|
|
417dba |
Subject: [PATCH] Also publish non-portable RID runtime symbols tarball
|
|
|
417dba |
|
|
|
417dba |
This fixes a regression in .NET 6 source-build compared to the .NET
|
|
|
417dba |
5 source-build.
|
|
|
417dba |
|
|
|
417dba |
source-build wants to publish runtime symbols tarball for portable (eg,
|
|
|
417dba |
linux-x64) and non-portable (eg, fedora.33-x64) RIDs here after a build.
|
|
|
417dba |
Following .NET 5 conventions, I expected to see:
|
|
|
417dba |
|
|
|
417dba |
./artifacts/x64/Release/runtime/dotnet-runtime-symbols-fedora.34-x64-6.0.0.tar.gz
|
|
|
417dba |
./artifacts/x64/Release/runtime/dotnet-runtime-symbols-linux-x64-6.0.0.tar.gz
|
|
|
417dba |
|
|
|
417dba |
Unfortunately, only the portable RID (linux-x64) tarball is present
|
|
|
417dba |
after a full source-build in .NET 6.
|
|
|
417dba |
|
|
|
417dba |
It turns out this is a bug in our build scripts. We try and copy
|
|
|
417dba |
binaries - including the symbol tarballs - after building each of
|
|
|
417dba |
runtime-portable and runtime. However, the target dependency is wrong:
|
|
|
417dba |
after `Build`, the intermediate package doesn't exist from the
|
|
|
417dba |
just-built repo.
|
|
|
417dba |
|
|
|
417dba |
What ends up happening is that nothing is copied after building
|
|
|
417dba |
runtime-portable. However, after building runtime, the runtime-portable
|
|
|
417dba |
intermediate artifacts are found and copied over. So the end
|
|
|
417dba |
build has portable RID symbos, but not the non-portable ones.
|
|
|
417dba |
|
|
|
417dba |
Fix that by changing the dependency of this target so it runs after
|
|
|
417dba |
intermediate packages are available.
|
|
|
417dba |
---
|
|
|
417dba |
src/SourceBuild/tarball/content/repos/runtime.common.targets | 2 +-
|
|
|
417dba |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
417dba |
|
|
|
417dba |
diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.targets b/src/SourceBuild/tarball/content/repos/runtime.common.targets
|
|
|
417dba |
index ca606b23d21..862b70dc832 100644
|
|
|
417dba |
--- a/src/SourceBuild/tarball/content/repos/runtime.common.targets
|
|
|
417dba |
+++ b/src/SourceBuild/tarball/content/repos/runtime.common.targets
|
|
|
417dba |
@@ -23,7 +23,7 @@
|
|
|
417dba |
</Target>
|
|
|
417dba |
|
|
|
417dba |
|
|
|
417dba |
- AfterTargets="Build"
|
|
|
417dba |
+ AfterTargets="ExtractIntermediatePackages"
|
|
|
417dba |
Inputs="$(MSBuildProjectFullPath)"
|
|
|
417dba |
Outputs="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete">
|
|
|
417dba |
<ItemGroup>
|