Extract bundled files when IncludeAllContentForSelfExtract is set

src/installer/corehost/cli/bundle/extractor.cpp

@@ -204,7 +204,7 @@ void extractor_t::extract_new(reader_t& reader)
     begin();
     for (const file_entry_t& entry : m_manifest.files) 
     {
-        if (entry.needs_extraction())
+        if (m_manifest.is_netcoreapp3_compat_mode() || entry.needs_extraction())
         {
             extract(entry, reader);
         }

src/installer/corehost/cli/bundle/manifest.cpp

@@ -5,16 +5,18 @@
 
 using namespace bundle;
 
-manifest_t manifest_t::read(reader_t& reader, int32_t num_files)
+manifest_t manifest_t::read(reader_t& reader, header_t& header)
 {
     manifest_t manifest;
+    manifest.m_netcoreapp3_compat_mode = header.is_netcoreapp3_compat_mode();
 
-    for (int32_t i = 0; i < num_files; i++)
+    for (int32_t i = 0; i < header.num_embedded_files(); i++)
     {
         file_entry_t entry = file_entry_t::read(reader);
         manifest.files.push_back(std::move(entry));
-        manifest.m_need_extraction |= entry.needs_extraction();
+        manifest.m_files_need_extraction |= entry.needs_extraction();
     }
 
+    manifest.m_files_need_extraction |= manifest.is_netcoreapp3_compat_mode();
     return manifest;
 }

src/installer/corehost/cli/bundle/manifest.h

@@ -6,6 +6,7 @@
 
 #include <list>
 #include "file_entry.h"
+#include "header.h"
 
 namespace bundle
 {
@@ -16,16 +17,28 @@ namespace bundle
     {
     public:
         manifest_t()
-            : m_need_extraction(false) {}
+            : m_files_need_extraction(false)
+            , m_netcoreapp3_compat_mode(false)
+        {
+        }
 
         std::vector<file_entry_t> files;
 
-        static manifest_t read(reader_t &reader, int32_t num_files);
+        static manifest_t read(reader_t &reader, header_t &header);
 
-        bool files_need_extraction() { return m_need_extraction; }
+        bool files_need_extraction() const
+        {
+            return m_files_need_extraction;
+        }
+
+        bool is_netcoreapp3_compat_mode() const
+        {
+            return m_netcoreapp3_compat_mode;
+        }
 
     private:
-        bool m_need_extraction;
+        bool m_files_need_extraction;
+        bool m_netcoreapp3_compat_mode;
     };
 }
 #endif // __MANIFEST_H__

src/installer/corehost/cli/bundle/runner.cpp

@@ -28,7 +28,7 @@ StatusCode runner_t::extract()
         m_runtimeconfig_json.set_location(&m_header.runtimeconfig_json_location());
 
         // Read the bundle manifest
-        m_manifest = manifest_t::read(reader, m_header.num_embedded_files());
+        m_manifest = manifest_t::read(reader, m_header);
 
         // Extract the files if necessary
         if (m_manifest.files_need_extraction())

src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/NetCoreApp3CompatModeTests.cs

@@ -0,0 +1,73 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+//
+
+using System;
+using System.IO;
+using System.Linq;
+using BundleTests.Helpers;
+using Microsoft.DotNet.Cli.Build.Framework;
+using Microsoft.DotNet.CoreSetup.Test;
+using Microsoft.NET.HostModel.Bundle;
+using Xunit;
+
+namespace AppHost.Bundle.Tests
+{
+    public class NetCoreApp3CompatModeTests : IClassFixture<NetCoreApp3CompatModeTests.SharedTestState>
+    {
+        private SharedTestState sharedTestState;
+
+        public NetCoreApp3CompatModeTests(SharedTestState fixture)
+        {
+            sharedTestState = fixture;
+        }
+
+        [Fact]
+        public void Bundle_Is_Extracted()
+        {
+            var fixture = sharedTestState.TestFixture.Copy();
+            string singleFile;
+            Bundler bundler = BundleHelper.BundleApp(fixture, out singleFile, BundleOptions.BundleAllContent);
+            var extractionBaseDir = BundleHelper.GetExtractionRootDir(fixture);
+
+            Command.Create(singleFile)
+                .CaptureStdErr()
+                .CaptureStdOut()
+                .EnvironmentVariable(BundleHelper.DotnetBundleExtractBaseEnvVariable, extractionBaseDir.FullName)
+                .Execute()
+                .Should()
+                .Pass()
+                .And
+                .HaveStdOutContaining("Hello World");
+
+            var extractionDir = BundleHelper.GetExtractionDir(fixture, bundler);
+            var bundleFiles = BundleHelper.GetBundleDir(fixture).GetFiles().Select(file => file.Name).ToArray();
+            var publishedFiles = Directory.GetFiles(BundleHelper.GetPublishPath(fixture), searchPattern: "*", searchOption: SearchOption.AllDirectories)
+                .Select(file => Path.GetFileName(file))
+                .Except(bundleFiles)
+                .ToArray();
+            var bundlerFiles = BundleHelper.GetBundleDir(fixture).GetFiles();
+            extractionDir.Should().HaveFiles(publishedFiles);
+        }
+
+        public class SharedTestState : IDisposable
+        {
+            public TestProjectFixture TestFixture { get; set; }
+            public RepoDirectoriesProvider RepoDirectories { get; set; }
+
+            public SharedTestState()
+            {
+                RepoDirectories = new RepoDirectoriesProvider();
+                TestFixture = new TestProjectFixture("StandaloneApp", RepoDirectories);
+                TestFixture
+                    .EnsureRestoredForRid(TestFixture.CurrentRid, RepoDirectories.CorehostPackages)
+                    .PublishProject(runtime: TestFixture.CurrentRid, outputDirectory: BundleHelper.GetPublishPath(TestFixture));
+            }
+
+            public void Dispose()
+            {
+                TestFixture.Dispose();
+            }
+        }
+    }
+}