Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Copyright (c) .NET Foundation. All rights reserved.
<StaticWebAssetsGetPublishAssetsTargets>ComputeFilesToPublish;GetCurrentProjectPublishStaticWebAssetItems</StaticWebAssetsGetPublishAssetsTargets>
<StaticWebAssetsAdditionalPublishProperties>$(StaticWebAssetsAdditionalPublishProperties);BuildProjectReferences=false;ResolveAssemblyReferencesFindRelatedSatellites=true;_PublishingBlazorWasmProject=true</StaticWebAssetsAdditionalPublishProperties>
<StaticWebAssetsAdditionalPublishPropertiesToRemove>$(StaticWebAssetsAdditionalPublishPropertiesToRemove);NoBuild;RuntimeIdentifier</StaticWebAssetsAdditionalPublishPropertiesToRemove>

</PropertyGroup>

<Import Sdk="Microsoft.NET.Sdk.Razor" Project="Sdk.props" />
Expand Down
13 changes: 13 additions & 0 deletions src/BlazorWasmSdk/Tasks/BootJsonData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,19 @@ public class ResourcesData
/// </summary>
[DataMember(EmitDefaultValue = false)]
public ResourceHashesByNameDictionary lazyAssembly { get; set; }

/// <summary>
/// JavaScript module initializers that Blazor will be in charge of loading.
/// </summary>
[DataMember(EmitDefaultValue = false)]
public ResourceHashesByNameDictionary libraryInitializers { get; set; }

/// <summary>
/// Extensions created by users customizing the initialization process. The format of the file(s)
/// is up to the user.
/// </summary>
[DataMember(EmitDefaultValue = false)]
public Dictionary<string, ResourceHashesByNameDictionary> extensions { get; set; }
}

public enum ICUDataMode
Expand Down
105 changes: 28 additions & 77 deletions src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,18 +149,37 @@ public void WriteBootJson(Stream output, string entryAssemblyName)
Log.LogMessage("Candidate '{0}' is defined as a native application resource.", resource.ItemSpec);
resourceList = resourceData.runtime;
}
else if (string.Equals("JSModule", assetTraitName, StringComparison.OrdinalIgnoreCase) &&
string.Equals(assetTraitValue, "JSLibraryModule", StringComparison.OrdinalIgnoreCase))
{
Log.LogMessage("Candidate '{0}' is defined as a library initializer resource.", resource.ItemSpec);
resourceData.libraryInitializers ??= new();
resourceList = resourceData.libraryInitializers;
AddResourceToList(resource, resourceList, resource.GetMetadata("TargetPath"));
continue;
}
else if (string.Equals("BlazorWebAssemblyResource", assetTraitName, StringComparison.OrdinalIgnoreCase) &&
assetTraitValue.StartsWith("extension:", StringComparison.OrdinalIgnoreCase))
{
Log.LogMessage("Candidate '{0}' is defined as an extension resource '{1}'.", resource.ItemSpec, assetTraitValue);
var extensionName = assetTraitValue.Substring("extension:".Length);
resourceData.extensions ??= new();
if (!resourceData.extensions.TryGetValue(extensionName, out resourceList))
{
resourceList = new();
resourceData.extensions[extensionName] = resourceList;
}
AddResourceToList(resource, resourceList, resource.GetMetadata("TargetPath"));
continue;
}
else
{
Log.LogMessage("Skipping resource '{0}' since it doesn't belong to a defined category.", resource.ItemSpec);
// This should include items such as XML doc files, which do not need to be recorded in the manifest.
continue;
}

if (!resourceList.ContainsKey(resourceName))
{
Log.LogMessage("Added resource '{0}' to the manifest.", resource.ItemSpec);
resourceList.Add(resourceName, $"sha256-{resource.GetMetadata("FileHash")}");
}
AddResourceToList(resource, resourceList, resourceName);
}

if (remainingLazyLoadAssemblies.Count > 0)
Expand Down Expand Up @@ -192,88 +211,20 @@ public void WriteBootJson(Stream output, string entryAssemblyName)
}
}

ListManifestContents(result);

var serializer = new DataContractJsonSerializer(typeof(BootJsonData), new DataContractJsonSerializerSettings
{
UseSimpleDictionaryFormat = true
});

using var writer = JsonReaderWriterFactory.CreateJsonWriter(output, Encoding.UTF8, ownsStream: false, indent: true);
serializer.WriteObject(writer, result);
}

private void ListManifestContents(BootJsonData result)
{
if (result.resources.assembly == null || result.resources.assembly.Count == 0)
{
Log.LogMessage("No assemblies defined.");
}
else
{
foreach (var assembly in result.resources.assembly)
{
Log.LogMessage("Assembly: '{0}' with hash '{1}'", assembly.Key, assembly.Value);
}
}

if (result.resources.lazyAssembly == null || result.resources.lazyAssembly.Count == 0)
{
Log.LogMessage("No lazy loaded assemblies defined.");
}
else
{
foreach (var lazyAssembly in result.resources.lazyAssembly)
{
Log.LogMessage("Lazy loaded assembly: '{0}' with hash '{1}'", lazyAssembly.Key, lazyAssembly.Value);
}
}

if (result.resources.pdb == null || result.resources.pdb.Count == 0)
{
Log.LogMessage("No debug symbol files defined.");
}
else
void AddResourceToList(ITaskItem resource, ResourceHashesByNameDictionary resourceList, string resourceKey)
{
foreach (var symbol in result.resources.pdb)
if (!resourceList.ContainsKey(resourceKey))
{
Log.LogMessage("Lazy loaded assembly: '{0}' with hash '{1}'", symbol.Key, symbol.Value);
}
}

if (result.resources.runtime == null || result.resources.runtime.Count == 0)
{
Log.LogMessage("No runtime resources defined.");
}
else
{
foreach (var native in result.resources.runtime)
{
Log.LogMessage("Runtime resource: '{0}' with hash '{1}'", native.Key, native.Value);
}
}

if (result.resources.satelliteResources == null || result.resources.satelliteResources.Count == 0)
{
Log.LogMessage("No satellite resources defined.");
}
else
{
foreach (var pair in result.resources.satelliteResources)
{
var language = pair.Key;
var resources = pair.Value;
if (resources.Count == 0)
{
Log.LogMessage("No satellite resources defined for '{0}'.", language);
}
else
{
foreach (var assembly in resources)
{
Log.LogMessage("Satellite assembly: '{0}' with hash '{1}' for culture '{2}'", assembly.Key, assembly.Value, language);
}
}
Log.LogMessage("Added resource '{0}' to the manifest.", resource.ItemSpec);
resourceList.Add(resourceKey, $"sha256-{resource.GetMetadata("FileHash")}");
}
}
}
Expand Down
Loading