From 5c8503a7f84ac12f4390a8318812c683ca474c14 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 11 Oct 2021 17:26:11 -0700 Subject: [PATCH 01/45] Improve handling of RuntimeIdentifier and SelfContained across project references --- .../ValidateExecutableReferences.cs | 10 ++++++++++ .../targets/Microsoft.NET.Sdk.BeforeCommon.targets | 9 +++++++++ .../targets/Microsoft.NET.Sdk.targets | 13 +++++++++++++ 3 files changed, 32 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs index fe94fca6be87..61ccf4f2293f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs @@ -14,6 +14,8 @@ public class ValidateExecutableReferences : TaskBase { public bool SelfContained { get; set; } + public bool SelfContainedIsGlobalProperty { get; set; } + public bool IsExecutable { get; set; } public ITaskItem[] ReferencedProjects { get; set; } = Array.Empty(); @@ -53,6 +55,14 @@ protected override void ExecuteCore() bool referencedProjectIsExecutable = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["_IsExecutable"]); bool referencedProjectIsSelfContained = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["SelfContained"]); + if (SelfContainedIsGlobalProperty && project.GetBooleanMetadata("AcceptsRuntimeIdentifier") == true) + { + // If AcceptsRuntimeIdentifier is true for the project, and SelfContained was set as a global property, + // then the SelfContained value will flow across the project reference when we go to build it, despite the + // fact that we ignored it when doing the GetTargetFrameworks negotiation. + referencedProjectIsSelfContained = SelfContained; + } + if (referencedProjectIsExecutable && shouldBeValidatedAsExecutableReference) { if (SelfContained && !referencedProjectIsSelfContained) 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..c0dd1a09997e 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,6 +22,15 @@ Copyright (c) .NET Foundation. All rights reserved. <_IsExecutable Condition="'$(OutputType)' == 'Exe' or '$(OutputType)'=='WinExe'">true + + + + + + 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 e207114a17af..41c3d43aaef0 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 @@ -1096,12 +1096,25 @@ Copyright (c) .NET Foundation. All rights reserved. <_UseAttributeForTargetFrameworkInfoPropertyNames Condition="$([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), '17.0'))">true + + + <_SelfContainedBackupValue>$(SelfContained) + NotAValue + <_SelfContainedIsGlobalProperty Condition="'$(SelfContained)' == '$(_SelfContainedBackupValue)'">true + $(_SelfContainedBackupValue) + <_SelfContainedBackupValue> + + Date: Mon, 11 Oct 2021 17:26:36 -0700 Subject: [PATCH 02/45] Add test for SelfContained flowing across project reference --- .../ProjectConstruction/TestProject.cs | 33 +++++++++++-------- .../GivenDotnetBuildBuildsCsproj.cs | 27 +++++++++++++++ 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs b/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs index 85188252743e..411c8f96139b 100644 --- a/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs +++ b/src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs @@ -327,11 +327,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 +341,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 { diff --git a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index 36150c4b10f0..10981b5b5e5a 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"); } + [Fact] + 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")] From 63ae00b1af54cc74a8d1dd7b426e2b783e0d6911 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 11 Oct 2021 19:06:17 -0700 Subject: [PATCH 03/45] Move AcceptsRuntimeIdentifier logic and exclude test projects --- .../targets/Microsoft.NET.Sdk.BeforeCommon.targets | 8 -------- .../targets/Microsoft.NET.Sdk.targets | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) 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 c0dd1a09997e..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 @@ -25,14 +25,6 @@ Copyright (c) .NET Foundation. All rights reserved. - - - 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 41c3d43aaef0..42cd29e1c4bb 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 @@ -79,6 +79,14 @@ Copyright (c) .NET Foundation. All rights reserved. true + + + true + + From bf9b7a3cafc1891db2c14ea890cea6e286660162 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 12 Oct 2021 12:38:05 -0700 Subject: [PATCH 04/45] Add breaking change information --- ...SelfContainedBreakingChangeNotification.md | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 documentation/general/SelfContainedBreakingChangeNotification.md diff --git a/documentation/general/SelfContainedBreakingChangeNotification.md b/documentation/general/SelfContainedBreakingChangeNotification.md new file mode 100644 index 000000000000..cc7554e75ab1 --- /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 a referenced project if any of the following are true for the referenced project: + +- The `AcceptsRuntimeIdentifier` property is set to `true` +- 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 `AcceptsRuntimeIdentifier` to true (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:AcceptsRuntimeIdentifier=true`. + +## Open Questions + +TODO: How does this apply to solutions? Could a solution build set AcceptsRuntimeIdentifier 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 From 45f8979059e8f787d48f8b1b01e81a7952d31992 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 18 Oct 2021 15:16:39 -0700 Subject: [PATCH 05/45] Detect whether SelfContained is a global property inside task --- .../ValidateExecutableReferences.cs | 6 +++--- .../targets/Microsoft.NET.Sdk.targets | 13 ------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs index 61ccf4f2293f..901afe6edb9f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs @@ -14,8 +14,6 @@ public class ValidateExecutableReferences : TaskBase { public bool SelfContained { get; set; } - public bool SelfContainedIsGlobalProperty { get; set; } - public bool IsExecutable { get; set; } public ITaskItem[] ReferencedProjects { get; set; } = Array.Empty(); @@ -55,7 +53,9 @@ protected override void ExecuteCore() bool referencedProjectIsExecutable = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["_IsExecutable"]); bool referencedProjectIsSelfContained = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["SelfContained"]); - if (SelfContainedIsGlobalProperty && project.GetBooleanMetadata("AcceptsRuntimeIdentifier") == true) + bool selfContainedIsGlobalProperty = BuildEngine6.GetGlobalProperties().ContainsKey("SelfContained"); + + if (selfContainedIsGlobalProperty && project.GetBooleanMetadata("AcceptsRuntimeIdentifier") == true) { // If AcceptsRuntimeIdentifier is true for the project, and SelfContained was set as a global property, // then the SelfContained value will flow across the project reference when we go to build it, despite the 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 42cd29e1c4bb..af69938c62d4 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 @@ -1104,25 +1104,12 @@ Copyright (c) .NET Foundation. All rights reserved. <_UseAttributeForTargetFrameworkInfoPropertyNames Condition="$([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), '17.0'))">true - - - <_SelfContainedBackupValue>$(SelfContained) - NotAValue - <_SelfContainedIsGlobalProperty Condition="'$(SelfContained)' == '$(_SelfContainedBackupValue)'">true - $(_SelfContainedBackupValue) - <_SelfContainedBackupValue> - - Date: Fri, 3 Dec 2021 15:43:43 -0800 Subject: [PATCH 06/45] Handle consuming AcceptsRuntimeIdentifier metadata from multi-targeted projects --- .../ValidateExecutableReferences.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs index 901afe6edb9f..686b0591f320 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs @@ -55,7 +55,14 @@ protected override void ExecuteCore() bool selfContainedIsGlobalProperty = BuildEngine6.GetGlobalProperties().ContainsKey("SelfContained"); - if (selfContainedIsGlobalProperty && project.GetBooleanMetadata("AcceptsRuntimeIdentifier") == true) + bool projectAcceptsRuntimeIdentifier = false; + if (projectAdditionalProperties.TryGetValue("AcceptsRuntimeIdentifier", out string acceptsRID) && + bool.TryParse(acceptsRID, out bool acceptsRIDParseResult)) + { + projectAcceptsRuntimeIdentifier = acceptsRIDParseResult; + } + + if (selfContainedIsGlobalProperty && projectAcceptsRuntimeIdentifier) { // If AcceptsRuntimeIdentifier is true for the project, and SelfContained was set as a global property, // then the SelfContained value will flow across the project reference when we go to build it, despite the From 26df179427e874b66290b31cedb305262853e013 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 11 Aug 2022 20:48:22 -0400 Subject: [PATCH 07/45] Use IsRidAgnostic instead of AcceptsRuntimeIdentifier --- .../SelfContainedBreakingChangeNotification.md | 8 ++++---- .../ValidateExecutableReferences.cs | 12 ++++++------ .../targets/Microsoft.NET.Sdk.targets | 12 +++++++----- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/documentation/general/SelfContainedBreakingChangeNotification.md b/documentation/general/SelfContainedBreakingChangeNotification.md index cc7554e75ab1..bbaeceb3fd30 100644 --- a/documentation/general/SelfContainedBreakingChangeNotification.md +++ b/documentation/general/SelfContainedBreakingChangeNotification.md @@ -21,7 +21,7 @@ If `SelfContained` was specified on the command line, it would always flow to re Both `SelfContained` and `RuntimeIdentifier` will flow a referenced project if any of the following are true for the referenced project: -- The `AcceptsRuntimeIdentifier` property is set to `true` +- The `IsRidAgnostic` property is set to `false` - The `OutputType` is `Exe` or `WinExe` - Either the `RuntimeIdentifer` or `RuntimeIdentifiers` property is non-empty @@ -44,10 +44,10 @@ 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 `AcceptsRuntimeIdentifier` to true (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:AcceptsRuntimeIdentifier=true`. +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 AcceptsRuntimeIdentifier for all projects, and would that fix other issues we have when specifying the RuntimeIdentifier for a solution build? +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/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs index 686b0591f320..6bf05749558b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs @@ -55,16 +55,16 @@ protected override void ExecuteCore() bool selfContainedIsGlobalProperty = BuildEngine6.GetGlobalProperties().ContainsKey("SelfContained"); - bool projectAcceptsRuntimeIdentifier = false; - if (projectAdditionalProperties.TryGetValue("AcceptsRuntimeIdentifier", out string acceptsRID) && - bool.TryParse(acceptsRID, out bool acceptsRIDParseResult)) + bool projectIsRidAgnostic = true; + if (projectAdditionalProperties.TryGetValue("IsRidAgnostic", out string isRidAgnostic) && + bool.TryParse(isRidAgnostic, out bool isRidAgnosticParseResult)) { - projectAcceptsRuntimeIdentifier = acceptsRIDParseResult; + projectIsRidAgnostic = isRidAgnosticParseResult; } - if (selfContainedIsGlobalProperty && projectAcceptsRuntimeIdentifier) + if (selfContainedIsGlobalProperty && !projectIsRidAgnostic) { - // If AcceptsRuntimeIdentifier is true for the project, and SelfContained was set as a global property, + // If a project is NOT RID agnostic, and SelfContained was set as a global property, // then the SelfContained value will flow across the project reference when we go to build it, despite the // fact that we ignored it when doing the GetTargetFrameworks negotiation. referencedProjectIsSelfContained = SelfContained; 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 af69938c62d4..b09eebd44d49 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 @@ -79,12 +79,13 @@ Copyright (c) .NET Foundation. All rights reserved. true - - - true + + false + true - 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.22416.3 + 7.0.0-rc.1.22416.3 + 7.0.0-rc.1.22416.3 $(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.22416.3 + 7.0.0-rc.1.22416.3 + 7.0.0-rc.1.22416.3 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.22416.3 + 7.0.0-rc.1.22416.3 + 7.0.0-rc.1.22416.3 + 7.0.0-rc.1.22416.3 From 29097044980f6ab3948557421a884e210eb39aa8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Aug 2022 22:52:32 +0000 Subject: [PATCH 09/45] Update dependencies from https://github.com/dotnet/fsharp build 20220816.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 6.0.6-beta.22414.2 -> To Version 6.0.6-beta.22416.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42fe50b80d93..429e950a622e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,13 +50,13 @@ https://github.com/dotnet/msbuild f0a66ec4390b6590ee09dc111cc5e1d8e975df3f - + https://github.com/dotnet/fsharp - ee745b0455fe651b6f5e5f9b85fc59a7b2574395 + f4056f7db3803041dafe212234da0866ec32911b - + https://github.com/dotnet/fsharp - ee745b0455fe651b6f5e5f9b85fc59a7b2574395 + f4056f7db3803041dafe212234da0866ec32911b diff --git a/eng/Versions.props b/eng/Versions.props index e1c96485bf8c..8598322fdfda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.0.6-beta.22414.2 + 12.0.6-beta.22416.3 From 8c5b93a6a2fdc2ddb027201b433ecfa2e482b677 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Aug 2022 00:38:22 +0000 Subject: [PATCH 10/45] Update dependencies from https://github.com/dotnet/linker build 20220815.4 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22415.1 -> To Version 7.0.100-1.22415.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42fe50b80d93..6e1ec9aac63e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,9 +105,9 @@ https://github.com/microsoft/vstest ef0aa102e9c7d5cf55af06c2747d11e07d12b69a - + https://github.com/dotnet/linker - 33c3b2c60d0a2006162a6326db853fe5415439bd + 6252a2194dd32911db2c0669fc818555687d5570 @@ -115,9 +115,9 @@ f52d8c59bb49360eb2cbeeb863c5856ebd62adda - + https://github.com/dotnet/linker - 33c3b2c60d0a2006162a6326db853fe5415439bd + 6252a2194dd32911db2c0669fc818555687d5570 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e1c96485bf8c..f7ca80ff9bb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,7 +85,7 @@ - 7.0.100-1.22415.1 + 7.0.100-1.22415.4 $(MicrosoftNETILLinkTasksPackageVersion) From ead72e227c9512c399be341a4ecf8dca40903797 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Aug 2022 21:06:11 +0000 Subject: [PATCH 11/45] [main] Update dependencies from dotnet/linker (#27186) [main] Update dependencies from dotnet/linker - Workaround for the floating version with a specific one - Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-6d2336f7-8e45-4040-a5ee-f40e1cbcdd1b - updating the floating version to a fixed one on main test as well --- .../GivenThatWeWantToPublishAnAotApp.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index c20ecbf015e8..c674294f09e1 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -272,7 +272,7 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_enabled(string testProject.AdditionalProperties["PublishAot"] = "true"; // This will add a reference to a package that will also be automatically imported by the SDK - testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-*")); + testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); // Linux symbol files are embedded and require additional steps to be stripped to a separate file // assumes /bin (or /usr/bin) are in the PATH @@ -319,7 +319,7 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_empty(string t var testProject = CreateHelloWorldTestProject(targetFramework, projectName, true); // This will add a reference to a package that will also be automatically imported by the SDK - testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-*")); + testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); // Linux symbol files are embedded and require additional steps to be stripped to a separate file // assumes /bin (or /usr/bin) are in the PATH @@ -367,8 +367,8 @@ public void NativeAot_hw_runs_with_cross_PackageReference_PublishAot_is_enabled( testProject.AdditionalProperties["PublishAot"] = "true"; // This will add a reference to a package that will also be automatically imported by the SDK - testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-*")); - testProject.PackageReferences.Add(new TestPackageReference("runtime.win-x64.Microsoft.DotNet.ILCompiler", "7.0.0-*")); + testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); + testProject.PackageReferences.Add(new TestPackageReference("runtime.win-x64.Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); var testAsset = _testAssetsManager.CreateTestProject(testProject); @@ -391,8 +391,8 @@ public void NativeAot_hw_runs_with_cross_PackageReference_PublishAot_is_empty(st var testProject = CreateHelloWorldTestProject(targetFramework, projectName, true); // This will add a reference to a package that will also be automatically imported by the SDK - testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-*")); - testProject.PackageReferences.Add(new TestPackageReference("runtime.win-x64.Microsoft.DotNet.ILCompiler", "7.0.0-*")); + testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); + testProject.PackageReferences.Add(new TestPackageReference("runtime.win-x64.Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); var testAsset = _testAssetsManager.CreateTestProject(testProject); From 6077c5f74ebd3929c849c5cf109868611efdcc5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Aug 2022 05:35:08 +0000 Subject: [PATCH 12/45] Update dependencies from https://github.com/dotnet/fsharp build 20220816.8 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 6.0.6-beta.22414.2 -> To Version 6.0.6-beta.22416.8 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 429e950a622e..6bc6cd4565cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,13 +50,13 @@ https://github.com/dotnet/msbuild f0a66ec4390b6590ee09dc111cc5e1d8e975df3f - + https://github.com/dotnet/fsharp - f4056f7db3803041dafe212234da0866ec32911b + 02e72a1a51d72f7b16b80f7cb96ea4202d237172 - + https://github.com/dotnet/fsharp - f4056f7db3803041dafe212234da0866ec32911b + 02e72a1a51d72f7b16b80f7cb96ea4202d237172 diff --git a/eng/Versions.props b/eng/Versions.props index 8598322fdfda..8023126a2189 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.0.6-beta.22416.3 + 12.0.6-beta.22416.8 From 046da8202069be69ffa64f9ed366363d471dea67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Aug 2022 09:18:21 +0000 Subject: [PATCH 13/45] Update dependencies from https://github.com/dotnet/msbuild build 20220816.2 (#27204) [release/7.0.1xx-rc1] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e1ec9aac63e..3ec9ff14ee32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/runtime f52d8c59bb49360eb2cbeeb863c5856ebd62adda - + https://github.com/dotnet/msbuild - f0a66ec4390b6590ee09dc111cc5e1d8e975df3f + 5d102ae37163fc1f22610bb433c3ab9a2fff91f0 - + https://github.com/dotnet/msbuild - f0a66ec4390b6590ee09dc111cc5e1d8e975df3f + 5d102ae37163fc1f22610bb433c3ab9a2fff91f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f7ca80ff9bb9..a1f3d85eae14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,7 +105,7 @@ - 17.4.0-preview-22413-01 + 17.4.0-preview-22416-02 - 6.4.0-preview.1.44 + 6.4.0-preview.1.47 $(NuGetBuildTasksPackageVersion) 6.0.0-rc.278 $(NuGetBuildTasksPackageVersion) From 2ea6b717603237551bd856e93448b8fa07cceaa9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Aug 2022 23:15:51 +0000 Subject: [PATCH 15/45] Update dependencies from https://github.com/dotnet/runtime build 20220817.9 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22411.12 -> To Version 7.0.0-rc.1.22417.9 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b998f141ead..3dc1f1ab88b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ f70d3b969edd4448903167fe9efd6f666b4a2fff - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 33c3b2c60d0a2006162a6326db853fe5415439bd - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a https://github.com/dotnet/linker 33c3b2c60d0a2006162a6326db853fe5415439bd - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - 080f708e7018f6c0529b6c875a44d84fc4d74419 + 56e2dc08c07aa263f250205ce5e5d6375e45278a https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index b8bc1ca014e5..85f05736a47c 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.22416.3 + 7.0.0-rc.1.22417.9 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22416.3 + 7.0.0-rc.1.22417.9 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.22416.3 - 7.0.0-rc.1.22416.3 - 7.0.0-rc.1.22416.3 + 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22417.9 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22416.3 - 7.0.0-rc.1.22416.3 - 7.0.0-rc.1.22416.3 + 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22417.9 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22416.3 - 7.0.0-rc.1.22416.3 - 7.0.0-rc.1.22416.3 - 7.0.0-rc.1.22416.3 + 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22417.9 From 579ad7fe2ac398dd57f4ae232e83098fbd8ba808 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 17 Aug 2022 23:48:37 -0400 Subject: [PATCH 16/45] Handle more cases of global property flow --- .../ValidateExecutableReferences.cs | 27 ++++++++++++++----- .../targets/Microsoft.NET.Sdk.targets | 3 ++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs index 6bf05749558b..9e0b461f27c3 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs @@ -52,8 +52,12 @@ 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"]); - bool selfContainedIsGlobalProperty = BuildEngine6.GetGlobalProperties().ContainsKey("SelfContained"); + var globalProperties = BuildEngine6.GetGlobalProperties(); + + bool selfContainedIsGlobalProperty = globalProperties.ContainsKey("SelfContained"); + bool runtimeIdentifierIsGlobalProperty = globalProperties.ContainsKey("RuntimeIdentifier"); bool projectIsRidAgnostic = true; if (projectAdditionalProperties.TryGetValue("IsRidAgnostic", out string isRidAgnostic) && @@ -62,12 +66,23 @@ protected override void ExecuteCore() projectIsRidAgnostic = isRidAgnosticParseResult; } - if (selfContainedIsGlobalProperty && !projectIsRidAgnostic) + if (!projectIsRidAgnostic) { - // If a project is NOT RID agnostic, and SelfContained was set as a global property, - // then the SelfContained value will flow across the project reference when we go to build it, despite the - // fact that we ignored it when doing the GetTargetFrameworks negotiation. - referencedProjectIsSelfContained = SelfContained; + // 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.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index b09eebd44d49..b7ebf6dd1c37 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 @@ -1080,8 +1080,9 @@ Copyright (c) .NET Foundation. All rights reserved. + - + false From 4468b0bdc925a964563db14541ab408d0fe524ee Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 18 Aug 2022 15:21:36 -0400 Subject: [PATCH 17/45] Add tests for global property flow across project references --- .../GlobalPropertyFlowTests.cs | 276 ++++++++++++++++++ .../Commands/DotnetBuildCommand.cs | 6 + .../ProjectConstruction/TestProject.cs | 71 +++++ 3 files changed, 353 insertions(+) create mode 100644 src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs 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..9d1faa3cfb64 --- /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; + } + + [Theory] + [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); + } + + [Theory] + [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); + } + + + [Theory] + [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); + } + } + + [Theory] + [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); + } + + [Theory] + [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"); + } + + [Theory] + [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.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 411c8f96139b..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 @@ -397,6 +404,41 @@ public class {safeThisName}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) @@ -409,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); From 33b98c82507c2255fe6cf2a30455f471b732ecf5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Aug 2022 19:34:01 +0000 Subject: [PATCH 18/45] Update dependencies from https://github.com/dotnet/templating build 20220818.4 Microsoft.TemplateEngine.Abstractions From Version 7.0.100-rc.1.22415.4 -> To Version 7.0.100-rc.1.22418.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fcc33184f8a..fe2cce889db0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - f70d3b969edd4448903167fe9efd6f666b4a2fff + 473ecdda43abf963ace6715985d416080ec0ece7 diff --git a/eng/Versions.props b/eng/Versions.props index d205d01188fe..56852d19c07c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 7.0.100-rc.1.22415.4 + 7.0.100-rc.1.22418.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From c99b553851f9c0e39331c0de4e11e18302faedda Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Aug 2022 20:35:57 +0000 Subject: [PATCH 19/45] Update dependencies from https://github.com/dotnet/roslyn build 20220818.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-2.22414.1 -> To Version 4.4.0-2.22418.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fcc33184f8a..b8984c868e19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,30 +64,30 @@ a4841cd2f1c9ccdb2c643e2faa61ba35dc2a8169 - + https://github.com/dotnet/roslyn - 98139d73b9ef47ffa0b5be0b7a61ad36826f1d3b + 859f881adea400727781c21fb7f24f863a258959 - + https://github.com/dotnet/roslyn - 98139d73b9ef47ffa0b5be0b7a61ad36826f1d3b + 859f881adea400727781c21fb7f24f863a258959 - + https://github.com/dotnet/roslyn - 98139d73b9ef47ffa0b5be0b7a61ad36826f1d3b + 859f881adea400727781c21fb7f24f863a258959 - + https://github.com/dotnet/roslyn - 98139d73b9ef47ffa0b5be0b7a61ad36826f1d3b + 859f881adea400727781c21fb7f24f863a258959 - + https://github.com/dotnet/roslyn - 98139d73b9ef47ffa0b5be0b7a61ad36826f1d3b + 859f881adea400727781c21fb7f24f863a258959 - + https://github.com/dotnet/roslyn - 98139d73b9ef47ffa0b5be0b7a61ad36826f1d3b + 859f881adea400727781c21fb7f24f863a258959 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d205d01188fe..243713d0a267 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,12 +137,12 @@ - 4.4.0-2.22414.1 - 4.4.0-2.22414.1 - 4.4.0-2.22414.1 - 4.4.0-2.22414.1 - 4.4.0-2.22414.1 - 4.4.0-2.22414.1 + 4.4.0-2.22418.4 + 4.4.0-2.22418.4 + 4.4.0-2.22418.4 + 4.4.0-2.22418.4 + 4.4.0-2.22418.4 + 4.4.0-2.22418.4 $(MicrosoftNetCompilersToolsetPackageVersion) From 6d33fa9ebcc34eb0fcd03d93e9b741bc84d412cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Aug 2022 20:49:36 +0000 Subject: [PATCH 20/45] Update dependencies from https://github.com/dotnet/roslyn build 20220818.5 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-2.22414.1 -> To Version 4.4.0-2.22418.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8984c868e19..365d46651367 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,30 +64,30 @@ a4841cd2f1c9ccdb2c643e2faa61ba35dc2a8169 - + https://github.com/dotnet/roslyn - 859f881adea400727781c21fb7f24f863a258959 + b219a897aaf1e28690b12dd5a847be685d59428c - + https://github.com/dotnet/roslyn - 859f881adea400727781c21fb7f24f863a258959 + b219a897aaf1e28690b12dd5a847be685d59428c - + https://github.com/dotnet/roslyn - 859f881adea400727781c21fb7f24f863a258959 + b219a897aaf1e28690b12dd5a847be685d59428c - + https://github.com/dotnet/roslyn - 859f881adea400727781c21fb7f24f863a258959 + b219a897aaf1e28690b12dd5a847be685d59428c - + https://github.com/dotnet/roslyn - 859f881adea400727781c21fb7f24f863a258959 + b219a897aaf1e28690b12dd5a847be685d59428c - + https://github.com/dotnet/roslyn - 859f881adea400727781c21fb7f24f863a258959 + b219a897aaf1e28690b12dd5a847be685d59428c https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 243713d0a267..e2323f4b370e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,12 +137,12 @@ - 4.4.0-2.22418.4 - 4.4.0-2.22418.4 - 4.4.0-2.22418.4 - 4.4.0-2.22418.4 - 4.4.0-2.22418.4 - 4.4.0-2.22418.4 + 4.4.0-2.22418.5 + 4.4.0-2.22418.5 + 4.4.0-2.22418.5 + 4.4.0-2.22418.5 + 4.4.0-2.22418.5 + 4.4.0-2.22418.5 $(MicrosoftNetCompilersToolsetPackageVersion) From 170ae6db6ff43b6f086e0bd43ed30ad5dd34056a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 00:29:33 +0000 Subject: [PATCH 21/45] Update dependencies from https://github.com/dotnet/roslyn build 20220818.6 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-2.22414.1 -> To Version 4.4.0-2.22418.6 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 365d46651367..4c3a4d05c49f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,30 +64,30 @@ a4841cd2f1c9ccdb2c643e2faa61ba35dc2a8169 - + https://github.com/dotnet/roslyn - b219a897aaf1e28690b12dd5a847be685d59428c + fe84827672656576f96b83a67955f5da40bff528 - + https://github.com/dotnet/roslyn - b219a897aaf1e28690b12dd5a847be685d59428c + fe84827672656576f96b83a67955f5da40bff528 - + https://github.com/dotnet/roslyn - b219a897aaf1e28690b12dd5a847be685d59428c + fe84827672656576f96b83a67955f5da40bff528 - + https://github.com/dotnet/roslyn - b219a897aaf1e28690b12dd5a847be685d59428c + fe84827672656576f96b83a67955f5da40bff528 - + https://github.com/dotnet/roslyn - b219a897aaf1e28690b12dd5a847be685d59428c + fe84827672656576f96b83a67955f5da40bff528 - + https://github.com/dotnet/roslyn - b219a897aaf1e28690b12dd5a847be685d59428c + fe84827672656576f96b83a67955f5da40bff528 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e2323f4b370e..88d3ce3c0564 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,12 +137,12 @@ - 4.4.0-2.22418.5 - 4.4.0-2.22418.5 - 4.4.0-2.22418.5 - 4.4.0-2.22418.5 - 4.4.0-2.22418.5 - 4.4.0-2.22418.5 + 4.4.0-2.22418.6 + 4.4.0-2.22418.6 + 4.4.0-2.22418.6 + 4.4.0-2.22418.6 + 4.4.0-2.22418.6 + 4.4.0-2.22418.6 $(MicrosoftNetCompilersToolsetPackageVersion) From d7a5fde13fdf8934d59b96451664feedf21b3b1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 00:48:05 +0000 Subject: [PATCH 22/45] Update dependencies from https://github.com/dotnet/roslyn build 20220818.7 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-2.22414.1 -> To Version 4.4.0-2.22418.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c3a4d05c49f..e9cf500c8297 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,30 +64,30 @@ a4841cd2f1c9ccdb2c643e2faa61ba35dc2a8169 - + https://github.com/dotnet/roslyn - fe84827672656576f96b83a67955f5da40bff528 + 650a65fb43478e726549e4d382242c0951061fd8 - + https://github.com/dotnet/roslyn - fe84827672656576f96b83a67955f5da40bff528 + 650a65fb43478e726549e4d382242c0951061fd8 - + https://github.com/dotnet/roslyn - fe84827672656576f96b83a67955f5da40bff528 + 650a65fb43478e726549e4d382242c0951061fd8 - + https://github.com/dotnet/roslyn - fe84827672656576f96b83a67955f5da40bff528 + 650a65fb43478e726549e4d382242c0951061fd8 - + https://github.com/dotnet/roslyn - fe84827672656576f96b83a67955f5da40bff528 + 650a65fb43478e726549e4d382242c0951061fd8 - + https://github.com/dotnet/roslyn - fe84827672656576f96b83a67955f5da40bff528 + 650a65fb43478e726549e4d382242c0951061fd8 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 88d3ce3c0564..1257962f473c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,12 +137,12 @@ - 4.4.0-2.22418.6 - 4.4.0-2.22418.6 - 4.4.0-2.22418.6 - 4.4.0-2.22418.6 - 4.4.0-2.22418.6 - 4.4.0-2.22418.6 + 4.4.0-2.22418.7 + 4.4.0-2.22418.7 + 4.4.0-2.22418.7 + 4.4.0-2.22418.7 + 4.4.0-2.22418.7 + 4.4.0-2.22418.7 $(MicrosoftNetCompilersToolsetPackageVersion) From bdefb9ae715b6ba3bea64a3e9785d2b78c8670c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 02:13:43 +0000 Subject: [PATCH 23/45] Update dependencies from https://github.com/dotnet/roslyn build 20220818.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-2.22414.1 -> To Version 4.4.0-2.22418.8 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9cf500c8297..c8cec0d04649 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,30 +64,30 @@ a4841cd2f1c9ccdb2c643e2faa61ba35dc2a8169 - + https://github.com/dotnet/roslyn - 650a65fb43478e726549e4d382242c0951061fd8 + 4af0d920079d1c8853991d2d49d18293de88f34d - + https://github.com/dotnet/roslyn - 650a65fb43478e726549e4d382242c0951061fd8 + 4af0d920079d1c8853991d2d49d18293de88f34d - + https://github.com/dotnet/roslyn - 650a65fb43478e726549e4d382242c0951061fd8 + 4af0d920079d1c8853991d2d49d18293de88f34d - + https://github.com/dotnet/roslyn - 650a65fb43478e726549e4d382242c0951061fd8 + 4af0d920079d1c8853991d2d49d18293de88f34d - + https://github.com/dotnet/roslyn - 650a65fb43478e726549e4d382242c0951061fd8 + 4af0d920079d1c8853991d2d49d18293de88f34d - + https://github.com/dotnet/roslyn - 650a65fb43478e726549e4d382242c0951061fd8 + 4af0d920079d1c8853991d2d49d18293de88f34d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1257962f473c..5f59adb6a56b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,12 +137,12 @@ - 4.4.0-2.22418.7 - 4.4.0-2.22418.7 - 4.4.0-2.22418.7 - 4.4.0-2.22418.7 - 4.4.0-2.22418.7 - 4.4.0-2.22418.7 + 4.4.0-2.22418.8 + 4.4.0-2.22418.8 + 4.4.0-2.22418.8 + 4.4.0-2.22418.8 + 4.4.0-2.22418.8 + 4.4.0-2.22418.8 $(MicrosoftNetCompilersToolsetPackageVersion) From 20f30e06058e098fc9fa380e14464756ed841287 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Aug 2022 02:52:05 +0000 Subject: [PATCH 24/45] [release/7.0.1xx-rc1] Update dependencies from dotnet/runtime (#27259) * Update dependencies from https://github.com/dotnet/runtime build 20220817.5 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22411.12 -> To Version 7.0.0-rc.1.22417.5 * Update dependencies from https://github.com/dotnet/runtime build 20220818.9 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22411.12 -> To Version 7.0.0-rc.1.22418.9 * Update Blazor WASM Baselines for new files (#27201) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tanay Parikh --- eng/Version.Details.xml | 60 +++--- eng/Versions.props | 24 +-- ...izeBlazorInitialization.Publish.files.json | 24 +++ ...nitialization.Publish.staticwebassets.json | 204 ++++++++++++++++++ ...tBuildAndPublishModules.Publish.files.json | 24 +++ ...ublishModules.Publish.staticwebassets.json | 204 ++++++++++++++++++ ...izeBlazorInitialization.Publish.files.json | 12 ++ ...nitialization.Publish.staticwebassets.json | 204 ++++++++++++++++++ ...nBlazorBootJsonManifest.Publish.files.json | 24 +++ ...tJsonManifest.Publish.staticwebassets.json | 204 ++++++++++++++++++ ...ts_PublishMinimal_Works.Publish.files.json | 24 +++ ...Minimal_Works.Publish.staticwebassets.json | 204 ++++++++++++++++++ ...mentationFiles_AsAssets.Publish.files.json | 12 ++ ...iles_AsAssets.Publish.staticwebassets.json | 204 ++++++++++++++++++ ...ts_Publish_Hosted_Works.Publish.files.json | 12 ++ ..._Hosted_Works.Publish.staticwebassets.json | 204 ++++++++++++++++++ 16 files changed, 1602 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe2cce889db0..0c7dece96317 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 473ecdda43abf963ace6715985d416080ec0ece7 - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + 08fdcb7e2d86292b529e7d662b691d8c86de678d https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 56852d19c07c..c64ae20e6759 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.22418.9 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22411.12 + 7.0.0-rc.1.22418.9 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.22418.9 + 7.0.0-rc.1.22418.9 + 7.0.0-rc.1.22418.9 $(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.22418.9 + 7.0.0-rc.1.22418.9 + 7.0.0-rc.1.22418.9 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.22418.9 + 7.0.0-rc.1.22418.9 + 7.0.0-rc.1.22418.9 + 7.0.0-rc.1.22418.9 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..7a817645d6a5 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", @@ -349,6 +361,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 +375,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]]", @@ -441,15 +461,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..cf4d4364558e 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 @@ -2073,6 +2073,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 +2311,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 +2379,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 +2481,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", @@ -3637,6 +3773,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 +3892,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 +3926,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 +3977,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..411d85206e52 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", @@ -344,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]]", @@ -356,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]]", @@ -436,15 +456,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..db8d23130542 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 @@ -2039,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", @@ -2243,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", @@ -2277,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", @@ -2345,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", @@ -3603,6 +3739,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 +3858,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 +3892,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 +3943,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..f03aa5e40615 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", 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..b7963235b957 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 @@ -2188,6 +2188,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 +2426,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 +2494,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 +2596,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", @@ -3786,6 +3922,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 +4041,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 +4075,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 +4126,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..411d85206e52 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", @@ -344,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]]", @@ -356,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]]", @@ -436,15 +456,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..7bcb5832d0be 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 @@ -2039,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", @@ -2243,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", @@ -2277,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", @@ -2345,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", @@ -3603,6 +3739,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 +3858,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 +3892,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 +3943,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_PublishMinimal_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json index cbeb4120849e..8866a0d9c3fb 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", @@ -347,6 +359,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 +373,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]]", @@ -439,15 +459,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..0fc053f9a619 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 @@ -2039,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", @@ -2243,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", @@ -2277,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", @@ -2345,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", @@ -3637,6 +3773,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 +3892,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 +3926,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 +3977,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..e357ebabddb0 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", 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..45b518a663df 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 @@ -2137,6 +2137,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 +2375,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 +2443,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 +2545,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", @@ -3735,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", @@ -3837,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", @@ -3854,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", @@ -3888,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/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..e357ebabddb0 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", 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..45b518a663df 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 @@ -2137,6 +2137,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 +2375,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 +2443,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 +2545,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", @@ -3735,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", @@ -3837,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", @@ -3854,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", @@ -3888,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", From ceffc5c02d8b2085dafe079a4098523f3f252b7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 04:21:11 +0000 Subject: [PATCH 25/45] Update dependencies from https://github.com/dotnet/roslyn build 20220818.10 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-2.22414.1 -> To Version 4.4.0-2.22418.10 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8cec0d04649..a440834ebacd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,30 +64,30 @@ a4841cd2f1c9ccdb2c643e2faa61ba35dc2a8169 - + https://github.com/dotnet/roslyn - 4af0d920079d1c8853991d2d49d18293de88f34d + 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 - + https://github.com/dotnet/roslyn - 4af0d920079d1c8853991d2d49d18293de88f34d + 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 - + https://github.com/dotnet/roslyn - 4af0d920079d1c8853991d2d49d18293de88f34d + 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 - + https://github.com/dotnet/roslyn - 4af0d920079d1c8853991d2d49d18293de88f34d + 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 - + https://github.com/dotnet/roslyn - 4af0d920079d1c8853991d2d49d18293de88f34d + 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 - + https://github.com/dotnet/roslyn - 4af0d920079d1c8853991d2d49d18293de88f34d + 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5f59adb6a56b..8f6d0d6183ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,12 +137,12 @@ - 4.4.0-2.22418.8 - 4.4.0-2.22418.8 - 4.4.0-2.22418.8 - 4.4.0-2.22418.8 - 4.4.0-2.22418.8 - 4.4.0-2.22418.8 + 4.4.0-2.22418.10 + 4.4.0-2.22418.10 + 4.4.0-2.22418.10 + 4.4.0-2.22418.10 + 4.4.0-2.22418.10 + 4.4.0-2.22418.10 $(MicrosoftNetCompilersToolsetPackageVersion) From c147ccb0c6e998b0fed05bd90b2ebdb1c944ce94 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 08:38:45 +0000 Subject: [PATCH 26/45] Update dependencies from https://github.com/dotnet/roslyn build 20220818.11 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-2.22418.10 -> To Version 4.4.0-2.22418.11 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c10ee4f1e34e..36b894333112 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,30 +64,30 @@ a4841cd2f1c9ccdb2c643e2faa61ba35dc2a8169 - + https://github.com/dotnet/roslyn - 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 + 087baa2770faf2ac1f0ce179d4c23d92b2a75d26 - + https://github.com/dotnet/roslyn - 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 + 087baa2770faf2ac1f0ce179d4c23d92b2a75d26 - + https://github.com/dotnet/roslyn - 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 + 087baa2770faf2ac1f0ce179d4c23d92b2a75d26 - + https://github.com/dotnet/roslyn - 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 + 087baa2770faf2ac1f0ce179d4c23d92b2a75d26 - + https://github.com/dotnet/roslyn - 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 + 087baa2770faf2ac1f0ce179d4c23d92b2a75d26 - + https://github.com/dotnet/roslyn - 64b0678f11c5681ca9d2a97bf48d99f0577f6af1 + 087baa2770faf2ac1f0ce179d4c23d92b2a75d26 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 83b7f1bfdcc7..5a4bca7974d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,12 +137,12 @@ - 4.4.0-2.22418.10 - 4.4.0-2.22418.10 - 4.4.0-2.22418.10 - 4.4.0-2.22418.10 - 4.4.0-2.22418.10 - 4.4.0-2.22418.10 + 4.4.0-2.22418.11 + 4.4.0-2.22418.11 + 4.4.0-2.22418.11 + 4.4.0-2.22418.11 + 4.4.0-2.22418.11 + 4.4.0-2.22418.11 $(MicrosoftNetCompilersToolsetPackageVersion) From ff12abb08ab94c5356ccd31dcdc620044626e764 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 10:40:24 +0000 Subject: [PATCH 27/45] Update dependencies from https://github.com/dotnet/templating build 20220819.1 Microsoft.TemplateEngine.Abstractions From Version 7.0.100-rc.1.22418.4 -> To Version 7.0.100-rc.1.22419.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c10ee4f1e34e..7e32c3f6651a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 473ecdda43abf963ace6715985d416080ec0ece7 + 16f5a8ac118d0829744f80c4044138960847867f diff --git a/eng/Versions.props b/eng/Versions.props index 83b7f1bfdcc7..9bd1dd695f2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 7.0.100-rc.1.22418.4 + 7.0.100-rc.1.22419.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From b069d17a23116ed5fb3e30afa2a2ffa84b98bfd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 15:44:58 +0000 Subject: [PATCH 28/45] Update dependencies from https://github.com/dotnet/fsharp build 20220819.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 6.0.6-beta.22416.8 -> To Version 6.0.6-beta.22419.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c10ee4f1e34e..c0003014ca16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,13 +50,13 @@ https://github.com/dotnet/msbuild 5d102ae37163fc1f22610bb433c3ab9a2fff91f0 - + https://github.com/dotnet/fsharp - 02e72a1a51d72f7b16b80f7cb96ea4202d237172 + 8e339bc4a7f2111823255cbcc1d3639853609440 - + https://github.com/dotnet/fsharp - 02e72a1a51d72f7b16b80f7cb96ea4202d237172 + 8e339bc4a7f2111823255cbcc1d3639853609440 diff --git a/eng/Versions.props b/eng/Versions.props index 83b7f1bfdcc7..4304bafc1d32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.0.6-beta.22416.8 + 12.0.6-beta.22419.1 From fe7dab7f4453e7969173cb78b6d2c1bc4d181b36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 16:22:13 +0000 Subject: [PATCH 29/45] Update dependencies from https://github.com/nuget/nuget.client build 6.4.0.49 NuGet.Build.Tasks From Version 6.4.0-preview.1.47 -> To Version 6.4.0-preview.1.49 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c10ee4f1e34e..9db9ae02f249 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,9 +97,9 @@ https://github.com/dotnet/aspnetcore 0438e7ec04808230c67b00caa3d584bd2b991f57 - + https://github.com/nuget/nuget.client - d43053929551ef55dbb524dacba0bcc37079b5dd + 36dabaf4b9cb7c4e48103fa57a4e68cb4451d719 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 83b7f1bfdcc7..e91127afa780 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ - 6.4.0-preview.1.47 + 6.4.0-preview.1.49 $(NuGetBuildTasksPackageVersion) 6.0.0-rc.278 $(NuGetBuildTasksPackageVersion) From adf1ab4e6f8e31d9f612e5b8a91735e490c05483 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 17:34:32 +0000 Subject: [PATCH 30/45] Update dependencies from https://github.com/dotnet/windowsdesktop build 20220819.4 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22379.3 -> To Version 7.0.0-rc.1.22419.4 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 7.0.0-rc.1.22379.2 -> To Version 7.0.0-rc.2.22412.4 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c10ee4f1e34e..7cedb7c14484 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,25 +135,25 @@ https://github.com/dotnet/runtime 08fdcb7e2d86292b529e7d662b691d8c86de678d - + https://github.com/dotnet/windowsdesktop - d5046afdd2d0e6234ae3fc5bd4ae878594079cc7 + 47b9ca40c671ef983ac75383db4d731c71cf8ba0 - + https://github.com/dotnet/windowsdesktop - d5046afdd2d0e6234ae3fc5bd4ae878594079cc7 + 47b9ca40c671ef983ac75383db4d731c71cf8ba0 - + https://github.com/dotnet/windowsdesktop - d5046afdd2d0e6234ae3fc5bd4ae878594079cc7 + 47b9ca40c671ef983ac75383db4d731c71cf8ba0 - + https://github.com/dotnet/windowsdesktop - d5046afdd2d0e6234ae3fc5bd4ae878594079cc7 + 47b9ca40c671ef983ac75383db4d731c71cf8ba0 - + https://github.com/dotnet/wpf - cd58f79f496337e608662e168c80ac8abd0d151b + 23c2d41521a08ea05fcbcc5cc8f249ce57338311 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 83b7f1bfdcc7..c41a2f3ee2d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -163,7 +163,7 @@ - 7.0.0-rc.1.22379.2 + 7.0.0-rc.2.22412.4 From 59d18db55be7467d61652942a69242f75dd040e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 18:50:25 +0000 Subject: [PATCH 31/45] Update dependencies from https://github.com/nuget/nuget.client build 6.4.0.50 NuGet.Build.Tasks From Version 6.4.0-preview.1.47 -> To Version 6.4.0-preview.1.50 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9db9ae02f249..e340edb54b47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,9 +97,9 @@ https://github.com/dotnet/aspnetcore 0438e7ec04808230c67b00caa3d584bd2b991f57 - + https://github.com/nuget/nuget.client - 36dabaf4b9cb7c4e48103fa57a4e68cb4451d719 + 745617ea6fc239737c80abb424e13faca4249bf1 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index e91127afa780..ddb98b98bb02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ - 6.4.0-preview.1.49 + 6.4.0-preview.1.50 $(NuGetBuildTasksPackageVersion) 6.0.0-rc.278 $(NuGetBuildTasksPackageVersion) From 8a303dd7140d2350e0f0400080fefba6d590f290 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 19 Aug 2022 17:03:09 -0400 Subject: [PATCH 32/45] Code review feedback --- .../general/SelfContainedBreakingChangeNotification.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/general/SelfContainedBreakingChangeNotification.md b/documentation/general/SelfContainedBreakingChangeNotification.md index bbaeceb3fd30..66b41ff99f57 100644 --- a/documentation/general/SelfContainedBreakingChangeNotification.md +++ b/documentation/general/SelfContainedBreakingChangeNotification.md @@ -19,7 +19,7 @@ If `SelfContained` was specified on the command line, it would always flow to re ## New Behavior -Both `SelfContained` and `RuntimeIdentifier` will flow a referenced project if any of the following are true for the referenced project: +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` From 55d8a5a14b3f65020bdef03d7465a7c75dd3568a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Aug 2022 23:58:31 +0000 Subject: [PATCH 33/45] Update dependencies from https://github.com/dotnet/runtime build 20220819.7 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22418.9 -> To Version 7.0.0-rc.1.22419.7 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5c3bdb4d880..167f555031d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 16f5a8ac118d0829744f80c4044138960847867f - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - 08fdcb7e2d86292b529e7d662b691d8c86de678d + 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index ca7f9aec0275..fe8df7aa8efa 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.22418.9 + 7.0.0-rc.1.22419.7 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22418.9 + 7.0.0-rc.1.22419.7 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.22418.9 - 7.0.0-rc.1.22418.9 - 7.0.0-rc.1.22418.9 + 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.7 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22418.9 - 7.0.0-rc.1.22418.9 - 7.0.0-rc.1.22418.9 + 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.7 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22418.9 - 7.0.0-rc.1.22418.9 - 7.0.0-rc.1.22418.9 - 7.0.0-rc.1.22418.9 + 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.7 From 39e6b7517aaa9e554ae0620000571f2ffe3431e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Aug 2022 08:02:51 +0000 Subject: [PATCH 34/45] Update dependencies from https://github.com/dotnet/runtime build 20220819.11 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22418.9 -> To Version 7.0.0-rc.1.22419.11 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 167f555031d9..832fc4217437 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 16f5a8ac118d0829744f80c4044138960847867f - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - 1af9cfd879d2c44f0f7ce6c198446c13fcd7b019 + 37193fd334aa3661a30d780a37d917c6b15d8d83 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index fe8df7aa8efa..9037c3220ff0 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.22419.7 + 7.0.0-rc.1.22419.11 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.11 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.22419.7 - 7.0.0-rc.1.22419.7 - 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22419.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22419.7 - 7.0.0-rc.1.22419.7 - 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22419.11 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22419.7 - 7.0.0-rc.1.22419.7 - 7.0.0-rc.1.22419.7 - 7.0.0-rc.1.22419.7 + 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22419.11 From d2831bf1377d41719cb1b93d078b70c9a46ac34f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Aug 2022 12:45:40 +0000 Subject: [PATCH 35/45] Update dependencies from https://github.com/dotnet/runtime build 20220820.2 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22418.9 -> To Version 7.0.0-rc.1.22420.2 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 832fc4217437..27450595c491 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 16f5a8ac118d0829744f80c4044138960847867f - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - 37193fd334aa3661a30d780a37d917c6b15d8d83 + 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 9037c3220ff0..92752db150f2 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.22419.11 + 7.0.0-rc.1.22420.2 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22420.2 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.22419.11 - 7.0.0-rc.1.22419.11 - 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22419.11 - 7.0.0-rc.1.22419.11 - 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.2 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22419.11 - 7.0.0-rc.1.22419.11 - 7.0.0-rc.1.22419.11 - 7.0.0-rc.1.22419.11 + 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.2 From f4fb829693ccded4c80eeb803d988d6cf0f85675 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Aug 2022 22:01:19 +0000 Subject: [PATCH 36/45] Update dependencies from https://github.com/dotnet/runtime build 20220820.10 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22418.9 -> To Version 7.0.0-rc.1.22420.10 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27450595c491..7b68bc264257 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 16f5a8ac118d0829744f80c4044138960847867f - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 + 2b52df83546e81a2e591584f29949a1c6ae36ce7 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 92752db150f2..5b61b3cd674b 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.22420.2 + 7.0.0-rc.1.22420.10 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.10 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.22420.2 - 7.0.0-rc.1.22420.2 - 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22420.2 - 7.0.0-rc.1.22420.2 - 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.10 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22420.2 - 7.0.0-rc.1.22420.2 - 7.0.0-rc.1.22420.2 - 7.0.0-rc.1.22420.2 + 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.10 From 507ce29088f70adda1c7137e25c1c0d4925b14cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Aug 2022 02:34:53 +0000 Subject: [PATCH 37/45] Update dependencies from https://github.com/dotnet/runtime build 20220820.14 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22418.9 -> To Version 7.0.0-rc.1.22420.14 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b68bc264257..2a481837e0a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 16f5a8ac118d0829744f80c4044138960847867f - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - 2b52df83546e81a2e591584f29949a1c6ae36ce7 + b3ef656ec980699238c948c1af5bc1b52e5ef131 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 5b61b3cd674b..43b579969e15 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.22420.10 + 7.0.0-rc.1.22420.14 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.14 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.22420.10 - 7.0.0-rc.1.22420.10 - 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.14 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22420.10 - 7.0.0-rc.1.22420.10 - 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.14 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22420.10 - 7.0.0-rc.1.22420.10 - 7.0.0-rc.1.22420.10 - 7.0.0-rc.1.22420.10 + 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.14 From 6970a1f92a9077a8dda854cc5445e688145b6d70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Aug 2022 09:10:05 +0000 Subject: [PATCH 38/45] Update dependencies from https://github.com/dotnet/runtime build 20220820.18 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22418.9 -> To Version 7.0.0-rc.1.22420.18 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a481837e0a0..c79b493ed500 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 16f5a8ac118d0829744f80c4044138960847867f - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - b3ef656ec980699238c948c1af5bc1b52e5ef131 + eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 43b579969e15..b142fa2821d7 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.22420.14 + 7.0.0-rc.1.22420.18 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.18 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.22420.14 - 7.0.0-rc.1.22420.14 - 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22420.18 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22420.14 - 7.0.0-rc.1.22420.14 - 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22420.18 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22420.14 - 7.0.0-rc.1.22420.14 - 7.0.0-rc.1.22420.14 - 7.0.0-rc.1.22420.14 + 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22420.18 From 8e9bdc7ec90d07f8b57101d320f1439a8952329b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Aug 2022 13:10:26 +0000 Subject: [PATCH 39/45] Update dependencies from https://github.com/dotnet/runtime build 20220821.2 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22411.12 -> To Version 7.0.0-rc.1.22421.2 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dc1f1ab88b1..b99ad13a9730 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ f70d3b969edd4448903167fe9efd6f666b4a2fff - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 33c3b2c60d0a2006162a6326db853fe5415439bd - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 https://github.com/dotnet/linker 33c3b2c60d0a2006162a6326db853fe5415439bd - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - 56e2dc08c07aa263f250205ce5e5d6375e45278a + bc7a715b1b1cdb63bf62b23c7f7ca0dc16cb9420 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 85f05736a47c..6ef7d02b9698 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.22417.9 + 7.0.0-rc.1.22421.2 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22421.2 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.22417.9 - 7.0.0-rc.1.22417.9 - 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22421.2 + 7.0.0-rc.1.22421.2 + 7.0.0-rc.1.22421.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22417.9 - 7.0.0-rc.1.22417.9 - 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22421.2 + 7.0.0-rc.1.22421.2 + 7.0.0-rc.1.22421.2 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22417.9 - 7.0.0-rc.1.22417.9 - 7.0.0-rc.1.22417.9 - 7.0.0-rc.1.22417.9 + 7.0.0-rc.1.22421.2 + 7.0.0-rc.1.22421.2 + 7.0.0-rc.1.22421.2 + 7.0.0-rc.1.22421.2 From f25c1a42158fe7e1de250401f3122dfb2ff55751 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Aug 2022 19:19:16 +0000 Subject: [PATCH 40/45] Update dependencies from https://github.com/dotnet/runtime build 20220821.6 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22418.9 -> To Version 7.0.0-rc.1.22421.6 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c79b493ed500..44bc1bb37638 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 16f5a8ac118d0829744f80c4044138960847867f - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - eb93e5d0aa84b6a27d17f2e986cda657ef2eb3d7 + 4823884a7cf9ede0edace5486c72ca4889dd4d00 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index b142fa2821d7..5b4fa1ee88a9 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.22420.18 + 7.0.0-rc.1.22421.6 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22421.6 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.22420.18 - 7.0.0-rc.1.22420.18 - 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22421.6 + 7.0.0-rc.1.22421.6 + 7.0.0-rc.1.22421.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22420.18 - 7.0.0-rc.1.22420.18 - 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22421.6 + 7.0.0-rc.1.22421.6 + 7.0.0-rc.1.22421.6 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22420.18 - 7.0.0-rc.1.22420.18 - 7.0.0-rc.1.22420.18 - 7.0.0-rc.1.22420.18 + 7.0.0-rc.1.22421.6 + 7.0.0-rc.1.22421.6 + 7.0.0-rc.1.22421.6 + 7.0.0-rc.1.22421.6 From 2b859c9deec0d70dec72c58991ccc9ca9eaa22d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Aug 2022 01:40:25 +0000 Subject: [PATCH 41/45] Update dependencies from https://github.com/dotnet/runtime build 20220821.12 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rc.1.22418.9 -> To Version 7.0.0-rc.1.22421.12 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44bc1bb37638..22f1a75b9c50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 16f5a8ac118d0829744f80c4044138960847867f - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b https://github.com/dotnet/linker 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b https://github.com/dotnet/windowsdesktop @@ -279,9 +279,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - 4823884a7cf9ede0edace5486c72ca4889dd4d00 + 37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 5b4fa1ee88a9..9de990ea7c85 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.22421.6 + 7.0.0-rc.1.22421.12 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22421.6 + 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.22421.6 - 7.0.0-rc.1.22421.6 - 7.0.0-rc.1.22421.6 + 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.22421.6 - 7.0.0-rc.1.22421.6 - 7.0.0-rc.1.22421.6 + 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.22421.6 - 7.0.0-rc.1.22421.6 - 7.0.0-rc.1.22421.6 - 7.0.0-rc.1.22421.6 + 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 From 27fe291a1f78b7c2a79ce63f0f3277e203d2bb4a Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Sun, 21 Aug 2022 22:07:44 -0400 Subject: [PATCH 42/45] Require updated MSBuild for global property flow tests --- .../GlobalPropertyFlowTests.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs b/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs index 9d1faa3cfb64..774907d7511b 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs @@ -75,7 +75,7 @@ List GetDotnetArguments(bool passSelfContained, bool passRuntimeIdentifi return arguments; } - [Theory] + [RequiresMSBuildVersionTheory("17.4.0.41702")] [InlineData(true, true)] [InlineData(true, false)] [InlineData(false, true)] @@ -90,7 +90,7 @@ public void TestGlobalPropertyFlowToLibrary(bool passSelfContained, bool passRun ValidateProperties(testAsset, _referencedProject, expectSelfContained: false, expectRuntimeIdentifier: false); } - [Theory] + [RequiresMSBuildVersionTheory("17.4.0.41702")] [InlineData(true, true)] [InlineData(true, false)] [InlineData(false, true)] @@ -108,7 +108,7 @@ public void TestGlobalPropertyFlowToExe(bool passSelfContained, bool passRuntime } - [Theory] + [RequiresMSBuildVersionTheory("17.4.0.41702")] [InlineData(true, true)] [InlineData(true, false)] [InlineData(false, true)] @@ -145,7 +145,7 @@ public void TestGlobalPropertyFlowToExeWithSelfContainedFalse(bool passSelfConta } } - [Theory] + [RequiresMSBuildVersionTheory("17.4.0.41702")] [InlineData(true, true)] [InlineData(true, false)] [InlineData(false, true)] @@ -166,7 +166,7 @@ public void TestGlobalPropertyFlowToLibraryWithRuntimeIdentifier(bool passSelfCo expectedRuntimeIdentifier: buildingSelfContained ? "" : _referencedProject.RuntimeIdentifier); } - [Theory] + [RequiresMSBuildVersionTheory("17.4.0.41702")] [InlineData(true, true)] [InlineData(true, false)] [InlineData(false, true)] @@ -196,7 +196,7 @@ public void TestGlobalPropertyFlowToMultitargetedProject(bool passSelfContained, targetFramework: "net7.0"); } - [Theory] + [RequiresMSBuildVersionTheory("17.4.0.41702")] [InlineData(true, true)] [InlineData(true, false)] [InlineData(false, true)] From 4d634e9f02ce7470455935b8a40ddce6a5c3e7ff Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 22 Aug 2022 00:17:26 -0400 Subject: [PATCH 43/45] Fix tests --- .../GivenThatWeWantToBuildALibrary.cs | 7 ++++--- .../Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs | 3 ++- .../dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs index 1de9ed2085e1..a73c524413e4 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 49c606e125a0..cdc451ae48b5 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.ShouldBeEquivalentTo(new[] { testProject.Name + ".cs" }); + compileItems.ShouldBeEquivalentTo(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/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index 10981b5b5e5a..e1e34c69ff5d 100644 --- a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -269,7 +269,7 @@ public void It_builds_with_implicit_rid_with_self_contained_option() .NotHaveStdOutContaining("NETSDK1031"); } - [Fact] + [RequiresMSBuildVersionFact("17.4.0.41702")] public void It_builds_referenced_exe_with_self_contained_specified_via_command_line_argument() { var referencedProject = new TestProject("ReferencedProject") From 2015c96ca1c57997a1c5d95d853f1a9fe01eefe6 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 19 Aug 2022 15:13:36 -0500 Subject: [PATCH 44/45] Remove js-module-crypto handling in the SDK Contributes to https://github.com/dotnet/runtime/issues/73858 --- ...soft.NET.Sdk.BlazorWebAssembly.6_0.targets | 4 -- .../Tasks/ComputeBlazorBuildAssets.cs | 24 +-------- .../Tasks/ComputeBlazorPublishAssets.cs | 38 +------------- .../GenerateBlazorWebAssemblyBootJson.cs | 5 -- ...ootJsonManifest.Build.staticwebassets.json | 34 ------------- ...iesAreCopiedToBuildOutput.Build.files.json | 3 -- ...edToBuildOutput.Build.staticwebassets.json | 34 ------------- ...duleTargetPaths.Build.staticwebassets.json | 34 ------------- ...izeBlazorInitialization.Publish.files.json | 6 --- ...nitialization.Publish.staticwebassets.json | 51 ------------------- ...tBuildAndPublishModules.Publish.files.json | 6 --- ...ublishModules.Publish.staticwebassets.json | 51 ------------------- ...izeBlazorInitialization.Publish.files.json | 3 -- ...nitialization.Publish.staticwebassets.json | 51 ------------------- ...nBlazorBootJsonManifest.Publish.files.json | 6 --- ...tJsonManifest.Publish.staticwebassets.json | 51 ------------------- ...Assets_BuildMinimal_Works.Build.files.json | 3 -- ...ldMinimal_Works.Build.staticwebassets.json | 34 ------------- ...Assets_Build_Hosted_Works.Build.files.json | 2 - ...ld_Hosted_Works.Build.staticwebassets.json | 34 ------------- ...ts_PublishMinimal_Works.Publish.files.json | 6 --- ...Minimal_Works.Publish.staticwebassets.json | 51 ------------------- ...mentationFiles_AsAssets.Publish.files.json | 3 -- ...iles_AsAssets.Publish.staticwebassets.json | 51 ------------------- ...ts_Publish_Hosted_Works.Publish.files.json | 3 -- ..._Hosted_Works.Publish.staticwebassets.json | 51 ------------------- 26 files changed, 3 insertions(+), 636 deletions(-) diff --git a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets index a5145d3ee370..dc1f9d2d8292 100644 --- a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets +++ b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets @@ -157,9 +157,6 @@ Copyright (c) .NET Foundation. All rights reserved. - - <_DotNetJsItem Include="@(ResolvedFileToPublish)" Condition="'%(ResolvedFileToPublish.DestinationSubPath)' == 'dotnet.js' AND '%(ResolvedFileToPublish.AssetType)' == 'native'" /> - <_DotNetJsItem Include="@(ResolvedFileToPublish)" Condition="'%(ResolvedFileToPublish.DestinationSubPath)' == 'dotnet-crypto-worker.js' AND '%(ResolvedFileToPublish.AssetType)' == 'native'" /> diff --git a/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs b/src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs index 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/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 7a817645d6a5..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 @@ -210,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", @@ -241,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", @@ -252,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]]", @@ -394,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]]", 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 cf4d4364558e..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", @@ -2634,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", 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 411d85206e52..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 @@ -207,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", @@ -238,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", @@ -249,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]]", @@ -389,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]]", 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 db8d23130542..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", @@ -2600,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", 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 f03aa5e40615..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 @@ -217,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 b7963235b957..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", @@ -2749,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", 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 411d85206e52..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 @@ -207,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", @@ -238,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", @@ -249,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]]", @@ -389,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]]", 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 7bcb5832d0be..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", @@ -2600,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", 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 8866a0d9c3fb..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 @@ -207,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", @@ -241,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", @@ -252,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]]", @@ -392,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]]", 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 0fc053f9a619..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", @@ -2600,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", 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 e357ebabddb0..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 @@ -214,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 45b518a663df..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", @@ -2698,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", 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 e357ebabddb0..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 @@ -214,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 45b518a663df..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", @@ -2698,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", From ed423db35972967b01d4cc1ae9f0af0330d7c578 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Mon, 22 Aug 2022 13:27:42 -0600 Subject: [PATCH 45/45] Fix FluentAssertions version --- .../Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs index 6ae1690761c1..9f19f0b1f40b 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs @@ -410,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.ShouldBeEquivalentTo(new[] { testProject.Name + ".cs", testProject.Name + "Program.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);