source-build: bundle NativeAOT libraries with the SDK. (#41198)

dotnet · Jun 19, 2024 · f3ebfb5 · f3ebfb5
1 parent 18d85d9
commit f3ebfb5
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 7 deletions.
diff --git a/src/Installer/redist-installer/redist-installer.csproj b/src/Installer/redist-installer/redist-installer.csproj
@@ -8,7 +8,8 @@
     <ResolveAssemblyReferencesSilent>true</ResolveAssemblyReferencesSilent>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>none</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <BundleRuntimePacks Condition="'$(BundleRuntimePacks)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</BundleRuntimePacks>
-    <BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(SourceBuildUseMonoRuntime)' != 'true'">true</BundleNativeAotCompiler>
+    <!-- DotNetBuildOrchestrator is (currently) needed in order to obtain NuGet packages from the runtime build. -->
+    <BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(SourceBuildUseMonoRuntime)' != 'true' and '$(DotNetBuildOrchestrator)' == 'true'">true</BundleNativeAotCompiler>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Installer/redist-installer/targets/GenerateLayout.targets b/src/Installer/redist-installer/targets/GenerateLayout.targets
@@ -202,6 +202,17 @@
         <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
       </BundledLayoutPackage>
 
+      <BundledLayoutPackage Include="MicrosoftDotNetILCompilerPackNupkg" Condition="'$(BundleNativeAotCompiler)' == 'true'">
+        <PackageName>runtime.$(SharedFrameworkRid).Microsoft.DotNet.ILCompiler</PackageName>
+        <PackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</PackageVersion>
+        <TargetFramework>$(TargetFramework)</TargetFramework>
+        <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
+      </BundledLayoutPackage>
+
+      <BundledLayoutLibraryPackage Include="$(SourceBuiltShippingPackagesDir)/../runtime/Microsoft.DotNet.ILCompiler.$(MicrosoftNETCoreAppRuntimePackageVersion).nupkg" Condition="'$(BundleNativeAotCompiler)' == 'true'" />
+
+      <BundledLayoutLibraryPackage Include="$(SourceBuiltShippingPackagesDir)/../runtime/Microsoft.NET.ILLink.Tasks.$(MicrosoftNETILLinkTasksPackageVersion).nupkg" Condition="'$(BundleNativeAotCompiler)' == 'true'" />
+
       <BundledInstallerComponent Include="DownloadedRuntimeDepsInstallerFile"
                                  Condition="('$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true') And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
         <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
@@ -460,6 +471,11 @@
           SkipUnchangedFiles="true"
           />
 
+    <Copy SourceFiles="@(BundledLayoutLibraryPackage)"
+          DestinationFolder="$(RedistLayoutPath)/library-packs"
+          SkipUnchangedFiles="true"
+          />
+
     <!-- From Version.targets in SDK redist -->
     <PropertyGroup>
       <ArtifactNameSdk>dotnet-toolset-internal</ArtifactNameSdk>

diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh
@@ -219,6 +219,8 @@ targets="/t:Build"
 if [[ "$test" == true ]]; then
   project="$scriptroot/test/tests.proj"
   targets="$targets;VSTest"
+  # Workaround for vstest hangs (https://github.com/microsoft/vstest/issues/5091) [TODO]
+  export MSBUILDENSURESTDOUTFORTASKPROCESSES=1
 fi
 
 function Build {

diff --git a/src/SourceBuild/content/eng/build.ps1 b/src/SourceBuild/content/eng/build.ps1
@@ -60,6 +60,8 @@ $targets = "/t:Build"
 if ($test) {
   $project = Join-Path (Join-Path $RepoRoot "test") "tests.proj"
   $targets += ";VSTest"
+  # Workaround for vstest hangs (https://github.com/microsoft/vstest/issues/5091) [TODO]
+  $env:MSBUILDENSURESTDOUTFORTASKPROCESSES="1"
 }
 
 if ($buildRepoTests) {

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs
@@ -30,7 +30,7 @@ public void SourceBuiltSdkContainsNativeDebugSymbols()
         StringBuilder issueDetails = new();
         foreach (var fileName in fileNames)
         {
-            if (!IsElfFile(fileName))
+            if (!IsElfFile(fileName) || SkipFile(fileName))
             {
                 continue;
             }
@@ -70,6 +70,14 @@ private bool IsElfFile(string fileName)
         return Regex.IsMatch(fileStdOut, @"ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)");
     }
 
+    private static bool SkipFile(string path)
+    {
+        string fileName = Path.GetFileName(path);
+
+        // 'ilc' is a NativeAOT-built application which doesn't meet the expectations set by the test.
+        return fileName == "ilc";
+    }
+
     private ScanResult ScanFile(string fileName)
     {
         string readelfSStdOut = ExecuteHelper.ExecuteProcessValidateExitCode("eu-readelf", $"-S {fileName}", OutputHelper);

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
@@ -788,17 +788,22 @@ private ToolPackSupport AddToolPack(
 
                 var runtimePackName = packNamePattern.Replace("**RID**", hostRuntimeIdentifier);
 
-                if (EnableRuntimePackDownload)
+                var runtimePackItem = new TaskItem(runtimePackName);
+                runtimePackItem.SetMetadata(MetadataKeys.NuGetPackageId, runtimePackName);
+                runtimePackItem.SetMetadata(MetadataKeys.NuGetPackageVersion, packVersion);
+
+                string runtimePackPath = GetPackPath(runtimePackName, packVersion);
+                if (runtimePackPath != null)
+                {
+                    runtimePackItem.SetMetadata(MetadataKeys.PackageDirectory, runtimePackPath);
+                }
+                else if (EnableRuntimePackDownload)
                 {
                     // We need to download the runtime pack
                     runtimePackToDownload = new TaskItem(runtimePackName);
                     runtimePackToDownload.SetMetadata(MetadataKeys.Version, packVersion);
                 }
 
-                var runtimePackItem = new TaskItem(runtimePackName);
-                runtimePackItem.SetMetadata(MetadataKeys.NuGetPackageId, runtimePackName);
-                runtimePackItem.SetMetadata(MetadataKeys.NuGetPackageVersion, packVersion);
-
                 switch (toolPackType)
                 {
                     case ToolPackType.Crossgen2: