From 8e592cef0b14cf9a587975404470c6f928c5e3fc Mon Sep 17 00:00:00 2001 From: jacalvar Date: Wed, 3 Aug 2022 17:49:50 +0200 Subject: [PATCH 1/9] Account for the crypto-worker-js file from the runtime at build time --- ...soft.NET.Sdk.BlazorWebAssembly.6_0.targets | 3 ++ src/BlazorWasmSdk/Tasks/BootJsonData.cs | 8 +++ .../Tasks/ComputeBlazorBuildAssets.cs | 24 ++++++++- .../GenerateBlazorWebAssemblyBootJson.cs | 49 ++++++++++++++++++- 4 files changed, 81 insertions(+), 3 deletions(-) diff --git a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets index dc1f9d2d8292..3a9c9d65ea1f 100644 --- a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets +++ b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets @@ -157,6 +157,9 @@ Copyright (c) .NET Foundation. All rights reserved. + + [DataMember(EmitDefaultValue = false)] public Dictionary extensions { get; set; } + + /// + /// Extensions created by users customizing the initialization process. The format of the file(s) + /// is up to the user. + /// + [DataMember(EmitDefaultValue = false)] + public Dictionary additionalAssets { get; set; } + } public enum ICUDataMode : int diff --git a/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs b/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs index 5dd6c89fe77a..888e3c73f5c1 100644 --- a/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs +++ b/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs @@ -118,6 +118,28 @@ public override bool Execute() assetCandidates.Add(newDotNetJs); continue; } + else if(candidate.GetMetadata("FileName") == "dotnet-crypto-worker" && candidate.GetMetadata("Extension") == ".js") + { + var itemHash = FileHasher.GetFileHash(candidate.ItemSpec); + var cacheBustedDotNetCryptoWorkerJSFileName = $"dotnet-crypto-worker.{itemHash}.js"; + + var originalFileFullPath = Path.GetFullPath(candidate.ItemSpec); + var originalFileDirectory = Path.GetDirectoryName(originalFileFullPath); + + var cacheBustedDotNetCryptoWorkerJSFullPath = Path.Combine(originalFileDirectory, cacheBustedDotNetCryptoWorkerJSFileName); + + var newDotnetCryptoWorkerJs = new TaskItem(cacheBustedDotNetCryptoWorkerJSFullPath, candidate.CloneCustomMetadata()); + newDotnetCryptoWorkerJs.SetMetadata("OriginalItemSpec", candidate.ItemSpec); + + var newRelativePath = $"_framework/{cacheBustedDotNetCryptoWorkerJSFileName}"; + newDotnetCryptoWorkerJs.SetMetadata("RelativePath", newRelativePath); + + newDotnetCryptoWorkerJs.SetMetadata("AssetTraitName", "BlazorWebAssemblyResource"); + newDotnetCryptoWorkerJs.SetMetadata("AssetTraitValue", "js-module-crypto"); + + assetCandidates.Add(newDotnetCryptoWorkerJs); + continue; + } else if (string.IsNullOrEmpty(destinationSubPath)) { var relativePath = candidate.GetMetadata("FileName") + candidate.GetMetadata("Extension"); @@ -280,7 +302,7 @@ public static bool ShouldFilterCandidate( ".dat" when invariantGlobalization && fileName.StartsWith("icudt") => "invariant globalization is enabled", ".json" when fromMonoPackage && (fileName == "emcc-props" || fileName == "package") => $"{fileName}{extension} is not used by Blazor", ".ts" when fromMonoPackage && fileName == "dotnet.d" => "dotnet type definition is not used by Blazor", - ".js" when assetType == "native" && fileName != "dotnet" => $"{fileName}{extension} is not used by Blazor", + ".js" when assetType == "native" && fileName != "dotnet" && fileName != "dotnet-crypto-worker" => $"{fileName}{extension} is not used by Blazor", ".pdb" when !copySymbols => "copying symbols is disabled", ".symbols" when fromMonoPackage => "extension .symbols is not required.", _ => null diff --git a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs index 6577000b0881..b37b10c1eae4 100644 --- a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs +++ b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs @@ -8,6 +8,7 @@ using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.Serialization; using System.Runtime.Serialization.Json; using System.Text; using Microsoft.Build.Framework; @@ -99,9 +100,11 @@ public void WriteBootJson(Stream output, string entryAssemblyName) var resourceData = result.resources; foreach (var resource in Resources) { - ResourceHashesByNameDictionary resourceList; + ResourceHashesByNameDictionary resourceList = null; + string behavior = null; var fileName = resource.GetMetadata("FileName"); + var fileExtension = resource.GetMetadata("Extension"); var assetTraitName = resource.GetMetadata("AssetTraitName"); var assetTraitValue = resource.GetMetadata("AssetTraitValue"); var resourceName = Path.GetFileName(resource.GetMetadata("RelativePath")); @@ -149,6 +152,12 @@ public void WriteBootJson(Stream output, string entryAssemblyName) string.Equals(assetTraitValue, "native", StringComparison.OrdinalIgnoreCase)) { Log.LogMessage(MessageImportance.Low, "Candidate '{0}' is defined as a native application resource.", resource.ItemSpec); + if (string.Equals(fileName, "dotnet", StringComparison.OrdinalIgnoreCase) && + string.Equals(fileExtension, ".wasm", StringComparison.OrdinalIgnoreCase)) + { + behavior = "dotnetwasm"; + } + resourceList = resourceData.runtime; } else if (string.Equals("JSModule", assetTraitName, StringComparison.OrdinalIgnoreCase) && @@ -161,6 +170,10 @@ public void WriteBootJson(Stream output, string entryAssemblyName) Debug.Assert(!string.IsNullOrEmpty(targetPath), "Target path for '{0}' must exist.", resource.ItemSpec); AddResourceToList(resource, resourceList, targetPath); continue; + }else if(string.Equals(assetTraitName, "BlazorWebAssemblyResource", StringComparison.OrdinalIgnoreCase) && + string.Equals(assetTraitValue, "js-module-crypto", StringComparison.OrdinalIgnoreCase)) + { + behavior = assetTraitValue; } else if (string.Equals("BlazorWebAssemblyResource", assetTraitName, StringComparison.OrdinalIgnoreCase) && assetTraitValue.StartsWith("extension:", StringComparison.OrdinalIgnoreCase)) @@ -185,7 +198,16 @@ public void WriteBootJson(Stream output, string entryAssemblyName) continue; } - AddResourceToList(resource, resourceList, resourceName); + if (resourceList != null) + { + AddResourceToList(resource, resourceList, resourceName); + } + + if (!string.IsNullOrEmpty(behavior)) + { + resourceData.additionalAssets ??= new Dictionary(); + AddToAdditionalResources(resource, resourceData.additionalAssets, resourceName, behavior); + } } if (remainingLazyLoadAssemblies.Count > 0) @@ -235,9 +257,32 @@ void AddResourceToList(ITaskItem resource, ResourceHashesByNameDictionary resour } } + private void AddToAdditionalResources(ITaskItem resource, Dictionary additionalResources, string resourceName, string behavior) + { + if (!additionalResources.ContainsKey(resourceName)) + { + Log.LogMessage(MessageImportance.Low, "Added resource '{0}' to the list of additional assets in the manifest.", resource.ItemSpec); + additionalResources.Add(resourceName, new AdditionalAsset + { + Hash = $"sha256-{resource.GetMetadata("FileHash")}", + Behavior = behavior + }); + } + } + private bool TryGetLazyLoadedAssembly(string fileName, out ITaskItem lazyLoadedAssembly) { return (lazyLoadedAssembly = LazyLoadedAssemblies?.SingleOrDefault(a => a.ItemSpec == fileName)) != null; } } + + [DataContract] + public class AdditionalAsset + { + [DataMember(Name = "hash")] + public string Hash { get; set; } + + [DataMember(Name = "behavior")] + public string Behavior { get; set; } + } } From 836b9ac9901602b97c87a53732f7c38464e58935 Mon Sep 17 00:00:00 2001 From: jacalvar Date: Wed, 3 Aug 2022 17:55:10 +0200 Subject: [PATCH 2/9] Update baselines --- ...ootJsonManifest.Build.staticwebassets.json | 104 ++++++++++++------ ...iesAreCopiedToBuildOutput.Build.files.json | 11 +- ...edToBuildOutput.Build.staticwebassets.json | 104 ++++++++++++------ ...duleTargetPaths.Build.staticwebassets.json | 104 ++++++++++++------ ...izeBlazorInitialization.Publish.files.json | 14 +-- ...nitialization.Publish.staticwebassets.json | 104 +++++++++--------- ...tBuildAndPublishModules.Publish.files.json | 14 +-- ...ublishModules.Publish.staticwebassets.json | 104 +++++++++--------- ...izeBlazorInitialization.Publish.files.json | 8 +- ...nitialization.Publish.staticwebassets.json | 104 +++++++++--------- .../Publish60Hosted_Works.Publish.files.json | 2 +- ...0Hosted_Works.Publish.staticwebassets.json | 2 +- ...nBlazorBootJsonManifest.Publish.files.json | 14 +-- ...tJsonManifest.Publish.staticwebassets.json | 104 +++++++++--------- ...Assets_BuildMinimal_Works.Build.files.json | 11 +- ...ldMinimal_Works.Build.staticwebassets.json | 104 ++++++++++++------ ...Assets_Build_Hosted_Works.Build.files.json | 8 +- ...ld_Hosted_Works.Build.staticwebassets.json | 104 ++++++++++++------ ...ts_PublishMinimal_Works.Publish.files.json | 14 +-- ...Minimal_Works.Publish.staticwebassets.json | 104 +++++++++--------- ...mentationFiles_AsAssets.Publish.files.json | 8 +- ...iles_AsAssets.Publish.staticwebassets.json | 104 +++++++++--------- ...ts_Publish_Hosted_Works.Publish.files.json | 8 +- ..._Hosted_Works.Publish.staticwebassets.json | 104 +++++++++--------- 24 files changed, 770 insertions(+), 592 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json index f613de16dda5..7109e3d86b79 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json @@ -1869,23 +1869,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll", "SourceId": "blazorwasm-minimal", @@ -2209,6 +2192,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm-minimal", @@ -3297,6 +3297,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm-minimal.pdb" }, + { + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet-crypto-worker.js" + }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm-minimal", @@ -5303,23 +5320,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Uri.dll.gz]]", "SourceId": "blazorwasm-minimal", @@ -5643,6 +5643,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "SourceId": "blazorwasm-minimal", @@ -6714,6 +6731,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", @@ -6919,4 +6953,4 @@ "OriginalItemSpec": "wwwroot\\index.html" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json index f76582e4b82a..513ba2cf94ef 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json @@ -225,8 +225,6 @@ "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll.gz", - "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Xml.Linq.dll", @@ -265,6 +263,8 @@ "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll.gz", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", @@ -404,6 +404,8 @@ "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.CSharp.resources.dll.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll.gz", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", @@ -585,7 +587,6 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.ObjectModel.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.CoreLib.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.DataContractSerialization.dll.gz]]", - "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Uri.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Xml.Linq.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Xml.dll.gz]]", @@ -605,6 +606,7 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.CompilerServices.VisualC.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.Extensions.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.Handles.dll.gz]]", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.Intrinsics.dll.gz]]", @@ -674,6 +676,7 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/cs/Microsoft.CodeAnalysis.resources.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/de/Microsoft.CodeAnalysis.CSharp.resources.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/de/Microsoft.CodeAnalysis.resources.dll.gz]]", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.timezones.blat.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.wasm.gz]]", @@ -711,4 +714,4 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\my-service-worker.js", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\serviceworkers\\my-service-worker.js", "${ProjectPath}\\blazorwasm\\wwwroot\\js\\LinkedScript.js" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json index 06e144a0dd63..14f02c1ba842 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json @@ -2001,23 +2001,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll", "SourceId": "blazorwasm", @@ -2341,6 +2324,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm", @@ -3531,6 +3531,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.codeanalysis.common\\[[CustomPackageVersion]]\\lib\\netstandard2.0\\de\\Microsoft.CodeAnalysis.resources.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet-crypto-worker.js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm", @@ -6013,23 +6030,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Uri.dll.gz]]", "SourceId": "blazorwasm", @@ -6353,6 +6353,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "SourceId": "blazorwasm", @@ -7526,6 +7543,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", @@ -8241,4 +8275,4 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json index 60b9beae8c1d..c54897061e4c 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json @@ -1950,23 +1950,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll", "SourceId": "blazorwasm", @@ -2290,6 +2273,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm", @@ -3378,6 +3378,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm.pdb" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet-crypto-worker.js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm", @@ -5418,23 +5435,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Uri.dll.gz]]", "SourceId": "blazorwasm", @@ -5758,6 +5758,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "SourceId": "blazorwasm", @@ -6829,6 +6846,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", @@ -7136,4 +7170,4 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json index 03db6a720405..7018d92f734a 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json @@ -131,9 +131,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.gz", @@ -155,6 +152,9 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", @@ -326,8 +326,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.ObjectModel.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.CoreLib.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.CoreLib.dll.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Reflection.Emit.ILGeneration.dll.br]]", @@ -342,6 +340,8 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.CompilerServices.Unsafe.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Extensions.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Extensions.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", @@ -426,7 +426,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Net.Http.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.ObjectModel.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Reflection.Emit.ILGeneration.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Reflection.Emit.Lightweight.dll", @@ -434,6 +433,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Resources.ResourceManager.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.CompilerServices.Unsafe.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.dll", @@ -448,4 +448,4 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.extension.txt" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json index 63e96cbac5c8..79088e64237f 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json @@ -1733,40 +1733,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2005,6 +1971,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -3433,23 +3433,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "SourceId": "blazorwasm-minimal", @@ -3569,6 +3552,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm-minimal", @@ -3859,4 +3859,4 @@ "OriginalItemSpec": "wwwroot\\index.html" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json index be6e66a5b0c4..b233bfc003f3 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json @@ -128,9 +128,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.gz", @@ -152,6 +149,9 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", @@ -321,8 +321,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.ObjectModel.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.CoreLib.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.CoreLib.dll.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Reflection.Emit.ILGeneration.dll.br]]", @@ -337,6 +335,8 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.CompilerServices.Unsafe.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Extensions.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Extensions.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", @@ -421,7 +421,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Net.Http.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.ObjectModel.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Reflection.Emit.ILGeneration.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Reflection.Emit.Lightweight.dll", @@ -429,6 +428,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Resources.ResourceManager.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.CompilerServices.Unsafe.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.dll", @@ -442,4 +442,4 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json index 43192307f447..d5ea4244332c 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json @@ -1699,40 +1699,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -1971,6 +1937,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -3399,23 +3399,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "SourceId": "blazorwasm-minimal", @@ -3535,6 +3518,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm-minimal", @@ -3808,4 +3808,4 @@ "OriginalItemSpec": "wwwroot\\index.html" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json index 5562d2ea0e5b..ddaed723da46 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json @@ -138,9 +138,6 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.gz", @@ -162,6 +159,9 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", @@ -236,4 +236,4 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\index.html", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\serviceworkers\\my-service-worker.js", "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json index cbf8c36caf21..ed16fdfff3d2 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json @@ -1848,40 +1848,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "SourceId": "blazorwasm", @@ -2120,6 +2086,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "SourceId": "blazorwasm", @@ -3582,23 +3582,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "SourceId": "blazorwasm", @@ -3718,6 +3701,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm", @@ -4059,4 +4059,4 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json index d9f7ff523947..53d0f5a7027c 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json @@ -115,4 +115,4 @@ "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\css\\app.css", "${OutputPath}\\wwwroot\\index.html" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json index fd4c70fda5ca..342e49aad46d 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json @@ -2001,4 +2001,4 @@ "OriginalItemSpec": "wwwroot\\index.html" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json index be6e66a5b0c4..b233bfc003f3 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json @@ -128,9 +128,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.gz", @@ -152,6 +149,9 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", @@ -321,8 +321,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.ObjectModel.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.CoreLib.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.CoreLib.dll.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Reflection.Emit.ILGeneration.dll.br]]", @@ -337,6 +335,8 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.CompilerServices.Unsafe.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Extensions.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Extensions.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", @@ -421,7 +421,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Net.Http.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.ObjectModel.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Reflection.Emit.ILGeneration.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Reflection.Emit.Lightweight.dll", @@ -429,6 +428,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Resources.ResourceManager.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.CompilerServices.Unsafe.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.dll", @@ -442,4 +442,4 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json index 837937495d27..04939de63ca6 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json @@ -1699,40 +1699,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -1971,6 +1937,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -3399,23 +3399,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "SourceId": "blazorwasm-minimal", @@ -3535,6 +3518,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm-minimal", @@ -3808,4 +3808,4 @@ "OriginalItemSpec": "wwwroot\\index.html" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json index 5081fa34f878..d4b8aee13419 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json @@ -217,8 +217,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Xml.Linq.dll", @@ -257,6 +255,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", @@ -384,6 +384,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", @@ -511,7 +513,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.ObjectModel.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.CoreLib.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.DataContractSerialization.dll.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Uri.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Xml.Linq.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Xml.dll.gz]]", @@ -531,6 +532,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.CompilerServices.VisualC.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.Extensions.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.Handles.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.Intrinsics.dll.gz]]", @@ -594,6 +596,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazor.webassembly.js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.timezones.blat.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.wasm.gz]]", @@ -605,4 +608,4 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/netstandard.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\blazorwasm-minimal.styles.css", "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\blazorwasm-minimal.bundle.scp.css" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json index 29a81316210a..5815d2d90fdf 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json @@ -1869,23 +1869,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll", "SourceId": "blazorwasm-minimal", @@ -2209,6 +2192,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm-minimal", @@ -3297,6 +3297,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm-minimal.pdb" }, + { + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet-crypto-worker.js" + }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm-minimal", @@ -5303,23 +5320,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Uri.dll.gz]]", "SourceId": "blazorwasm-minimal", @@ -5643,6 +5643,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "SourceId": "blazorwasm-minimal", @@ -6714,6 +6731,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", @@ -6953,4 +6987,4 @@ "OriginalItemSpec": "wwwroot\\index.html" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json index 4fa6ce673d6b..504c20cd023a 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json @@ -221,8 +221,6 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll.gz", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Xml.Linq.dll", @@ -261,6 +259,8 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", @@ -388,6 +388,8 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", @@ -409,4 +411,4 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\custom-service-worker-assets.js", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\serviceworkers\\my-service-worker.js", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\serviceworkers\\my-service-worker.js" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json index 849dfc6300af..52bc54dcb1cf 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json @@ -1933,23 +1933,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll", "SourceId": "blazorwasm", @@ -2273,6 +2256,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm", @@ -3361,6 +3361,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm.pdb" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet-crypto-worker.js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm", @@ -5401,23 +5418,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Uri.dll.gz]]", "SourceId": "blazorwasm", @@ -5741,6 +5741,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "SourceId": "blazorwasm", @@ -6812,6 +6829,23 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", @@ -7085,4 +7119,4 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json index ac429ea98d12..d432484c3064 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json @@ -128,9 +128,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.gz", @@ -152,6 +149,9 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", @@ -324,8 +324,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.ObjectModel.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.CoreLib.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.CoreLib.dll.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Reflection.Emit.ILGeneration.dll.br]]", @@ -340,6 +338,8 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.CompilerServices.Unsafe.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Extensions.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Extensions.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", @@ -424,7 +424,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Net.Http.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.ObjectModel.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Reflection.Emit.ILGeneration.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Reflection.Emit.Lightweight.dll", @@ -432,6 +431,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Resources.ResourceManager.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.CompilerServices.Unsafe.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.dll", @@ -447,4 +447,4 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\blazorwasm-minimal.styles.css", "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\blazorwasm-minimal.bundle.scp.css" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json index f001b85a904f..df6cbbe619cb 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json @@ -1699,40 +1699,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -1971,6 +1937,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -3433,23 +3433,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "SourceId": "blazorwasm-minimal", @@ -3569,6 +3552,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm-minimal", @@ -3876,4 +3876,4 @@ "OriginalItemSpec": "wwwroot\\index.html" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json index 943785164c96..fb2712351cec 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json @@ -135,9 +135,6 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.gz", @@ -159,6 +156,9 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", @@ -231,4 +231,4 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\custom-service-worker-assets.js", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\index.html", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\serviceworkers\\my-service-worker.js" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json index 0452b1ea8feb..7dd2bb2dab23 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json @@ -1797,40 +1797,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "SourceId": "blazorwasm", @@ -2069,6 +2035,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "SourceId": "blazorwasm", @@ -3531,23 +3531,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "SourceId": "blazorwasm", @@ -3667,6 +3650,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm", @@ -3991,4 +3991,4 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js" } ] -} +} \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json index 943785164c96..fb2712351cec 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json @@ -135,9 +135,6 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Private.Uri.dll.gz", @@ -159,6 +156,9 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz", @@ -231,4 +231,4 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\custom-service-worker-assets.js", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\index.html", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\serviceworkers\\my-service-worker.js" -] +] \ No newline at end of file diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json index 0452b1ea8feb..7dd2bb2dab23 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json @@ -1797,40 +1797,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Private.Uri.dll.br]]", "SourceId": "blazorwasm", @@ -2069,6 +2035,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.br]]", "SourceId": "blazorwasm", @@ -3531,23 +3531,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Private.CoreLib.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Private.Uri.dll", "SourceId": "blazorwasm", @@ -3667,6 +3650,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.Extensions.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.JavaScript.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll", "SourceId": "blazorwasm", @@ -3991,4 +3991,4 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js" } ] -} +} \ No newline at end of file From c1066c6e6e0cddc665f8416790a643f84b40f9f9 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 4 Aug 2022 15:24:52 +0200 Subject: [PATCH 3/9] rename runtimeAssets --- src/BlazorWasmSdk/Tasks/BootJsonData.cs | 2 +- src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs | 6 +++--- .../Tasks/GenerateBlazorWebAssemblyBootJson.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/BlazorWasmSdk/Tasks/BootJsonData.cs b/src/BlazorWasmSdk/Tasks/BootJsonData.cs index a21e1519e78d..164dbc09de62 100644 --- a/src/BlazorWasmSdk/Tasks/BootJsonData.cs +++ b/src/BlazorWasmSdk/Tasks/BootJsonData.cs @@ -104,7 +104,7 @@ public class ResourcesData /// is up to the user. /// [DataMember(EmitDefaultValue = false)] - public Dictionary additionalAssets { get; set; } + public Dictionary runtimeAssets { get; set; } } diff --git a/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs index cd55cf7af506..fdd861d94b2b 100644 --- a/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs +++ b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs @@ -411,7 +411,7 @@ private List ProcessCompressedAssets( Dictionary updatedAssets) { var processed = new List(); - var additionalAssetsToUpdate = new List(); + var runtimeAssetsToUpdate = new List(); foreach (var kvp in compressedRepresentations) { var compressedAsset = kvp.Value; @@ -423,7 +423,7 @@ private List ProcessCompressedAssets( Log.LogMessage(MessageImportance.Low, "Related assembly for '{0}' was not updated and the compressed asset can be reused.", relatedAsset); var newCompressedAsset = new TaskItem(compressedAsset); ApplyPublishProperties(newCompressedAsset); - additionalAssetsToUpdate.Add(newCompressedAsset); + runtimeAssetsToUpdate.Add(newCompressedAsset); } else { @@ -440,7 +440,7 @@ private List ProcessCompressedAssets( compressedRepresentations.Remove(element); } - return additionalAssetsToUpdate; + return runtimeAssetsToUpdate; } private static void UpdateRelatedAssetProperty(ITaskItem asset, TaskItem newAsset, Dictionary updatedAssetsMap) diff --git a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs index b37b10c1eae4..cadb92f57139 100644 --- a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs +++ b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs @@ -205,8 +205,8 @@ public void WriteBootJson(Stream output, string entryAssemblyName) if (!string.IsNullOrEmpty(behavior)) { - resourceData.additionalAssets ??= new Dictionary(); - AddToAdditionalResources(resource, resourceData.additionalAssets, resourceName, behavior); + resourceData.runtimeAssets ??= new Dictionary(); + AddToAdditionalResources(resource, resourceData.runtimeAssets, resourceName, behavior); } } From 8cc58cbfe632ea4005db64dde0d3559f1e041938 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 4 Aug 2022 21:06:46 +0200 Subject: [PATCH 4/9] fixed publish --- ...soft.NET.Sdk.BlazorWebAssembly.6_0.targets | 1 + .../Tasks/ComputeBlazorBuildAssets.cs | 3 +- .../Tasks/ComputeBlazorPublishAssets.cs | 44 ++++++++++++++++--- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets index 3a9c9d65ea1f..a5145d3ee370 100644 --- a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets +++ b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets @@ -406,6 +406,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_DotNetJsItem Include="@(ResolvedFileToPublish)" Condition="'%(ResolvedFileToPublish.DestinationSubPath)' == 'dotnet.js' AND '%(ResolvedFileToPublish.AssetType)' == 'native'" /> + <_DotNetJsItem Include="@(ResolvedFileToPublish)" Condition="'%(ResolvedFileToPublish.DestinationSubPath)' == 'dotnet-crypto-worker.js' AND '%(ResolvedFileToPublish.AssetType)' == 'native'" /> diff --git a/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs b/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs index 888e3c73f5c1..95454289b2d6 100644 --- a/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs +++ b/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs @@ -121,7 +121,7 @@ public override bool Execute() else if(candidate.GetMetadata("FileName") == "dotnet-crypto-worker" && candidate.GetMetadata("Extension") == ".js") { var itemHash = FileHasher.GetFileHash(candidate.ItemSpec); - var cacheBustedDotNetCryptoWorkerJSFileName = $"dotnet-crypto-worker.{itemHash}.js"; + var cacheBustedDotNetCryptoWorkerJSFileName = $"dotnet-crypto-worker.{candidate.GetMetadata("NuGetPackageVersion")}.{itemHash}.js"; var originalFileFullPath = Path.GetFullPath(candidate.ItemSpec); var originalFileDirectory = Path.GetDirectoryName(originalFileFullPath); @@ -302,6 +302,7 @@ public static bool ShouldFilterCandidate( ".dat" when invariantGlobalization && fileName.StartsWith("icudt") => "invariant globalization is enabled", ".json" when fromMonoPackage && (fileName == "emcc-props" || fileName == "package") => $"{fileName}{extension} is not used by Blazor", ".ts" when fromMonoPackage && fileName == "dotnet.d" => "dotnet type definition is not used by Blazor", + ".ts" when fromMonoPackage && fileName == "dotnet-legacy.d" => "dotnet type definition is not used by Blazor", ".js" when assetType == "native" && fileName != "dotnet" && fileName != "dotnet-crypto-worker" => $"{fileName}{extension} is not used by Blazor", ".pdb" when !copySymbols => "copying symbols is disabled", ".symbols" when fromMonoPackage => "extension .symbols is not required.", diff --git a/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs index fdd861d94b2b..aa8d90908c01 100644 --- a/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs +++ b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs @@ -157,8 +157,9 @@ private List ProcessNativeAssets( var key = kvp.Key; var asset = kvp.Value; var isDotNetJs = IsDotNetJs(key); + var isDotNetCryptoJs = IsDotNetCryptoJs(key); var isDotNetWasm = IsDotNetWasm(key); - if (!isDotNetJs && !isDotNetWasm) + if (!isDotNetJs && !isDotNetWasm && !isDotNetCryptoJs) { if (resolvedNativeAssetToPublish.TryGetValue(Path.GetFileName(asset.GetMetadata("OriginalItemSpec")), out var existing)) { @@ -175,6 +176,7 @@ private List ProcessNativeAssets( } else { + Log.LogMessage(MessageImportance.Low, "Removing asset '{0}'.", existing.ItemSpec); // This was a file that was filtered, so just remove it, we don't need to add any publish static web asset filesToRemove.Add(removed); @@ -214,6 +216,34 @@ private List ProcessNativeAssets( continue; } + if (isDotNetCryptoJs) + { + var aotDotNetJs = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == "dotnet-crypto-worker.js"); + ITaskItem newDotNetJs = null; + if (aotDotNetJs != null) + { + newDotNetJs = new TaskItem(Path.GetFullPath(aotDotNetJs.ItemSpec), asset.CloneCustomMetadata()); + newDotNetJs.SetMetadata("OriginalItemSpec", aotDotNetJs.ItemSpec); + newDotNetJs.SetMetadata("RelativePath", $"_framework/{$"dotnet-crypto-worker.{DotNetJsVersion}.{FileHasher.GetFileHash(aotDotNetJs.ItemSpec)}.js"}"); + + updateMap.Add(asset.ItemSpec, newDotNetJs); + Log.LogMessage(MessageImportance.Low, "Replacing asset '{0}' with AoT version '{1}'", asset.ItemSpec, newDotNetJs.ItemSpec); + } + else + { + newDotNetJs = new TaskItem(asset); + Log.LogMessage(MessageImportance.Low, "Promoting asset '{0}' to Publish asset.", asset.ItemSpec); + } + + ApplyPublishProperties(newDotNetJs); + nativeStaticWebAssets.Add(newDotNetJs); + if (resolvedNativeAssetToPublish.TryGetValue("dotnet-crypto-worker.js", out var resolved)) + { + filesToRemove.Add(resolved); + } + continue; + } + if (isDotNetWasm) { var aotDotNetWasm = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == "dotnet.wasm"); @@ -252,9 +282,13 @@ private List ProcessNativeAssets( static bool IsDotNetJs(string key) { var fileName = Path.GetFileName(key); - return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && fileName.EndsWith(".js", StringComparison.Ordinal); + return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && fileName.EndsWith(".js", StringComparison.Ordinal) && !fileName.Contains("worker"); + } + static bool IsDotNetCryptoJs(string key) + { + var fileName = Path.GetFileName(key); + return fileName.StartsWith("dotnet-crypto-worker.", StringComparison.Ordinal) && fileName.EndsWith(".js", StringComparison.Ordinal); } - static bool IsDotNetWasm(string key) => string.Equals("dotnet.wasm", Path.GetFileName(key), StringComparison.Ordinal); } @@ -603,10 +637,10 @@ private void GroupResolvedFilesToPublish( } } - private static bool IsNativeAsset(string traitValue) => string.Equals(traitValue, "native", StringComparison.Ordinal); + private static bool IsNativeAsset(string traitValue) => string.Equals(traitValue, "native", StringComparison.Ordinal) || string.Equals(traitValue, "js-module-crypto", StringComparison.Ordinal); private static bool IsRuntimeAsset(string traitValue) => string.Equals(traitValue, "runtime", StringComparison.Ordinal); - + private static bool IsSymbolAsset(string traitValue) => string.Equals(traitValue, "symbol", StringComparison.Ordinal); private static bool IsAlternative(ITaskItem asset) => string.Equals(asset.GetMetadata("AssetRole"), "Alternative", StringComparison.Ordinal); From a995950af430f86cfc1c55c16239a6e588549ece Mon Sep 17 00:00:00 2001 From: jacalvar Date: Fri, 5 Aug 2022 11:22:52 +0200 Subject: [PATCH 5/9] Update baselines --- ...ootJsonManifest.Build.staticwebassets.json | 12 ++--- ...iesAreCopiedToBuildOutput.Build.files.json | 6 +-- ...edToBuildOutput.Build.staticwebassets.json | 12 ++--- ...duleTargetPaths.Build.staticwebassets.json | 12 ++--- ...izeBlazorInitialization.Publish.files.json | 6 +++ ...nitialization.Publish.staticwebassets.json | 51 +++++++++++++++++++ ...tBuildAndPublishModules.Publish.files.json | 6 +++ ...ublishModules.Publish.staticwebassets.json | 51 +++++++++++++++++++ ...izeBlazorInitialization.Publish.files.json | 3 ++ ...nitialization.Publish.staticwebassets.json | 51 +++++++++++++++++++ ...nBlazorBootJsonManifest.Publish.files.json | 6 +++ ...tJsonManifest.Publish.staticwebassets.json | 51 +++++++++++++++++++ ...Assets_BuildMinimal_Works.Build.files.json | 6 +-- ...ldMinimal_Works.Build.staticwebassets.json | 12 ++--- ...Assets_Build_Hosted_Works.Build.files.json | 4 +- ...ld_Hosted_Works.Build.staticwebassets.json | 12 ++--- ...ts_PublishMinimal_Works.Publish.files.json | 6 +++ ...Minimal_Works.Publish.staticwebassets.json | 51 +++++++++++++++++++ ...mentationFiles_AsAssets.Publish.files.json | 3 ++ ...iles_AsAssets.Publish.staticwebassets.json | 51 +++++++++++++++++++ ...ts_Publish_Hosted_Works.Publish.files.json | 3 ++ ..._Hosted_Works.Publish.staticwebassets.json | 51 +++++++++++++++++++ 22 files changed, 428 insertions(+), 38 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json index 7109e3d86b79..e1d159970dcc 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json @@ -3298,12 +3298,12 @@ "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm-minimal.pdb" }, { - "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm-minimal", "SourceType": "Computed", "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Primary", @@ -6732,21 +6732,21 @@ "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb" }, { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", "SourceType": "Computed", "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetTraitName": "Content-Encoding", "AssetTraitValue": "gzip", "CopyToOutputDirectory": "PreserveNewest", "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json index 513ba2cf94ef..c58ca3320e04 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json @@ -404,8 +404,8 @@ "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.CSharp.resources.dll.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll.gz", - "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", - "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js.gz", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", @@ -676,7 +676,7 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/cs/Microsoft.CodeAnalysis.resources.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/de/Microsoft.CodeAnalysis.CSharp.resources.dll.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/de/Microsoft.CodeAnalysis.resources.dll.gz]]", - "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.timezones.blat.gz]]", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.wasm.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json index 14f02c1ba842..9b04776d468f 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json @@ -3532,12 +3532,12 @@ "OriginalItemSpec": "${RestorePath}\\microsoft.codeanalysis.common\\[[CustomPackageVersion]]\\lib\\netstandard2.0\\de\\Microsoft.CodeAnalysis.resources.dll" }, { - "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm", "SourceType": "Computed", "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Primary", @@ -7544,21 +7544,21 @@ "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll" }, { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", "SourceType": "Computed", "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetTraitName": "Content-Encoding", "AssetTraitValue": "gzip", "CopyToOutputDirectory": "PreserveNewest", "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json index c54897061e4c..b9e28ffbe4ba 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json @@ -3379,12 +3379,12 @@ "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm.pdb" }, { - "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Primary", @@ -6847,21 +6847,21 @@ "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb" }, { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetTraitName": "Content-Encoding", "AssetTraitValue": "gzip", "CopyToOutputDirectory": "PreserveNewest", "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json index 7018d92f734a..bb63e41b64f4 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json @@ -198,6 +198,9 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.pdb.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", @@ -226,6 +229,7 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\css\\app.css", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\index.html", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", @@ -236,6 +240,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazor.webassembly.js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.wasm.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_bin/publish.extension.txt.br]]", @@ -369,6 +374,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazor.webassembly.js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazorwasm-minimal.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazorwasm-minimal.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.timezones.blat.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.timezones.blat.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json index 79088e64237f..dd9585392a4b 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json @@ -33,6 +33,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net5.0\\blazor.webassembly.js" }, + { + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm-minimal", @@ -203,6 +220,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", @@ -2464,6 +2498,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json index b233bfc003f3..5fecae521da5 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json @@ -195,6 +195,9 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.pdb.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", @@ -223,6 +226,7 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\css\\app.css", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\index.html", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", @@ -233,6 +237,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazor.webassembly.js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.wasm.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/Microsoft.AspNetCore.Authorization.dll.br]]", @@ -364,6 +369,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazor.webassembly.js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazorwasm-minimal.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazorwasm-minimal.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.timezones.blat.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.timezones.blat.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json index d5ea4244332c..ae65507b2333 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json @@ -33,6 +33,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net5.0\\blazor.webassembly.js" }, + { + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm-minimal", @@ -203,6 +220,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", @@ -2430,6 +2464,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json index ddaed723da46..6f13c439e18b 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json @@ -205,6 +205,9 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm.pdb.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json index ed16fdfff3d2..16c1de8c9894 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json @@ -97,6 +97,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net5.0\\blazor.webassembly.js" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm", @@ -284,6 +301,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm.pdb.gz]]" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", @@ -2579,6 +2613,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\blazorwasm.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json index b233bfc003f3..5fecae521da5 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json @@ -195,6 +195,9 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.pdb.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", @@ -223,6 +226,7 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\css\\app.css", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\index.html", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", @@ -233,6 +237,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazor.webassembly.js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.wasm.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/Microsoft.AspNetCore.Authorization.dll.br]]", @@ -364,6 +369,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazor.webassembly.js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazorwasm-minimal.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazorwasm-minimal.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.timezones.blat.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.timezones.blat.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json index 04939de63ca6..6c94c99b75f6 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json @@ -33,6 +33,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net5.0\\blazor.webassembly.js" }, + { + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm-minimal", @@ -203,6 +220,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", @@ -2430,6 +2464,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json index d4b8aee13419..060598ddef74 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json @@ -384,8 +384,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", @@ -596,7 +596,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazor.webassembly.js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.timezones.blat.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.wasm.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json index 5815d2d90fdf..1b74b78f3dfc 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json @@ -3298,12 +3298,12 @@ "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm-minimal.pdb" }, { - "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm-minimal", "SourceType": "Computed", "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Primary", @@ -6732,21 +6732,21 @@ "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb" }, { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", "SourceType": "Computed", "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetTraitName": "Content-Encoding", "AssetTraitValue": "gzip", "CopyToOutputDirectory": "PreserveNewest", "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json index 504c20cd023a..4585cc000f24 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json @@ -388,8 +388,8 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb.gz", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json index 52bc54dcb1cf..514e4bdea6be 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json @@ -3362,12 +3362,12 @@ "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm.pdb" }, { - "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Primary", @@ -6830,21 +6830,21 @@ "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb" }, { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]", + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "AssetTraitName": "Content-Encoding", "AssetTraitValue": "gzip", "CopyToOutputDirectory": "PreserveNewest", "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js" + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json index d432484c3064..cbeb4120849e 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json @@ -195,6 +195,9 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm-minimal.pdb.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", @@ -226,6 +229,7 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\css\\app.css", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\index.html", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", @@ -236,6 +240,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazor.webassembly.js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.wasm.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/Microsoft.AspNetCore.Authorization.dll.br]]", @@ -367,6 +372,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazor.webassembly.js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazorwasm-minimal.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazorwasm-minimal.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.timezones.blat.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.timezones.blat.gz]]", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json index df6cbbe619cb..c1c49f0a9291 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json @@ -33,6 +33,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net5.0\\blazor.webassembly.js" }, + { + "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm-minimal", @@ -203,6 +220,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm-minimal.pdb.gz]]" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", @@ -2430,6 +2464,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json index fb2712351cec..de06be78791c 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json @@ -202,6 +202,9 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm.pdb.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json index 7dd2bb2dab23..cf9e3f5e98e5 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json @@ -80,6 +80,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net5.0\\blazor.webassembly.js" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm", @@ -267,6 +284,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm.pdb.gz]]" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", @@ -2528,6 +2562,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\blazorwasm.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json index fb2712351cec..de06be78791c 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json @@ -202,6 +202,9 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\blazorwasm.pdb.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json index 7dd2bb2dab23..cf9e3f5e98e5 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json @@ -80,6 +80,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net5.0\\blazor.webassembly.js" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "js-module-crypto", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js", "SourceId": "blazorwasm", @@ -267,6 +284,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/blazorwasm.pdb.gz]]" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.gz]]" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", @@ -2528,6 +2562,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\blazorwasm.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.${RuntimeVersion}.[[hash]].js" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.br]]", "SourceId": "blazorwasm", From 73f35a847676a23521e0bc39d28921f15c711537 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Fri, 5 Aug 2022 16:02:47 +0200 Subject: [PATCH 6/9] Apply suggestions from code review Address feedback Co-authored-by: Steve Sanderson --- src/BlazorWasmSdk/Tasks/BootJsonData.cs | 2 +- src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs | 2 +- src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs | 2 +- src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/BlazorWasmSdk/Tasks/BootJsonData.cs b/src/BlazorWasmSdk/Tasks/BootJsonData.cs index 164dbc09de62..2b3f238e5475 100644 --- a/src/BlazorWasmSdk/Tasks/BootJsonData.cs +++ b/src/BlazorWasmSdk/Tasks/BootJsonData.cs @@ -104,7 +104,7 @@ public class ResourcesData /// is up to the user. /// [DataMember(EmitDefaultValue = false)] - public Dictionary runtimeAssets { get; set; } + public Dictionary RuntimeAssets { get; set; } } diff --git a/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs b/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs index 95454289b2d6..5abf495e39c7 100644 --- a/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs +++ b/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs @@ -118,7 +118,7 @@ public override bool Execute() assetCandidates.Add(newDotNetJs); continue; } - else if(candidate.GetMetadata("FileName") == "dotnet-crypto-worker" && candidate.GetMetadata("Extension") == ".js") + else if (candidate.GetMetadata("FileName") == "dotnet-crypto-worker" && candidate.GetMetadata("Extension") == ".js") { var itemHash = FileHasher.GetFileHash(candidate.ItemSpec); var cacheBustedDotNetCryptoWorkerJSFileName = $"dotnet-crypto-worker.{candidate.GetMetadata("NuGetPackageVersion")}.{itemHash}.js"; diff --git a/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs index aa8d90908c01..08fbc381d1fc 100644 --- a/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs +++ b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs @@ -284,6 +284,7 @@ static bool IsDotNetJs(string key) var fileName = Path.GetFileName(key); return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && fileName.EndsWith(".js", StringComparison.Ordinal) && !fileName.Contains("worker"); } + static bool IsDotNetCryptoJs(string key) { var fileName = Path.GetFileName(key); @@ -640,7 +641,6 @@ private void GroupResolvedFilesToPublish( private static bool IsNativeAsset(string traitValue) => string.Equals(traitValue, "native", StringComparison.Ordinal) || string.Equals(traitValue, "js-module-crypto", StringComparison.Ordinal); private static bool IsRuntimeAsset(string traitValue) => string.Equals(traitValue, "runtime", StringComparison.Ordinal); - private static bool IsSymbolAsset(string traitValue) => string.Equals(traitValue, "symbol", StringComparison.Ordinal); private static bool IsAlternative(ITaskItem asset) => string.Equals(asset.GetMetadata("AssetRole"), "Alternative", StringComparison.Ordinal); diff --git a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs index cadb92f57139..53b0e3a01cce 100644 --- a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs +++ b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs @@ -170,7 +170,8 @@ public void WriteBootJson(Stream output, string entryAssemblyName) Debug.Assert(!string.IsNullOrEmpty(targetPath), "Target path for '{0}' must exist.", resource.ItemSpec); AddResourceToList(resource, resourceList, targetPath); continue; - }else if(string.Equals(assetTraitName, "BlazorWebAssemblyResource", StringComparison.OrdinalIgnoreCase) && + } + else if(string.Equals(assetTraitName, "BlazorWebAssemblyResource", StringComparison.OrdinalIgnoreCase) && string.Equals(assetTraitValue, "js-module-crypto", StringComparison.OrdinalIgnoreCase)) { behavior = assetTraitValue; From 11e941148fe3540aa4d3fc85a96fa6ab58f52345 Mon Sep 17 00:00:00 2001 From: jacalvar Date: Fri, 5 Aug 2022 16:04:13 +0200 Subject: [PATCH 7/9] Address feedback --- src/BlazorWasmSdk/Tasks/BootJsonData.cs | 3 +-- .../Tasks/ComputeBlazorPublishAssets.cs | 22 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/BlazorWasmSdk/Tasks/BootJsonData.cs b/src/BlazorWasmSdk/Tasks/BootJsonData.cs index 2b3f238e5475..65f254ab09ff 100644 --- a/src/BlazorWasmSdk/Tasks/BootJsonData.cs +++ b/src/BlazorWasmSdk/Tasks/BootJsonData.cs @@ -100,8 +100,7 @@ public class ResourcesData public Dictionary extensions { get; set; } /// - /// Extensions created by users customizing the initialization process. The format of the file(s) - /// is up to the user. + /// Additional assets that the runtime consumes as part of the boot process. /// [DataMember(EmitDefaultValue = false)] public Dictionary RuntimeAssets { get; set; } diff --git a/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs index 08fbc381d1fc..de3b8aee37d0 100644 --- a/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs +++ b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs @@ -218,25 +218,25 @@ private List ProcessNativeAssets( if (isDotNetCryptoJs) { - var aotDotNetJs = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == "dotnet-crypto-worker.js"); - ITaskItem newDotNetJs = null; - if (aotDotNetJs != null) + var aotDotNetCryptoJs = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == "dotnet-crypto-worker.js"); + ITaskItem newDotNetCryptoJs = null; + if (aotDotNetCryptoJs != null) { - newDotNetJs = new TaskItem(Path.GetFullPath(aotDotNetJs.ItemSpec), asset.CloneCustomMetadata()); - newDotNetJs.SetMetadata("OriginalItemSpec", aotDotNetJs.ItemSpec); - newDotNetJs.SetMetadata("RelativePath", $"_framework/{$"dotnet-crypto-worker.{DotNetJsVersion}.{FileHasher.GetFileHash(aotDotNetJs.ItemSpec)}.js"}"); + newDotNetCryptoJs = new TaskItem(Path.GetFullPath(aotDotNetCryptoJs.ItemSpec), asset.CloneCustomMetadata()); + newDotNetCryptoJs.SetMetadata("OriginalItemSpec", aotDotNetCryptoJs.ItemSpec); + newDotNetCryptoJs.SetMetadata("RelativePath", $"_framework/{$"dotnet-crypto-worker.{DotNetJsVersion}.{FileHasher.GetFileHash(aotDotNetCryptoJs.ItemSpec)}.js"}"); - updateMap.Add(asset.ItemSpec, newDotNetJs); - Log.LogMessage(MessageImportance.Low, "Replacing asset '{0}' with AoT version '{1}'", asset.ItemSpec, newDotNetJs.ItemSpec); + updateMap.Add(asset.ItemSpec, newDotNetCryptoJs); + Log.LogMessage(MessageImportance.Low, "Replacing asset '{0}' with AoT version '{1}'", asset.ItemSpec, newDotNetCryptoJs.ItemSpec); } else { - newDotNetJs = new TaskItem(asset); + newDotNetCryptoJs = new TaskItem(asset); Log.LogMessage(MessageImportance.Low, "Promoting asset '{0}' to Publish asset.", asset.ItemSpec); } - ApplyPublishProperties(newDotNetJs); - nativeStaticWebAssets.Add(newDotNetJs); + ApplyPublishProperties(newDotNetCryptoJs); + nativeStaticWebAssets.Add(newDotNetCryptoJs); if (resolvedNativeAssetToPublish.TryGetValue("dotnet-crypto-worker.js", out var resolved)) { filesToRemove.Add(resolved); From 9a56f31e4af569805da4863c699060fe94931f73 Mon Sep 17 00:00:00 2001 From: jacalvar Date: Fri, 5 Aug 2022 16:07:58 +0200 Subject: [PATCH 8/9] Fix culture bug --- src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs index 53b0e3a01cce..8d002fb1fc47 100644 --- a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs +++ b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs @@ -116,7 +116,7 @@ public void WriteBootJson(Stream output, string entryAssemblyName) resourceData.lazyAssembly ??= new ResourceHashesByNameDictionary(); resourceList = resourceData.lazyAssembly; } - else if (string.Equals("Culture", assetTraitName)) + else if (string.Equals("Culture", assetTraitName, StringComparison.OrdinalIgnoreCase)) { Log.LogMessage(MessageImportance.Low, "Candidate '{0}' is defined as satellite assembly with culture '{1}'.", resource.ItemSpec, assetTraitValue); resourceData.satelliteResources ??= new Dictionary(StringComparer.OrdinalIgnoreCase); From f082f8d9e8c6c4bee701c4d1c46d1aeda968a408 Mon Sep 17 00:00:00 2001 From: jacalvar Date: Fri, 5 Aug 2022 17:22:46 +0200 Subject: [PATCH 9/9] Fix bad merge --- src/BlazorWasmSdk/Tasks/BootJsonData.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BlazorWasmSdk/Tasks/BootJsonData.cs b/src/BlazorWasmSdk/Tasks/BootJsonData.cs index 65f254ab09ff..2a1a54280ddf 100644 --- a/src/BlazorWasmSdk/Tasks/BootJsonData.cs +++ b/src/BlazorWasmSdk/Tasks/BootJsonData.cs @@ -103,7 +103,7 @@ public class ResourcesData /// Additional assets that the runtime consumes as part of the boot process. /// [DataMember(EmitDefaultValue = false)] - public Dictionary RuntimeAssets { get; set; } + public Dictionary runtimeAssets { get; set; } }