From fef5a52183845b3df9326b5954bd2152267451af Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Thu, 5 Apr 2018 12:15:42 +0100
Subject: [PATCH] Reference static content from referenced assemblies.
 Implements #340

---
 Blazor.sln                                    |   7 +
 .../Cli/Commands/BuildIndexHtmlCommand.cs     |  13 +-
 .../EmbeddedResources/EmbeddedResourceInfo.cs |  17 +++
 .../EmbeddedResources/EmbeddedResourceKind.cs |  12 ++
 .../EmbeddedResourcesProcessor.cs             | 137 ++++++++++++++++++
 .../Core/IndexHtmlWriter.cs                   |  19 +--
 .../targets/Blazor.MonoRuntime.targets        |  19 ++-
 .../.template.config/dotnetcli.host.json      |  12 ++
 .../.template.config/icon.png                 | Bin 0 -> 1196 bytes
 .../.template.config/template.json            |  70 +++++++++
 .../BlazorContent.CSharp.csproj               |  26 ++++
 .../BlazorContent.CSharp/Component1.cshtml    |   3 +
 .../BlazorContent.CSharp/ExampleJsInterop.cs  |  15 ++
 .../content/background.png                    | Bin 0 -> 378 bytes
 .../content/exampleJsInterop.js               |   6 +
 .../BlazorContent.CSharp/content/styles.css   |  11 ++
 .../IndexHtmlWriterTest.cs                    |  58 ++++++--
 .../testapps/BasicTestApp/BasicTestApp.csproj |   5 -
 .../TestContentPackage.csproj                 |  11 +-
 .../build/TestContentPackage.props            |  19 ---
 20 files changed, 393 insertions(+), 67 deletions(-)
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/dotnetcli.host.json
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/icon.png
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/template.json
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/BlazorContent.CSharp.csproj
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/Component1.cshtml
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/ExampleJsInterop.cs
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/background.png
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/exampleJsInterop.js
 create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/styles.css
 delete mode 100644 test/testapps/TestContentPackage/build/TestContentPackage.props

diff --git a/Blazor.sln b/Blazor.sln
index 157be7621b..916d1d76c1 100644
--- a/Blazor.sln
+++ b/Blazor.sln
@@ -93,6 +93,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Performance", "benchmarks\Microsoft.AspNetCore.Blazor.Performance\Microsoft.AspNetCore.Blazor.Performance.csproj", "{50F6820F-D058-4E68-9E15-801F893F514E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorContent.CSharp", "src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorContent.CSharp\BlazorContent.CSharp.csproj", "{3A457B14-D91B-4FFF-A81A-8F350BDB911F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -324,6 +326,10 @@ Global
 		{50F6820F-D058-4E68-9E15-801F893F514E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50F6820F-D058-4E68-9E15-801F893F514E}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
 		{50F6820F-D058-4E68-9E15-801F893F514E}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
+		{3A457B14-D91B-4FFF-A81A-8F350BDB911F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A457B14-D91B-4FFF-A81A-8F350BDB911F}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A457B14-D91B-4FFF-A81A-8F350BDB911F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A457B14-D91B-4FFF-A81A-8F350BDB911F}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -365,6 +371,7 @@ Global
 		{9088E4E4-B855-457F-AE9E-D86709A5E1F4} = {F563ABB6-85FB-4CFC-B0D2-1D5130E8246D}
 		{C57382BC-EE93-49D5-BC40-5C98AF8AA048} = {4AE0D35B-D97A-44D0-8392-C9240377DCCE}
 		{50F6820F-D058-4E68-9E15-801F893F514E} = {36A7DEB7-5F88-4BFB-B57E-79EEC9950E25}
+		{3A457B14-D91B-4FFF-A81A-8F350BDB911F} = {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {504DA352-6788-4DC0-8705-82167E72A4D3}
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildIndexHtmlCommand.cs b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildIndexHtmlCommand.cs
index 5f160d64f9..189a359b3c 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildIndexHtmlCommand.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildIndexHtmlCommand.cs
@@ -15,15 +15,11 @@ namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands
                 CommandOptionType.SingleValue);
 
             var references = command.Option("--reference",
-                "The path from the _bin folder to a given referenced dll file (Typically just the dll name)",
+                "The path from the _bin folder to a given referenced dll file (typically just the dll name)",
                 CommandOptionType.MultipleValue);
 
-            var jsReferences = command.Option("--js",
-                "Adds a <script> tag with the specified 'src' value",
-                CommandOptionType.MultipleValue);
-
-            var cssReferences = command.Option("--css",
-                "Adds a <link rel=stylesheet> tag with the specified 'href' value",
+            var embeddedResourcesSources = command.Option("--embedded-resources-source",
+                "The path to an assembly that may contain embedded resources (typically a referenced assembly in its pre-linked state)",
                 CommandOptionType.MultipleValue);
 
             var outputPath = command.Option("--output",
@@ -52,8 +48,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands
                         clientPage.Value(),
                         mainAssemblyPath.Value,
                         references.Values.ToArray(),
-                        jsReferences.Values.ToArray(),
-                        cssReferences.Values.ToArray(),
+                        embeddedResourcesSources.Values.ToArray(),
                         linkerEnabledFlag.HasValue(),
                         outputPath.Value());
                     return 0;
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs
new file mode 100644
index 0000000000..97331537f2
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Blazor.Build
+{
+    internal class EmbeddedResourceInfo
+    {
+        public EmbeddedResourceKind Kind { get; }
+        public string RelativePath { get; }
+
+        public EmbeddedResourceInfo(EmbeddedResourceKind kind, string relativePath)
+        {
+            Kind = kind;
+            RelativePath = relativePath;
+        }
+    }
+}
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs
new file mode 100644
index 0000000000..caf322ee15
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Blazor.Build
+{
+    internal enum EmbeddedResourceKind
+    {
+        JavaScript,
+        Css,
+        Static
+    }
+}
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs
new file mode 100644
index 0000000000..12e07e1d51
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs
@@ -0,0 +1,137 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Mono.Cecil;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Blazor.Build
+{
+    internal class EmbeddedResourcesProcessor
+    {
+        const string ContentSubdirName = "_content";
+
+        private readonly static Dictionary<string, EmbeddedResourceKind> _knownResourceKindsByNamePrefix = new Dictionary<string, EmbeddedResourceKind>
+        {
+            { "blazor:js:", EmbeddedResourceKind.JavaScript },
+            { "blazor:css:", EmbeddedResourceKind.Css },
+            { "blazor:file:", EmbeddedResourceKind.Static },
+        };
+
+        /// <summary>
+        /// Finds Blazor-specific embedded resources in the specified assemblies, writes them
+        /// to disk, and returns a description of those resources in dependency order.
+        /// </summary>
+        /// <param name="referencedAssemblyPaths">The paths to assemblies that may contain embedded resources.</param>
+        /// <param name="outputDir">The path to the directory where output is being written.</param>
+        /// <returns>A description of the embedded resources that were written to disk.</returns>
+        public static IReadOnlyList<EmbeddedResourceInfo> ExtractEmbeddedResources(
+            IEnumerable<string> referencedAssemblyPaths, string outputDir)
+        {
+            // Clean away any earlier state
+            var contentDir = Path.Combine(outputDir, ContentSubdirName);
+            if (Directory.Exists(contentDir))
+            {
+                Directory.Delete(contentDir, recursive: true);
+            }
+
+            // First, get an ordered list of AssemblyDefinition instances
+            var referencedAssemblyDefinitions = referencedAssemblyPaths
+                .Where(path => !Path.GetFileName(path).StartsWith("System.", StringComparison.Ordinal)) // Skip System.* because they are never going to contain embedded resources that we want
+                .Select(path => AssemblyDefinition.ReadAssembly(path))
+                .ToList();
+            referencedAssemblyDefinitions.Sort(OrderWithReferenceSubjectFirst);
+
+            // Now process them in turn
+            return referencedAssemblyDefinitions
+                .SelectMany(def => ExtractEmbeddedResourcesFromSingleAssembly(def, outputDir))
+                .ToList()
+                .AsReadOnly();
+        }
+
+        private static IEnumerable<EmbeddedResourceInfo> ExtractEmbeddedResourcesFromSingleAssembly(
+            AssemblyDefinition assemblyDefinition, string outputDirPath)
+        {
+            var assemblyName = assemblyDefinition.Name.Name;
+            foreach (var res in assemblyDefinition.MainModule.Resources)
+            {
+                if (TryExtractEmbeddedResource(assemblyName, res, outputDirPath, out var extractedResourceInfo))
+                {
+                    yield return extractedResourceInfo;
+                }
+            }
+        }
+
+        private static bool TryExtractEmbeddedResource(string assemblyName, Resource resource, string outputDirPath, out EmbeddedResourceInfo extractedResourceInfo)
+        {
+            if (resource is EmbeddedResource embeddedResource)
+            {
+                if (TryInterpretLogicalName(resource.Name, out var kind, out var name))
+                {
+                    // Prefix the output path with the assembly name to ensure no clashes
+                    // Also be invariant to the OS on which the package was built
+                    name = Path.Combine(ContentSubdirName, assemblyName, EnsureHasPathSeparators(name, Path.DirectorySeparatorChar));
+
+                    // Write the file content to disk, ensuring we don't try to write outside the output root
+                    var outputPath = Path.GetFullPath(Path.Combine(outputDirPath, name));
+                    if (!outputPath.StartsWith(outputDirPath))
+                    {
+                        throw new InvalidOperationException($"Cannot write embedded resource from assembly '{assemblyName}' to '{outputPath}' because it is outside the expected directory {outputDirPath}");
+                    }
+                    WriteResourceFile(embeddedResource, outputPath);
+
+                    // The URLs we write into the index.html file need to use web-style directory separators
+                    extractedResourceInfo = new EmbeddedResourceInfo(kind, EnsureHasPathSeparators(name, '/'));
+                    return true;
+                }
+            }
+
+            extractedResourceInfo = null;
+            return false;
+        }
+
+        private static void WriteResourceFile(EmbeddedResource resource, string outputPath)
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
+            using (var outputStream = File.OpenWrite(outputPath))
+            {
+                resource.GetResourceStream().CopyTo(outputStream);
+            }
+        }
+
+        private static string EnsureHasPathSeparators(string name, char desiredSeparatorChar) => name
+            .Replace('\\', desiredSeparatorChar)
+            .Replace('/', desiredSeparatorChar);
+
+        private static bool TryInterpretLogicalName(string logicalName, out EmbeddedResourceKind kind, out string resolvedName)
+        {
+            foreach (var kvp in _knownResourceKindsByNamePrefix)
+            {
+                if (logicalName.StartsWith(kvp.Key, StringComparison.Ordinal))
+                {
+                    kind = kvp.Value;
+                    resolvedName = logicalName.Substring(kvp.Key.Length);
+                    return true;
+                }
+            }
+
+            kind = default;
+            resolvedName = default;
+            return false;
+        }
+
+        // For each assembly B that references A, we want the resources from A to be loaded before
+        // the references for B (because B's resources might depend on A's resources)
+        private static int OrderWithReferenceSubjectFirst(AssemblyDefinition a, AssemblyDefinition b)
+            => AssemblyHasReference(a, b) ? 1
+            : AssemblyHasReference(b, a) ? -1
+            : 0;
+
+        private static bool AssemblyHasReference(AssemblyDefinition from, AssemblyDefinition to)
+            => from.MainModule.AssemblyReferences
+                .Select(reference => reference.Name)
+                .Contains(to.Name.Name, StringComparer.Ordinal);
+    }
+}
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Core/IndexHtmlWriter.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/IndexHtmlWriter.cs
index 6cc55de232..b401e6ce60 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Core/IndexHtmlWriter.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/IndexHtmlWriter.cs
@@ -19,8 +19,7 @@ namespace Microsoft.AspNetCore.Blazor.Build
             string path,
             string assemblyPath,
             IEnumerable<string> assemblyReferences,
-            IEnumerable<string> jsReferences,
-            IEnumerable<string> cssReferences,
+            IEnumerable<string> embeddedResourcesSources,
             bool linkerEnabled,
             string outputPath)
         {
@@ -31,7 +30,9 @@ namespace Microsoft.AspNetCore.Blazor.Build
             }
             var assemblyName = Path.GetFileNameWithoutExtension(assemblyPath);
             var entryPoint = GetAssemblyEntryPoint(assemblyPath);
-            var updatedContent = GetIndexHtmlContents(template, assemblyName, entryPoint, assemblyReferences, jsReferences, cssReferences, linkerEnabled);
+            var embeddedContent = EmbeddedResourcesProcessor.ExtractEmbeddedResources(
+                embeddedResourcesSources, Path.GetDirectoryName(outputPath));
+            var updatedContent = GetIndexHtmlContents(template, assemblyName, entryPoint, assemblyReferences, embeddedContent, linkerEnabled);
             var normalizedOutputPath = Normalize(outputPath);
             Console.WriteLine("Writing index to: " + normalizedOutputPath);
             File.WriteAllText(normalizedOutputPath, updatedContent);
@@ -101,8 +102,7 @@ namespace Microsoft.AspNetCore.Blazor.Build
             string assemblyName,
             string assemblyEntryPoint,
             IEnumerable<string> assemblyReferences,
-            IEnumerable<string> jsReferences,
-            IEnumerable<string> cssReferences,
+            IEnumerable<EmbeddedResourceInfo> embeddedContent,
             bool linkerEnabled)
         {
             var resultBuilder = new StringBuilder();
@@ -118,10 +118,11 @@ namespace Microsoft.AspNetCore.Blazor.Build
             while (true)
             {
                 var token = tokenizer.Get();
+                var tokenCharIndex = token.Position.Position - 1;
                 if (resumeOnNextToken)
                 {
                     resumeOnNextToken = false;
-                    currentRangeStartPos = token.Position.Position;
+                    currentRangeStartPos = tokenCharIndex;
                 }
 
                 switch (token.Type)
@@ -134,7 +135,7 @@ namespace Microsoft.AspNetCore.Blazor.Build
                             {
                                 // First, emit the original source text prior to this special tag, since
                                 // we want that to be unchanged
-                                resultBuilder.Append(htmlTemplate, currentRangeStartPos, token.Position.Position - currentRangeStartPos - 1);
+                                resultBuilder.Append(htmlTemplate, currentRangeStartPos, tokenCharIndex - currentRangeStartPos);
 
                                 // Instead of emitting the source text for this special tag, emit a fully-
                                 // configured Blazor boot script tag
@@ -149,11 +150,11 @@ namespace Microsoft.AspNetCore.Blazor.Build
                                 // Emit tags to reference any specified JS/CSS files
                                 AppendReferenceTags(
                                     resultBuilder,
-                                    cssReferences,
+                                    embeddedContent.Where(c => c.Kind == EmbeddedResourceKind.Css).Select(c => c.RelativePath),
                                     "<link rel=\"stylesheet\" href=\"{0}\" />");
                                 AppendReferenceTags(
                                     resultBuilder,
-                                    jsReferences,
+                                    embeddedContent.Where(c => c.Kind == EmbeddedResourceKind.JavaScript).Select(c => c.RelativePath),
                                     "<script src=\"{0}\" defer></script>");
 
                                 // Set a flag so we know not to emit anything else until the special
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets b/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
index 1be7c0a433..aa88f41f09 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
+++ b/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
@@ -227,8 +227,11 @@
 
       <!-- Index.html related paths and markers -->
 
+      <!-- /obj/<<configuration>>/<<targetframework>>/blazor/ -->
+      <BlazorIndexHtmlOutputDir>$(BlazorIntermediateOutputPath)</BlazorIndexHtmlOutputDir>
+
       <!-- /obj/<<configuration>>/<<targetframework>>/blazor/index.html -->
-      <BlazorIndexHtmlOutputPath>$(BlazorIntermediateOutputPath)$(BlazorOutputIndexHtmlName)</BlazorIndexHtmlOutputPath>
+      <BlazorIndexHtmlOutputPath>$(BlazorIndexHtmlOutputDir)$(BlazorOutputIndexHtmlName)</BlazorIndexHtmlOutputPath>
 
       <!-- /obj/<<configuration>>/<<targetframework>>/blazor/inputs.index.cache -->
       <BlazorBuildIndexInputsCache>$(BlazorIntermediateOutputPath)inputs.index.cache</BlazorBuildIndexInputsCache>
@@ -568,8 +571,6 @@
     <ItemGroup>
       <BlazorIndexHtmlInput Include="$(BlazorIndexHtml)" />
       <BlazorIndexHtmlInput Include="@(BlazorItemOutput->WithMetadataValue('Type','Assembly')->'%(FullPath)')" />
-      <BlazorIndexHtmlInput Include="@(BlazorPackageJsRef->'%(FullPath)')" />
-      <BlazorIndexHtmlInput Include="@(BlazorPackageCssRef->'%(FullPath)')" />
       <BlazorIndexHtmlInput Include="@(_BlazorLinkingOption)" />
     </ItemGroup>
 
@@ -588,26 +589,30 @@
   <Target
     Name="_GenerateBlazorIndexHtml"
     DependsOnTargets="_ResolveBlazorIndexHtmlInputs"
-    Inputs="$(BlazorBuildIndexInputsCache);$(BlazorIndexHtml)"
+    Inputs="$(BlazorBuildIndexInputsCache);$(BlazorIndexHtml);@(_BlazorDependencyInput)"
     Outputs="$(BlazorIndexHtmlOutputPath)">
     <ItemGroup>
+      <_UnlinkedAppReferencesPaths Include="@(_BlazorDependencyInput)" />
       <_AppReferences Include="@(BlazorItemOutput->WithMetadataValue('Type','Assembly')->WithMetadataValue('PrimaryOutput','')->'%(FileName)%(Extension)')" />
-      <_JsReferences Include="@(BlazorPackageJsRef->'_content/%(SourcePackage)/%(RecursiveDir)%(FileName)%(Extension)')" />
-      <_CssReferences Include="@(BlazorPackageCssRef->'_content/%(SourcePackage)/%(RecursiveDir)%(FileName)%(Extension)')" />
     </ItemGroup>
     <PropertyGroup>
       <_LinkerEnabledFlag Condition="'$(_BlazorShouldLinkApplicationAssemblies)' != ''">--linker-enabled</_LinkerEnabledFlag>
     </PropertyGroup>
 
-    <Exec Command="$(BlazorBuildExe) build @(IntermediateAssembly) --html-page &quot;$(BlazorIndexHtml)&quot; @(_AppReferences->'--reference &quot;%(Identity)&quot;', ' ') @(_JsReferences->'--js &quot;%(Identity)&quot;', ' ') @(_CssReferences->'--css &quot;%(Identity)&quot;', ' ') $(_LinkerEnabledFlag) --output &quot;$(BlazorIndexHtmlOutputPath)&quot;" />
+    <Exec Command="$(BlazorBuildExe) build @(IntermediateAssembly) --html-page &quot;$(BlazorIndexHtml)&quot; @(_AppReferences->'--reference &quot;%(Identity)&quot;', ' ') @(_UnlinkedAppReferencesPaths->'--embedded-resources-source &quot;%(Identity)&quot;', ' ') $(_LinkerEnabledFlag) --output &quot;$(BlazorIndexHtmlOutputPath)&quot;" />
 
     <ItemGroup Condition="Exists('$(BlazorIndexHtmlOutputPath)')">
       <_BlazorIndex Include="$(BlazorIndexHtmlOutputPath)" />
+      <_BlazorIndexEmbeddedContentFile Include="$(BlazorIndexHtmlOutputDir)_content\**\*.*" />
       <BlazorItemOutput Include="@(_BlazorIndex)">
         <TargetOutputPath>$(ProjectDir)$(OutputPath)dist/%(FileName)%(Extension)</TargetOutputPath>
         <Type>EntryPoint</Type>
       </BlazorItemOutput>
+      <BlazorItemOutput Include="@(_BlazorIndexEmbeddedContentFile)">
+        <TargetOutputPath>$(ProjectDir)$(OutputPath)dist/_content/%(RecursiveDir)%(FileName)%(Extension)</TargetOutputPath>
+      </BlazorItemOutput>
       <FileWrites Include="$(BlazorIndexHtmlOutputPath)" />
+      <FileWrites Include="@(_BlazorIndexEmbeddedContentFile)" />
     </ItemGroup>
 
   </Target>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/dotnetcli.host.json
new file mode 100644
index 0000000000..11797289ab
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/dotnetcli.host.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "http://json.schemastore.org/dotnetcli.host",
+  "symbolInfo": {
+    "skipRestore": {
+      "longName": "no-restore",
+      "shortName": ""
+    },
+    "Framework": {
+      "longName": "framework"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/icon.png b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..572a095fa0148ec6a1099954aea66034e423f170
GIT binary patch
literal 1196
zcmV;d1XKHoP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<VUP(kjRCr$Pms?1jR}_W6(V5X2td|;!FM0D8g@8pQZITBS8$=(}
zT9w$=OQ3a}2Q8-UOA663jiqTLZEZ}orCu;<Ar>u~D&|FO0`bz2g28CK5lu~T;%K7I
zjMKx02@`1oGq$zRE;#&$pP$)luf6s@b2JWzgWZG|y9~|4hYub9X$7<hAT>3We-ho@
z-Mg;9zl^~DCUj!&-n~2xOG`_CKY_aQ7jR;0YYUsriq&exzGX)w^YTWg)uGer)ZTpo
zGcwbkNkE{{XjA|#XaIb87Oa~#b~4Vrwg<M^t?2X;oPmJ>%F4>f%*-S$Elrl%V>BA+
z>gocJZ?#(Q9hX3Yn@lGB{QMXnAE%<Cf|ZpOoXF13VPk!r&L29No}Q+zu8!vBX3ERU
ziHnOvs{xzU?m2<t;$jXQI6!}YKQ%QqLg+;K34Xb81H0W$_UqXIOx?LdOmsBSYE_-C
z;?${A6crVbo}R9h0GrM3SqV~7QY3Q~oWQ_9nwwfUc<^PeUj3OImAw<j5+mI|b`uq~
zpT_T+2n!3Np`n4n!9l#dy@a^O9#Gkcp}zS1OMHEOSzlk5G6V+)<3vbEh|1E&>guX=
z!AGah5EK-|xpU{FYs5dE5a{XY!D6uhU@#QZ)YL>vOEaONp=@kyNKjP@dB()VaH;bW
zqobpoJ^KmE%gaKxv9S@rEfut`1OSnKb=AVno4?ZWeFqO7n8|zNm}KV)y?#v8dG+W~
zN>o|$3*O?&l`G`u=PPA2imbyu0&{b7M1)637pO%-!i(HpxXb>iC}Lw@!W9z}6N+3r
zC5955NKQ_sx3?EjKoP+1UI}E{MaM+ridBmRoleho`1|{_wzh^V!otEuC8sw$GNEO~
z;yTsvf8L)*j~=lNQg2`1=WxYu_wE6RPdqZAR;#72zmLq<GB8zDGBh;A{QNwVQ<IXJ
z5CeJMx;2ikj}No6v$VChk&~NE>%~?80s;c$dv{GJr{KcE0^c-z%i`i9*N3ljd*U|N
zu3e*}qn$s4Ss64jA(5|Y&r@PF$N?oJw;b*(kd%}Jz~a3{A|oToJC>(<yGE30yVy>9
zTL%|g+xYrIJ%H@1Os7du1gzFgDT^A(0Bm_eAS){iA0?~FROytEJ$v>z4Jt(RdOc?I
zGU4G7vUir`<cBB4cm{(39P-ZX5{Pq4OG~M)uIBv@-lO`=$MP;UHI0$c5e~g_2!Q&A
zdJ6IjoWZFyRmdNe!ootCp6c|JHub0r4j(>DPEHP!lamw{707HzN=&4oUSyZSGcz-z
z6bNVO{u1vLzs=a#7)OpAAtNJ$%a<=p@EzZb`uh5)t*v!RFXJ~~Wj!)H%+#GJd1p48
zMWNi>Tv>nh)l5uPuQFHdD4DxJCS`nlJjah8m$uvK-7t_Rp$Fat%482>N>vUSGW+)J
z69ojY348{8Dtk`|@DwOwA;6nJG7t;AfPmkD5#T4FQK@mC9pDe_gYO{3ZEQgR0000<
KMNUMnLSTZs^fHnF

literal 0
HcmV?d00001

diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/template.json
new file mode 100644
index 0000000000..45e3bf57b7
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/template.json
@@ -0,0 +1,70 @@
+{
+  "author": "Microsoft",
+  "classifications": [
+    "Web",
+    "Blazor",
+    "Content"
+  ],
+  "groupIdentity": "Microsoft.Web.Blazor.Content",
+  "identity": "Microsoft.Web.Blazor.Content.CSharp",
+  "name": "Blazor (content)",
+  "preferNameDirectory": true,
+  "primaryOutputs": [
+    {
+      "path": "BlazorContent.CSharp.csproj"
+    }
+  ],
+  "shortName": "blazorcontent",
+  "sourceName": "BlazorContent.CSharp",
+  "sources": [
+    {
+      "source": "./",
+      "target": "./",
+      "exclude": [
+        ".template.config/**"
+      ]
+    }
+  ],
+  "symbols": {
+    "Framework": {
+      "type": "parameter",
+      "description": "The target framework for the project.",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "netcoreapp2.0",
+          "description": "Target netcoreapp2.0"
+        }
+      ],
+      "replaces": "netcoreapp2.0",
+      "defaultValue": "netcoreapp2.0"
+    },
+    "HostIdentifier": {
+      "type": "bind",
+      "binding": "HostIdentifier"
+    },
+    "skipRestore": {
+      "type": "parameter",
+      "datatype": "bool",
+      "description": "If specified, skips the automatic restore of the project on create.",
+      "defaultValue": "false"
+    }
+  },
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  },
+  "postActions": [
+    {
+      "condition": "(!skipRestore)",
+      "description": "Restore NuGet packages required by this project.",
+      "manualInstructions": [
+        {
+          "text": "Run 'dotnet restore'"
+        }
+      ],
+      "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025",
+      "continueOnError": true
+    }
+  ]
+}
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/BlazorContent.CSharp.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/BlazorContent.CSharp.csproj
new file mode 100644
index 0000000000..6471993770
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/BlazorContent.CSharp.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.Web;Microsoft.NET.Sdk.Razor/2.1.0-preview2-30230">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <OutputType>library</OutputType>
+    <IsPackable>true</IsPackable>
+    <BlazorLinkOnBuild>false</BlazorLinkOnBuild>
+
+    <!-- This custom package feed is required only when using nightly builds of Blazor -->
+    <RestoreSources>https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;$(RestoreSources)</RestoreSources>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- .js/.css files will be referenced via <script>/<link> tags; other content files will just be included in the app's 'dist' directory without any tags referencing them -->
+    <EmbeddedResource Include="content\**\*.js" LogicalName="blazor:js:%(RecursiveDir)%(Filename)%(Extension)" />
+    <EmbeddedResource Include="content\**\*.css" LogicalName="blazor:css:%(RecursiveDir)%(Filename)%(Extension)" />
+    <EmbeddedResource Include="content\**" Exclude="**\*.js;**\*.css" LogicalName="blazor:file:%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.0-preview2-30230" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.2.0-preview1-10168" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.2.0-preview1-10168" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/Component1.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/Component1.cshtml
new file mode 100644
index 0000000000..e8cb655c24
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/Component1.cshtml
@@ -0,0 +1,3 @@
+<div class="my-component">
+    This Blazor component is defined in the <strong>BlazorContent.CSharp</strong> package.
+</div>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/ExampleJsInterop.cs b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/ExampleJsInterop.cs
new file mode 100644
index 0000000000..f51e06453a
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/ExampleJsInterop.cs
@@ -0,0 +1,15 @@
+using System;
+using Microsoft.AspNetCore.Blazor.Browser.Interop;
+
+namespace BlazorContent.CSharp
+{
+    public class ExampleJsInterop
+    {
+        public static string Prompt(string message)
+        {
+            return RegisteredFunction.Invoke<string>(
+                "BlazorContent.CSharp.ExampleJsInterop.Prompt",
+                message);
+        }
+    }
+}
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/background.png b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..e15a3bde6e2bdb380df6a0b46d7ed00bdeb0aaa8
GIT binary patch
literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1SGdsl%54rjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33
zJwr2>%=KS^ie7oTIEF;HpS|GCbyPusHSqiXaCu3qf)82(9Gq&mZq2{Kq}M*X&MWtJ
zSi1Jo7ZzfImg%g=t(qo=wsSR2lZoP(Rj#3wacN=q0?Br(rXzgZEGK2$ID{<T2$;Mw
zaJ?|$u#{tMJ9Cp2pFGQ6%R2&JUVLx~xc#taLEB+@$8vX$CcQolmbrZnEV6wOEN}Y?
zSeEK5Xvj|fBqCU2`0|3QfyLth_X#%=8x>|A=5S<cmu+&BUB)3*6rsH0eSt&3@rTU|
z%-f}#<Yeb@WLeJ<yi)K(`Nca9#|uXVTNhjw>{xJEuzSH>!M+7wSY6hB<=-E^*n0W7
S8wY^CX7F_Nb6Mw<&;$S{dxtsz

literal 0
HcmV?d00001

diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/exampleJsInterop.js b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/exampleJsInterop.js
new file mode 100644
index 0000000000..2398cacd8d
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/exampleJsInterop.js
@@ -0,0 +1,6 @@
+// This file is to show how a content package may provide JavaScript interop features
+// wrapped in a .NET API
+
+Blazor.registerFunction('BlazorContent.CSharp.ExampleJsInterop.Prompt', function (message) {
+    return prompt(message, 'Type anything here');
+});
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/styles.css b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/styles.css
new file mode 100644
index 0000000000..d968f70925
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/styles.css
@@ -0,0 +1,11 @@
+/*
+    This file is to show how CSS and other static resources (such as images) can be
+    used from a content project/package.
+*/
+
+.my-component {
+    border: 2px dashed red;
+    padding: 1em;
+    margin: 1em 0;
+    background-image: url('background.png');
+}
diff --git a/test/Microsoft.AspNetCore.Blazor.Build.Test/IndexHtmlWriterTest.cs b/test/Microsoft.AspNetCore.Blazor.Build.Test/IndexHtmlWriterTest.cs
index 6b5bdae3a1..e3ad517e12 100644
--- a/test/Microsoft.AspNetCore.Blazor.Build.Test/IndexHtmlWriterTest.cs
+++ b/test/Microsoft.AspNetCore.Blazor.Build.Test/IndexHtmlWriterTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using AngleSharp.Parser.Html;
+using System;
 using System.Linq;
 using Xunit;
 
@@ -27,15 +28,12 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
                     <script type='blazor-boot' custom1 custom2=""value"">some text that should be removed</script>
                 {htmlTemplateSuffix}";
             var assemblyReferences = new string[] { "System.Abc.dll", "MyApp.ClassLib.dll", };
-            var jsReferences = new string[] { "some/file.js", "another.js" };
-            var cssReferences = new string[] { "my/styles.css" };
             var instance = IndexHtmlWriter.GetIndexHtmlContents(
                 htmlTemplate,
                 "MyApp.Entrypoint",
                 "MyNamespace.MyType::MyMethod",
                 assemblyReferences,
-                jsReferences,
-                cssReferences,
+                Enumerable.Empty<EmbeddedResourceInfo>(),
                 linkerEnabled: true);
 
             // Act & Assert: Start and end is not modified (including formatting)
@@ -57,16 +55,6 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             Assert.Equal(string.Empty, scriptElem.Attributes["custom1"].Value);
             Assert.Equal("value", scriptElem.Attributes["custom2"].Value);
             Assert.Equal("true", scriptElem.Attributes["linker-enabled"].Value);
-
-            // Assert: Also contains script tags referencing JS files
-            Assert.Equal(
-                scriptElems.Skip(1).Select(tag => tag.GetAttribute("src")),
-                jsReferences);
-
-            // Assert: Also contains link tags referencing CSS files
-            Assert.Equal(
-                linkElems.Select(tag => tag.GetAttribute("href")),
-                cssReferences);
         }
 
         [Fact]
@@ -79,10 +67,50 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             var cssReferences = new string[] { "my/styles.css" };
 
             var content = IndexHtmlWriter.GetIndexHtmlContents(
-                htmlTemplate, "MyApp.Entrypoint", "MyNamespace.MyType::MyMethod", assemblyReferences, jsReferences, cssReferences, linkerEnabled: true);
+                htmlTemplate, "MyApp.Entrypoint", "MyNamespace.MyType::MyMethod", assemblyReferences, Enumerable.Empty<EmbeddedResourceInfo>(), linkerEnabled: true);
 
             // Assert
             Assert.Equal(htmlTemplate, content);
         }
+
+        [Fact]
+        public void InjectsAdditionalTagsForEmbeddedContent()
+        {
+            // Arrange
+            var htmlTemplate = "Start <script id='testboot' type='blazor-boot'></script> End";
+            var embeddedContent = new[]
+            {
+                new EmbeddedResourceInfo(EmbeddedResourceKind.Static, "my/static/file"),
+                new EmbeddedResourceInfo(EmbeddedResourceKind.Css, "css/first.css"),
+                new EmbeddedResourceInfo(EmbeddedResourceKind.JavaScript, "javascript/first.js"),
+                new EmbeddedResourceInfo(EmbeddedResourceKind.Css, "css/second.css"),
+                new EmbeddedResourceInfo(EmbeddedResourceKind.JavaScript, "javascript/second.js"),
+            };
+
+            // Act
+            var resultHtml = IndexHtmlWriter.GetIndexHtmlContents(
+                htmlTemplate,
+                "MyApp.Entrypoint",
+                "MyNamespace.MyType::MyMethod",
+                assemblyReferences: new[] { "Something.dll" },
+                embeddedContent: embeddedContent,
+                linkerEnabled: true);
+
+            // Assert
+            var parsedHtml = new HtmlParser().Parse(resultHtml);
+            var blazorBootScript = parsedHtml.GetElementById("testboot");
+            Assert.NotNull(blazorBootScript);
+            Assert.Equal(
+                "Start "
+                + blazorBootScript.OuterHtml
+                 // First we insert the CSS file tags in order
+                + Environment.NewLine + "<link rel=\"stylesheet\" href=\"css/first.css\" />"
+                + Environment.NewLine + "<link rel=\"stylesheet\" href=\"css/second.css\" />"
+                // Then the JS file tags in order, each with 'defer'
+                + Environment.NewLine + "<script src=\"javascript/first.js\" defer></script>"
+                + Environment.NewLine + "<script src=\"javascript/second.js\" defer></script>"
+                + " End",
+                resultHtml);
+        }
     }
 }
diff --git a/test/testapps/BasicTestApp/BasicTestApp.csproj b/test/testapps/BasicTestApp/BasicTestApp.csproj
index 3b8e844999..20dcbff895 100644
--- a/test/testapps/BasicTestApp/BasicTestApp.csproj
+++ b/test/testapps/BasicTestApp/BasicTestApp.csproj
@@ -13,11 +13,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Blazor.Browser\Microsoft.AspNetCore.Blazor.Browser.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Blazor\Microsoft.AspNetCore.Blazor.csproj" />
-  </ItemGroup>
-
-  <!-- Local alternative to <PackageReference> to the content package -->
-  <Import Project="..\TestContentPackage\build\TestContentPackage.props" />
-  <ItemGroup>
     <ProjectReference Include="..\TestContentPackage\TestContentPackage.csproj" />
   </ItemGroup>
   
diff --git a/test/testapps/TestContentPackage/TestContentPackage.csproj b/test/testapps/TestContentPackage/TestContentPackage.csproj
index bcfa81a9fb..d2f293ab15 100644
--- a/test/testapps/TestContentPackage/TestContentPackage.csproj
+++ b/test/testapps/TestContentPackage/TestContentPackage.csproj
@@ -7,9 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Remove="**" />
-    <Content Include="build\**" PackagePath="build" />
-    <Content Include="content\**" PackagePath="content" />
+    <!-- .js files will be referenced via <script> tags -->
+    <EmbeddedResource Include="content\**\*.js" LogicalName="blazor:js:%(RecursiveDir)%(Filename)%(Extension)" />
+
+    <!-- .css files will be referenced via <link rel='Stylesheet'> tags -->
+    <EmbeddedResource Include="content\**\*.css" LogicalName="blazor:css:%(RecursiveDir)%(Filename)%(Extension)" />
+    
+    <!-- Any other files will be included in the 'dist' output but without any tags referencing them -->
+    <EmbeddedResource Include="content\**" Exclude="**\*.js;**\*.css" LogicalName="blazor:file:%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/testapps/TestContentPackage/build/TestContentPackage.props b/test/testapps/TestContentPackage/build/TestContentPackage.props
deleted file mode 100644
index fc24a60c2b..0000000000
--- a/test/testapps/TestContentPackage/build/TestContentPackage.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- Update this to match your package ID exactly -->
-    <_PackageId>TestContentPackage</_PackageId>
-    <_ContentDir>$(MSBuildThisFileDirectory)..\content\</_ContentDir>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- All files under "content" will be included with the Blazor app build output -->
-    <BlazorPackageContentFile Include="$(_ContentDir)**" SourcePackage="$(_PackageId)" />
-
-    <!-- We'll generate a <script> tag importing each of the following JavaScript files -->
-    <!-- Change the "Include" pattern if you don't want to include all .js files. -->
-    <BlazorPackageJsRef Include="$(_ContentDir)**\*.js" SourcePackage="$(_PackageId)" />
-
-    <!-- We'll generate a <link> tag importing each of the following CSS files -->
-    <!-- Change the "Include" pattern if you don't want to include all .css files. -->
-    <BlazorPackageCssRef Include="$(_ContentDir)**\*.css" SourcePackage="$(_PackageId)" />
-  </ItemGroup>
-</Project>