diff --git a/documentation/general/SelfContainedBreakingChangeNotification.md b/documentation/general/SelfContainedBreakingChangeNotification.md new file mode 100644 index 000000000000..66b41ff99f57 --- /dev/null +++ b/documentation/general/SelfContainedBreakingChangeNotification.md @@ -0,0 +1,53 @@ +# [Breaking change]: Handling of command-line RuntimeIdentifier and SelfContained properties across project references + +## Description + +The `RuntimeIdentifier` and `SelfContained` properties can be specified on the command line to commands such as `dotnet build` and `dotnet publish`. +They can be specified either via parameters such as `-r` or `--self-contained`, or via the generic `-p:Key=Value` parameter, such as `-p:SelfContained=true`. + +If these properties are specified on the command line, we've updated how they are applied (or not applied) to projects referenced by the initial project that is being built. + +## Version + +??? + +## Previous behavior + +If `SelfContained` was specified on the command line, it would always flow to referenced projects. + +`RuntimeIdentifier` would flow to referenced projects where either the `RuntimeIdentifier` or `RuntimeIdentifiers` properties were non-empty. + +## New Behavior + +Both `SelfContained` and `RuntimeIdentifier` will flow to a referenced project if any of the following are true for the referenced project: + +- The `IsRidAgnostic` property is set to `false` +- The `OutputType` is `Exe` or `WinExe` +- Either the `RuntimeIdentifer` or `RuntimeIdentifiers` property is non-empty + +## Type of breaking change + +Source incompatible + +## Reason for change + +As of .NET SDK 6.0.100, we recommend specifying the value for self-contained on the command line if you specify the RuntimeIdentifier. +(This is because in the future we are considering [changing the logic](https://github.com/dotnet/designs/blob/main/accepted/2021/architecture-targeting.md) +so that specifying the RuntimeIdentifier on the command line doesn't automatically set the app to self-contained.) We also added a warning message +to guide you to do so. + +However, if you followed the warning and switched to a command specifying both the RuntimeIdentifier and the value for self-contained (for example +`dotnet build -r win-x64 --self-contained`), the command could fail if you referenced an Exe project, because the `RuntimeIdentifier` you specified +would not apply to the referenced project, but the `SelfContained` value would, and it's an error for an Exe project to have `SelfContained` set to +true without having a `RuntimeIdentifier` set. + +## Recommended action + +If you were relying on the `SelfContained` property to apply to all projects when it was specified on the command line, then you can get similar behavior +by setting `IsRidAgnostic` to false either in a file ([such as Directory.Build.props](https://docs.microsoft.com/visualstudio/msbuild/customize-your-build#directorybuildprops-and-directorybuildtargets)), +or as a command-line parameter such as `-p:IsRidAgnostic=false`. + +## Open Questions + +TODO: How does this apply to solutions? Could a solution build set IsRidAgnostic to false for all projects, and would that fix other issues we have when specifying the RuntimeIdentifier for a solution build? +TODO: What happens if there's an Exe1 -> Library -> Exe2 reference, especially if there's also a direct reference from Exe1 -> Exe2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49ea8f9dfb50..4f333ae976e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,49 +6,49 @@ be347d74371ebaa7aaec7786ea7be1175440c302 - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/msbuild - f0a66ec4390b6590ee09dc111cc5e1d8e975df3f + 5d102ae37163fc1f22610bb433c3ab9a2fff91f0 - + https://github.com/dotnet/msbuild - f0a66ec4390b6590ee09dc111cc5e1d8e975df3f + 5d102ae37163fc1f22610bb433c3ab9a2fff91f0 https://github.com/dotnet/fsharp @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 76b3cb488943..12a8ffb5c667 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 7.0.0-beta.22411.2 3.1.0 - 7.0.0-rc.1.22411.12 + 7.0.0-rc.1.22421.12 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22411.12 + 7.0.0-rc.1.22421.12 4.6.0 2.0.0-beta4.22402.1 1.0.0-preview5.1.22263.1 @@ -48,13 +48,13 @@ - 7.0.0-rc.1.22411.12 - 7.0.0-rc.1.22411.12 - 7.0.0-rc.1.22411.12 + 7.0.0-rc.1.22421.12 + 7.0.0-rc.1.22421.12 + 7.0.0-rc.1.22421.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22411.12 - 7.0.0-rc.1.22411.12 - 7.0.0-rc.1.22411.12 + 7.0.0-rc.1.22421.12 + 7.0.0-rc.1.22421.12 + 7.0.0-rc.1.22421.12 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22411.12 - 7.0.0-rc.1.22411.12 - 7.0.0-rc.1.22411.12 - 7.0.0-rc.1.22411.12 + 7.0.0-rc.1.22421.12 + 7.0.0-rc.1.22421.12 + 7.0.0-rc.1.22421.12 + 7.0.0-rc.1.22421.12 @@ -105,7 +105,7 @@ - 17.4.0-preview-22413-01 + 17.4.0-preview-22416-02 - - <_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 5abf495e39c7..3b04fdac7238 100644 --- a/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs +++ b/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs @@ -118,28 +118,6 @@ 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.{candidate.GetMetadata("NuGetPackageVersion")}.{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"); @@ -303,7 +281,7 @@ public static bool ShouldFilterCandidate( ".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", + ".js" when assetType == "native" && fileName != "dotnet" => $"{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/ComputeBlazorPublishAssets.cs b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs index de3b8aee37d0..fa7e2f67403f 100644 --- a/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs +++ b/src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs @@ -157,9 +157,8 @@ 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 && !isDotNetCryptoJs) + if (!isDotNetJs && !isDotNetWasm) { if (resolvedNativeAssetToPublish.TryGetValue(Path.GetFileName(asset.GetMetadata("OriginalItemSpec")), out var existing)) { @@ -216,34 +215,6 @@ private List ProcessNativeAssets( continue; } - if (isDotNetCryptoJs) - { - var aotDotNetCryptoJs = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == "dotnet-crypto-worker.js"); - ITaskItem newDotNetCryptoJs = null; - if (aotDotNetCryptoJs != null) - { - 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, newDotNetCryptoJs); - Log.LogMessage(MessageImportance.Low, "Replacing asset '{0}' with AoT version '{1}'", asset.ItemSpec, newDotNetCryptoJs.ItemSpec); - } - else - { - newDotNetCryptoJs = new TaskItem(asset); - Log.LogMessage(MessageImportance.Low, "Promoting asset '{0}' to Publish asset.", asset.ItemSpec); - } - - ApplyPublishProperties(newDotNetCryptoJs); - nativeStaticWebAssets.Add(newDotNetCryptoJs); - 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"); @@ -285,11 +256,6 @@ static bool IsDotNetJs(string 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); - 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); } @@ -638,7 +604,7 @@ 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 IsNativeAsset(string traitValue) => string.Equals(traitValue, "native", 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); diff --git a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs index 8d002fb1fc47..238afb02f620 100644 --- a/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs +++ b/src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs @@ -171,11 +171,6 @@ public void WriteBootJson(Stream output, string entryAssemblyName) 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)) { diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs index fe94fca6be87..9e0b461f27c3 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs @@ -52,6 +52,38 @@ protected override void ExecuteCore() bool shouldBeValidatedAsExecutableReference = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["ShouldBeValidatedAsExecutableReference"], true); bool referencedProjectIsExecutable = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["_IsExecutable"]); bool referencedProjectIsSelfContained = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["SelfContained"]); + bool referencedProjectHadSelfContainedSpecified = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["_SelfContainedWasSpecified"]); + + var globalProperties = BuildEngine6.GetGlobalProperties(); + + bool selfContainedIsGlobalProperty = globalProperties.ContainsKey("SelfContained"); + bool runtimeIdentifierIsGlobalProperty = globalProperties.ContainsKey("RuntimeIdentifier"); + + bool projectIsRidAgnostic = true; + if (projectAdditionalProperties.TryGetValue("IsRidAgnostic", out string isRidAgnostic) && + bool.TryParse(isRidAgnostic, out bool isRidAgnosticParseResult)) + { + projectIsRidAgnostic = isRidAgnosticParseResult; + } + + if (!projectIsRidAgnostic) + { + // If the project is NOT RID agnostic, and SelfContained was set as a global property, + // then SelfContained will flow across the project reference when we go to build it, + // despite the fact that we ignored it when doing the GetTargetFrameworks negotiation + if (selfContainedIsGlobalProperty && SelfContained) + { + referencedProjectIsSelfContained = true; + } + + // If the project is NOT RID agnostic, then a global RuntimeIdentifier will flow to it. + // If the project didn't explicitly specify a value for SelfContained, then this will + // set SelfContained to true + if (runtimeIdentifierIsGlobalProperty && !referencedProjectHadSelfContainedSpecified) + { + referencedProjectIsSelfContained = true; + } + } if (referencedProjectIsExecutable && shouldBeValidatedAsExecutableReference) { diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets index 6bb5e58f3aff..2ff2c1de9993 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets @@ -22,8 +22,9 @@ Copyright (c) .NET Foundation. All rights reserved. <_IsExecutable Condition="'$(OutputType)' == 'Exe' or '$(OutputType)'=='WinExe'">true - + + $(_IsExecutable) <_UsingDefaultForHasRuntimeOutput>true diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index ffa41fee0cd3..6b936bf099e2 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets @@ -83,6 +83,15 @@ Copyright (c) .NET Foundation. All rights reserved. true + + + false + true + + @@ -1073,9 +1082,11 @@ Copyright (c) .NET Foundation. All rights reserved. + + - + false diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs index beeb5ce711b8..4e8aaa37ba75 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs @@ -488,8 +488,8 @@ public void It_can_use_implicitly_defined_compilation_constants(string targetFra testProj.AdditionalProperties["TargetPlatformIdentifier"] = targetPlatformIdentifier; testProj.AdditionalProperties["TargetPlatformVersion"] = targetPlatformVersion; } - var testAsset = _testAssetsManager.CreateTestProject(testProj, targetFramework); - File.WriteAllText(Path.Combine(testAsset.Path, testProj.Name, $"{testProj.Name}.cs"), @" + + testProj.SourceFiles[$"{testProj.Name}.cs"] = @" using System; class Program { @@ -529,7 +529,8 @@ static void Main(string[] args) Console.WriteLine(""IOS""); #endif } -}"); +}"; + var testAsset = _testAssetsManager.CreateTestProject(testProj, targetFramework); var buildCommand = new BuildCommand(Log, Path.Combine(testAsset.Path, testProj.Name)); buildCommand diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs index 26ee226661bf..9f19f0b1f40b 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs @@ -392,6 +392,7 @@ public void It_does_not_include_items_in_any_group_if_group_specific_default_inc XElement itemGroup = new XElement(ns + "ItemGroup"); project.Root.Add(itemGroup); itemGroup.Add(new XElement(ns + "Compile", new XAttribute("Include", testProject.Name + ".cs"))); + itemGroup.Add(new XElement(ns + "Compile", new XAttribute("Include", testProject.Name + "Program.cs"))); }); var projectFolder = Path.Combine(testAsset.TestRoot, testProject.Name); @@ -409,7 +410,7 @@ public void It_does_not_include_items_in_any_group_if_group_specific_default_inc var compileItems = getCompileItemsCommand.GetValues(); RemoveGeneratedCompileItems(compileItems); - compileItems.Should().BeEquivalentTo(new[] { testProject.Name + ".cs" }); + compileItems.Should().BeEquivalentTo(new[] { testProject.Name + ".cs", testProject.Name + "Program.cs" }); // Validate None items. var getNoneItemsCommand = new GetValuesCommand(Log, projectFolder, testProject.TargetFrameworks, "None", GetValuesCommand.ValueType.Item); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs b/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs new file mode 100644 index 000000000000..774907d7511b --- /dev/null +++ b/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs @@ -0,0 +1,276 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Xml.Linq; +using FluentAssertions; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.NET.TestFramework; +using Microsoft.NET.TestFramework.Assertions; +using Microsoft.NET.TestFramework.Commands; +using Microsoft.NET.TestFramework.ProjectConstruction; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.NET.Build.Tests +{ + public class GlobalPropertyFlowTests : SdkTest + { + TestProject _testProject; + TestProject _referencedProject; + + public GlobalPropertyFlowTests(ITestOutputHelper log) : base(log) + { + _referencedProject = new TestProject("ReferencedProject") + { + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, + IsExe = false + }; + + _testProject = new TestProject("TestProject") + { + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, + IsExe = true + }; + _testProject.ReferencedProjects.Add(_referencedProject); + + _testProject.RecordProperties("RuntimeIdentifier", "SelfContained"); + _referencedProject.RecordProperties("RuntimeIdentifier", "SelfContained"); + } + + TestAsset Build(bool passSelfContained, bool passRuntimeIdentifier, [CallerMemberName] string callingMethod = "", string identifier = "") + { + var testAsset = _testAssetsManager.CreateTestProject(_testProject, identifier:identifier); + + var arguments = GetDotnetArguments(passSelfContained, passRuntimeIdentifier); + + new DotnetBuildCommand(testAsset, arguments.ToArray()) + .Execute() + .Should() + .Pass(); + + return testAsset; + } + + List GetDotnetArguments(bool passSelfContained, bool passRuntimeIdentifier) + { + var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(); + + List arguments = new List(); + if (passSelfContained) + { + arguments.Add("--self-contained"); + } + if (passRuntimeIdentifier) + { + arguments.Add("-r"); + arguments.Add(runtimeIdentifier); + } + + return arguments; + } + + [RequiresMSBuildVersionTheory("17.4.0.41702")] + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + public void TestGlobalPropertyFlowToLibrary(bool passSelfContained, bool passRuntimeIdentifier) + { + var testAsset = Build(passSelfContained, passRuntimeIdentifier, identifier: passSelfContained.ToString() + "_" + passRuntimeIdentifier); + + bool buildingSelfContained = passSelfContained || passRuntimeIdentifier; + + ValidateProperties(testAsset, _testProject, expectSelfContained: buildingSelfContained, expectRuntimeIdentifier: buildingSelfContained); + ValidateProperties(testAsset, _referencedProject, expectSelfContained: false, expectRuntimeIdentifier: false); + } + + [RequiresMSBuildVersionTheory("17.4.0.41702")] + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + public void TestGlobalPropertyFlowToExe(bool passSelfContained, bool passRuntimeIdentifier) + { + _referencedProject.IsExe = true; + + var testAsset = Build(passSelfContained, passRuntimeIdentifier, identifier: passSelfContained.ToString() + "_" + passRuntimeIdentifier); + + bool buildingSelfContained = passSelfContained || passRuntimeIdentifier; + + ValidateProperties(testAsset, _testProject, expectSelfContained: buildingSelfContained, expectRuntimeIdentifier: buildingSelfContained); + ValidateProperties(testAsset, _referencedProject, expectSelfContained: buildingSelfContained, expectRuntimeIdentifier: buildingSelfContained); + } + + + [RequiresMSBuildVersionTheory("17.4.0.41702")] + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + public void TestGlobalPropertyFlowToExeWithSelfContainedFalse(bool passSelfContained, bool passRuntimeIdentifier) + { + _referencedProject.IsExe = true; + _referencedProject.AdditionalProperties["SelfContained"] = "false"; + + string identifier = passSelfContained.ToString() + "_" + passRuntimeIdentifier; + + if (!passSelfContained && passRuntimeIdentifier) + { + // This combination results in a build error because it ends up being a self-contained Exe referencing a framework dependent one + var testAsset = _testAssetsManager.CreateTestProject(_testProject, identifier: identifier); + + new DotnetBuildCommand(testAsset, "-r", EnvironmentInfo.GetCompatibleRid()) + .Execute() + .Should() + .Fail() + .And + .HaveStdOutContaining("NETSDK1150"); + } + else + { + + var testAsset = Build(passSelfContained, passRuntimeIdentifier, identifier: identifier); + + bool buildingSelfContained = passSelfContained || passRuntimeIdentifier; + + ValidateProperties(testAsset, _testProject, expectSelfContained: buildingSelfContained, expectRuntimeIdentifier: buildingSelfContained); + // SelfContained will only flow to referenced project if it's explicitly passed in this case + ValidateProperties(testAsset, _referencedProject, expectSelfContained: passSelfContained, expectRuntimeIdentifier: buildingSelfContained); + } + } + + [RequiresMSBuildVersionTheory("17.4.0.41702")] + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + public void TestGlobalPropertyFlowToLibraryWithRuntimeIdentifier(bool passSelfContained, bool passRuntimeIdentifier) + { + // Set a RuntimeIdentifier in the referenced project that is different from what is passed in on the command line + _referencedProject.RuntimeIdentifier = "win7-x64"; + + var testAsset = Build(passSelfContained, passRuntimeIdentifier, identifier: passSelfContained.ToString() + "_" + passRuntimeIdentifier); + + bool buildingSelfContained = passSelfContained || passRuntimeIdentifier; + + ValidateProperties(testAsset, _testProject, expectSelfContained: buildingSelfContained, expectRuntimeIdentifier: buildingSelfContained); + ValidateProperties(testAsset, _referencedProject, expectSelfContained: passSelfContained, expectRuntimeIdentifier: buildingSelfContained, + // Right now passing "--self-contained" also causes the RuntimeIdentifier to be passed as a global property. + // That should change with https://github.com/dotnet/sdk/pull/26143, which will likely require updating this and other tests in this class + expectedRuntimeIdentifier: buildingSelfContained ? "" : _referencedProject.RuntimeIdentifier); + } + + [RequiresMSBuildVersionTheory("17.4.0.41702")] + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + public void TestGlobalPropertyFlowToMultitargetedProject(bool passSelfContained, bool passRuntimeIdentifier) + { + _testProject.TargetFrameworks = "net6.0;net7.0"; + + _referencedProject.TargetFrameworks = "net6.0;net7.0"; + _referencedProject.IsExe = true; + _referencedProject.ProjectChanges.Add(project => + { + project.Root.Element("PropertyGroup").Add(XElement.Parse(@"Library")); + }); + + var testAsset = Build(passSelfContained, passRuntimeIdentifier, identifier: passSelfContained.ToString() + "_" + passRuntimeIdentifier); + + bool buildingSelfContained = passSelfContained || passRuntimeIdentifier; + + ValidateProperties(testAsset, _testProject, expectSelfContained: buildingSelfContained, expectRuntimeIdentifier: buildingSelfContained, + targetFramework: "net6.0"); + ValidateProperties(testAsset, _testProject, expectSelfContained: buildingSelfContained, expectRuntimeIdentifier: buildingSelfContained, + targetFramework: "net7.0"); + ValidateProperties(testAsset, _referencedProject, expectSelfContained: false, expectRuntimeIdentifier: false, + targetFramework: "net6.0"); + ValidateProperties(testAsset, _referencedProject, expectSelfContained: buildingSelfContained, expectRuntimeIdentifier: buildingSelfContained, + targetFramework: "net7.0"); + } + + [RequiresMSBuildVersionTheory("17.4.0.41702")] + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + public void TestGlobalPropertyFlowInSolution(bool passSelfContained, bool passRuntimeIdentifier) + { + var identifier = passSelfContained.ToString() + "_" + passRuntimeIdentifier; + + var testAsset = _testAssetsManager.CreateTestProject(_testProject, identifier: identifier); + + new DotnetCommand(Log, "new", "sln") + .WithWorkingDirectory(testAsset.TestRoot) + .Execute() + .Should() + .Pass(); + + new DotnetCommand(Log, "sln", "add", _testProject.Name) + .WithWorkingDirectory(testAsset.TestRoot) + .Execute() + .Should() + .Pass(); + + new DotnetCommand(Log, "sln", "add", _referencedProject.Name) + .WithWorkingDirectory(testAsset.TestRoot) + .Execute() + .Should() + .Pass(); + + var arguments = GetDotnetArguments(passSelfContained, passRuntimeIdentifier); + + if (passSelfContained || passRuntimeIdentifier) + { + new DotnetBuildCommand(Log, arguments.ToArray()) + .WithWorkingDirectory(testAsset.TestRoot) + .Execute() + .Should() + .Fail() + .And + .HaveStdOutContaining("NETSDK1134"); + } + else + { + new DotnetBuildCommand(Log, arguments.ToArray()) + .WithWorkingDirectory(testAsset.TestRoot) + .Execute() + .Should() + .Pass(); + } + } + + private static void ValidateProperties(TestAsset testAsset, TestProject testProject, bool expectSelfContained, bool expectRuntimeIdentifier, string targetFramework = null, string expectedRuntimeIdentifier = "") + { + targetFramework = targetFramework ?? testProject.TargetFrameworks; + + + if (string.IsNullOrEmpty(expectedRuntimeIdentifier) && (expectSelfContained || expectRuntimeIdentifier)) + { + // RuntimeIdentifier might be inferred, so look at the output path to figure out what the actual value used was + string dir = (Path.Combine(testAsset.TestRoot, testProject.Name, "bin", "Debug", targetFramework)); + expectedRuntimeIdentifier = Path.GetFileName(Directory.GetDirectories(dir).Single()); + } + + var properties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework: targetFramework, runtimeIdentifier: expectedRuntimeIdentifier); + if (expectSelfContained) + { + properties["SelfContained"].ToLowerInvariant().Should().Be("true"); + } + else + { + properties["SelfContained"].ToLowerInvariant().Should().BeOneOf("false", ""); + } + + properties["RuntimeIdentifier"].Should().Be(expectedRuntimeIdentifier); + } + + } +} 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 e1d159970dcc..8adaf12539be 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 @@ -3297,23 +3297,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm-minimal.pdb" }, - { - "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.${RuntimeVersion}.[[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", @@ -6731,23 +6714,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb" }, - { - "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.${RuntimeVersion}.[[hash]].js.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "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.${RuntimeVersion}.[[hash]].js" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", 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 c58ca3320e04..80016e7e56ae 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,6 @@ "${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.${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 +674,6 @@ "${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.${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 9b04776d468f..099ccaa47996 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 @@ -3531,23 +3531,6 @@ "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.${RuntimeVersion}.[[hash]].js", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet-crypto-worker.${RuntimeVersion}.[[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", @@ -7543,23 +7526,6 @@ "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.${RuntimeVersion}.[[hash]].js.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "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.${RuntimeVersion}.[[hash]].js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "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]]", "SourceId": "blazorwasm", 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 b9e28ffbe4ba..e99f12848896 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 @@ -3378,23 +3378,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm.pdb" }, - { - "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.${RuntimeVersion}.[[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", @@ -6846,23 +6829,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb" }, - { - "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.${RuntimeVersion}.[[hash]].js.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "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.${RuntimeVersion}.[[hash]].js" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", 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 bb63e41b64f4..934104e8543c 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 @@ -158,6 +158,9 @@ "${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", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.gz", @@ -176,15 +179,24 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.gz", @@ -198,9 +210,6 @@ "${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", @@ -229,7 +238,6 @@ "${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", @@ -240,7 +248,6 @@ "${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]]", @@ -349,6 +356,8 @@ "${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.InteropServices.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.dll.br]]", @@ -361,12 +370,18 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Encodings.Web.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazor.boot.json.br]]", @@ -374,7 +389,6 @@ "${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]]", @@ -441,15 +455,19 @@ "${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.InteropServices.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Claims.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Cryptography.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Encodings.Web.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll", 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 dd9585392a4b..4a790dee04c5 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,23 +33,6 @@ "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", @@ -220,23 +203,6 @@ "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", @@ -2073,6 +2039,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2277,6 +2277,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2311,6 +2345,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2379,6 +2447,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2498,23 +2600,6 @@ "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", @@ -3637,6 +3722,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "SourceId": "blazorwasm-minimal", @@ -3739,6 +3841,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm-minimal", @@ -3756,6 +3875,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "SourceId": "blazorwasm-minimal", @@ -3790,6 +3926,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "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 5fecae521da5..220263410bc2 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 @@ -155,6 +155,9 @@ "${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", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.gz", @@ -173,15 +176,24 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.gz", @@ -195,9 +207,6 @@ "${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,7 +235,6 @@ "${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", @@ -237,7 +245,6 @@ "${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]]", @@ -344,6 +351,8 @@ "${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.InteropServices.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.dll.br]]", @@ -356,12 +365,18 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Encodings.Web.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazor.boot.json.br]]", @@ -369,7 +384,6 @@ "${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]]", @@ -436,15 +450,19 @@ "${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.InteropServices.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Claims.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Cryptography.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Encodings.Web.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll" 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 ae65507b2333..35761bd0f421 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,23 +33,6 @@ "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", @@ -220,23 +203,6 @@ "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", @@ -2039,6 +2005,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2243,6 +2243,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2277,6 +2311,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2345,6 +2413,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2464,23 +2566,6 @@ "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", @@ -3603,6 +3688,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "SourceId": "blazorwasm-minimal", @@ -3705,6 +3807,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm-minimal", @@ -3722,6 +3841,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "SourceId": "blazorwasm-minimal", @@ -3756,6 +3892,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "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 6f13c439e18b..0c93b30700ae 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 @@ -165,6 +165,9 @@ "${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", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.gz", @@ -183,15 +186,24 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.gz", @@ -205,9 +217,6 @@ "${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 16c1de8c9894..127d989ad922 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,23 +97,6 @@ "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", @@ -301,23 +284,6 @@ "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", @@ -2188,6 +2154,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "SourceId": "blazorwasm", @@ -2392,6 +2392,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm", @@ -2426,6 +2460,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "SourceId": "blazorwasm", @@ -2494,6 +2562,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "SourceId": "blazorwasm", @@ -2613,23 +2715,6 @@ "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", @@ -3786,6 +3871,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "SourceId": "blazorwasm", @@ -3888,6 +3990,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm", @@ -3905,6 +4024,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "SourceId": "blazorwasm", @@ -3939,6 +4075,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.dll", "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 5fecae521da5..220263410bc2 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 @@ -155,6 +155,9 @@ "${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", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.gz", @@ -173,15 +176,24 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.gz", @@ -195,9 +207,6 @@ "${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,7 +235,6 @@ "${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", @@ -237,7 +245,6 @@ "${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]]", @@ -344,6 +351,8 @@ "${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.InteropServices.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.dll.br]]", @@ -356,12 +365,18 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Encodings.Web.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazor.boot.json.br]]", @@ -369,7 +384,6 @@ "${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]]", @@ -436,15 +450,19 @@ "${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.InteropServices.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Claims.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Cryptography.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Encodings.Web.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll" 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 6c94c99b75f6..5b242e21a1a2 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,23 +33,6 @@ "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", @@ -220,23 +203,6 @@ "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", @@ -2039,6 +2005,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2243,6 +2243,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2277,6 +2311,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2345,6 +2413,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2464,23 +2566,6 @@ "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", @@ -3603,6 +3688,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "SourceId": "blazorwasm-minimal", @@ -3705,6 +3807,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm-minimal", @@ -3722,6 +3841,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "SourceId": "blazorwasm-minimal", @@ -3756,6 +3892,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "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 060598ddef74..786642d88de3 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,6 @@ "${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.${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 +594,6 @@ "${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.${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 1b74b78f3dfc..bda00477025c 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 @@ -3297,23 +3297,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm-minimal.pdb" }, - { - "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.${RuntimeVersion}.[[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", @@ -6731,23 +6714,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb" }, - { - "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.${RuntimeVersion}.[[hash]].js.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "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.${RuntimeVersion}.[[hash]].js" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm-minimal", 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 4585cc000f24..7a2b3f74e383 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,6 @@ "${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.${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 514e4bdea6be..16a7427bf43b 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 @@ -3361,23 +3361,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm.pdb" }, - { - "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.${RuntimeVersion}.[[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", @@ -6829,23 +6812,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm.pdb" }, - { - "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.${RuntimeVersion}.[[hash]].js.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "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.${RuntimeVersion}.[[hash]].js" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]", "SourceId": "blazorwasm", 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 cbeb4120849e..4b48c2e05d89 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 @@ -155,6 +155,9 @@ "${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", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.gz", @@ -173,15 +176,24 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.gz", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.br", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.gz", @@ -195,9 +207,6 @@ "${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", @@ -229,7 +238,6 @@ "${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", @@ -240,7 +248,6 @@ "${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]]", @@ -347,6 +354,8 @@ "${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.InteropServices.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.dll.br]]", @@ -359,12 +368,18 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Encodings.Web.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.dll.gz]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/blazor.boot.json.br]]", @@ -372,7 +387,6 @@ "${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]]", @@ -439,15 +453,19 @@ "${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.InteropServices.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Claims.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Cryptography.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Encodings.Web.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll", 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 c1c49f0a9291..e96fd5807d41 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,23 +33,6 @@ "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", @@ -220,23 +203,6 @@ "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", @@ -2039,6 +2005,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2243,6 +2243,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2277,6 +2311,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2345,6 +2413,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -2464,23 +2566,6 @@ "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", @@ -3637,6 +3722,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "SourceId": "blazorwasm-minimal", @@ -3739,6 +3841,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm-minimal", @@ -3756,6 +3875,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "SourceId": "blazorwasm-minimal", @@ -3790,6 +3926,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.dll", "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 de06be78791c..7d5fccfb84d9 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 @@ -162,6 +162,9 @@ "${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", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.gz", @@ -180,15 +183,24 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.gz", @@ -202,9 +214,6 @@ "${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 cf9e3f5e98e5..74334eca994d 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,23 +80,6 @@ "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,23 +267,6 @@ "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", @@ -2137,6 +2103,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "SourceId": "blazorwasm", @@ -2341,6 +2341,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm", @@ -2375,6 +2409,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "SourceId": "blazorwasm", @@ -2443,6 +2511,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "SourceId": "blazorwasm", @@ -2562,23 +2664,6 @@ "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", @@ -3735,6 +3820,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "SourceId": "blazorwasm", @@ -3837,6 +3939,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm", @@ -3854,6 +3973,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "SourceId": "blazorwasm", @@ -3888,6 +4024,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.dll", "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 de06be78791c..7d5fccfb84d9 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 @@ -162,6 +162,9 @@ "${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", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.InteropServices.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Runtime.Loader.dll.gz", @@ -180,15 +183,24 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Thread.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.ThreadPool.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.dll.gz", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.br", + "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Transactions.Local.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.dll.gz", @@ -202,9 +214,6 @@ "${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 cf9e3f5e98e5..74334eca994d 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,23 +80,6 @@ "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,23 +267,6 @@ "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", @@ -2137,6 +2103,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.InteropServices.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Runtime.Loader.dll.br]]", "SourceId": "blazorwasm", @@ -2341,6 +2341,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm", @@ -2375,6 +2409,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.ThreadPool.dll.br]]", "SourceId": "blazorwasm", @@ -2443,6 +2511,40 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.br]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Transactions.Local.dll.gz]]", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.dll.br]]", "SourceId": "blazorwasm", @@ -2562,23 +2664,6 @@ "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", @@ -3735,6 +3820,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.RuntimeInformation.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Runtime.InteropServices.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Runtime.InteropServices.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Runtime.Loader.dll", "SourceId": "blazorwasm", @@ -3837,6 +3939,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Channels.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm", @@ -3854,6 +3973,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Threading.Thread.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", "SourceId": "blazorwasm", @@ -3888,6 +4024,23 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.dll" }, + { + "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/System.Transactions.Local.dll", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "RelatedAsset": "", + "AssetTraitName": "BlazorWebAssemblyResource", + "AssetTraitValue": "runtime", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Transactions.Local.dll" + }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.dll", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.TestFramework/Commands/DotnetBuildCommand.cs b/src/Tests/Microsoft.NET.TestFramework/Commands/DotnetBuildCommand.cs index b8225e0a84b6..d34e6d5301d5 100644 --- a/src/Tests/Microsoft.NET.TestFramework/Commands/DotnetBuildCommand.cs +++ b/src/Tests/Microsoft.NET.TestFramework/Commands/DotnetBuildCommand.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Text; using Xunit.Abstractions; @@ -12,5 +13,10 @@ public DotnetBuildCommand(ITestOutputHelper log, params string[] args) : base(lo Arguments.Add("build"); Arguments.AddRange(args); } + + public DotnetBuildCommand(TestAsset testAsset, params string[] args) : this(testAsset.Log, args) + { + WorkingDirectory = Path.Combine(testAsset.TestRoot, testAsset.TestProject.Name); + } } } diff --git a/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs b/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs index 85188252743e..9df9d44a4f25 100644 --- a/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs +++ b/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs @@ -6,6 +6,7 @@ using System.Xml.Linq; using Microsoft.Build.Utilities; using NuGet.Frameworks; +using Xunit.Sdk; namespace Microsoft.NET.TestFramework.ProjectConstruction { @@ -63,6 +64,12 @@ public TestProject([CallerMemberName] string name = null) public List> ProjectChanges { get; } = new List>(); + /// + /// A list of properties to record the values for when the project is built. + /// Values can be retrieved with + /// + public List PropertiesToRecord { get; } = new List(); + public IEnumerable TargetFrameworkIdentifiers { get @@ -327,11 +334,9 @@ internal void Create(TestAsset targetTestAsset, string testProjectsSourceFolder, if (SourceFiles.Count == 0) { - string source; - if (this.IsExe || this.IsWinExe) { - source = + string source = @"using System; class Program @@ -343,40 +348,49 @@ static void Main(string[] args) foreach (var dependency in this.ReferencedProjects) { - source += $" Console.WriteLine({dependency.Name}.{dependency.Name}Class.Name);" + Environment.NewLine; - source += $" Console.WriteLine({dependency.Name}.{dependency.Name}Class.List);" + Environment.NewLine; + string safeDependencyName = dependency.Name.Replace('.', '_'); + + source += $" Console.WriteLine({safeDependencyName}.{safeDependencyName}Class.Name);" + Environment.NewLine; + source += $" Console.WriteLine({safeDependencyName}.{safeDependencyName}Class.List);" + Environment.NewLine; } source += @" } }"; + string sourcePath = Path.Combine(targetFolder, this.Name + "Program.cs"); + + File.WriteAllText(sourcePath, source); } - else + { - source = + string safeThisName = this.Name.Replace('.', '_'); + string source = $@"using System; using System.Collections.Generic; -namespace {this.Name} +namespace {safeThisName} {{ - public class {this.Name}Class + public class {safeThisName}Class {{ public static string Name {{ get {{ return ""{this.Name}""; }} }} public static List List {{ get {{ return null; }} }} "; foreach (var dependency in this.ReferencedProjects) { - source += $" public string {dependency.Name}Name {{ get {{ return {dependency.Name}.{dependency.Name}Class.Name; }} }}" + Environment.NewLine; - source += $" public List {dependency.Name}List {{ get {{ return {dependency.Name}.{dependency.Name}Class.List; }} }}" + Environment.NewLine; + string safeDependencyName = dependency.Name.Replace('.', '_'); + + source += $" public string {safeDependencyName}Name {{ get {{ return {safeDependencyName}.{safeDependencyName}Class.Name; }} }}" + Environment.NewLine; + source += $" public List {safeDependencyName}List {{ get {{ return {safeDependencyName}.{safeDependencyName}Class.List; }} }}" + Environment.NewLine; } source += @" } }"; + string sourcePath = Path.Combine(targetFolder, this.Name + ".cs"); + + File.WriteAllText(sourcePath, source); } - string sourcePath = Path.Combine(targetFolder, this.Name + ".cs"); - File.WriteAllText(sourcePath, source); } else { @@ -390,6 +404,41 @@ public class {this.Name}Class { File.WriteAllText(Path.Combine(targetFolder, kvp.Key), kvp.Value); } + + if (PropertiesToRecord.Any()) + { + string propertiesElements = ""; + foreach (var propertyName in PropertiesToRecord) + { + propertiesElements += $" " + Environment.NewLine; + } + + string injectTargetContents = + $@" + + +{propertiesElements} + + + +"; + + injectTargetContents = injectTargetContents.Replace('`', '"'); + + string targetPath = Path.Combine(targetFolder, "obj", Name + ".csproj.WriteValuesToFile.g.targets"); + + if (!Directory.Exists(Path.GetDirectoryName(targetPath))) + { + Directory.CreateDirectory(Path.GetDirectoryName(targetPath)); + } + + File.WriteAllText(targetPath, injectTargetContents); + } } public void AddItem(string itemName, string attributeName, string attributeValue) @@ -402,6 +451,35 @@ public void AddItem(string itemName, Dictionary attributes) AdditionalItems.Add(new(itemName, attributes)); } + public void RecordProperties(params string[] propertyNames) + { + PropertiesToRecord.AddRange(propertyNames); + } + + public Dictionary GetPropertyValues(string testRoot, string configuration = "Debug", string targetFramework = null, string runtimeIdentifier = null) + { + var propertyValues = new Dictionary(); + + string intermediateOutputPath = Path.Combine(testRoot, Name, "obj", configuration, targetFramework ?? TargetFrameworks); + if (!string.IsNullOrEmpty(runtimeIdentifier)) + { + intermediateOutputPath = Path.Combine(intermediateOutputPath, runtimeIdentifier); + } + + foreach (var line in File.ReadAllLines(Path.Combine(intermediateOutputPath, "PropertyValues.txt"))) + { + int colonIndex = line.IndexOf(':'); + if (colonIndex > 0) + { + string propertyName = line.Substring(0, colonIndex); + string propertyValue = line.Length == colonIndex + 1 ? String.Empty : line.Substring(colonIndex + 2); + propertyValues[propertyName] = propertyValue; + } + } + + return propertyValues; + } + public static bool ReferenceAssembliesAreInstalled(TargetDotNetFrameworkVersion targetFrameworkVersion) { var referenceAssemblies = ToolLocationHelper.GetPathToDotNetFrameworkReferenceAssemblies(targetFrameworkVersion); diff --git a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index 36150c4b10f0..e1e34c69ff5d 100644 --- a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -269,6 +269,33 @@ public void It_builds_with_implicit_rid_with_self_contained_option() .NotHaveStdOutContaining("NETSDK1031"); } + [RequiresMSBuildVersionFact("17.4.0.41702")] + public void It_builds_referenced_exe_with_self_contained_specified_via_command_line_argument() + { + var referencedProject = new TestProject("ReferencedProject") + { + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, + IsExe = true + }; + + var testProject = new TestProject("TestProject") + { + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, + IsExe = true + }; + testProject.ReferencedProjects.Add(referencedProject); + + var testAsset = _testAssetsManager.CreateTestProject(testProject); + + new DotnetCommand(Log) + .WithWorkingDirectory(Path.Combine(testAsset.Path, testProject.Name)) + .Execute("build", "-r", EnvironmentInfo.GetCompatibleRid(), "--self-contained") + .Should() + .Pass() + .And + .NotHaveStdOutContaining("NETSDK1179"); + } + [Theory] [InlineData("roslyn3.9")] [InlineData("roslyn4.0")]