From be924c598e72b475b23b867adc2ab24d6d6877fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 18:52:01 +0000 Subject: [PATCH 01/18] Update dependencies from https://github.com/dotnet/runtime build 20230808.4 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23408.4 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f3f2668f64b..37d830658a5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - 749b2d2f70d8d60834fd8628ed70c694a0a45403 + 973626d3b36779d45332689da4d01c09db2c17d7 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 49a21c1a53e6..10a4b1a5c092 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23408.3 + 8.0.0-rc.1.23408.4 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23408.3 + 8.0.0-rc.1.23408.4 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23408.3 - 8.0.0-rc.1.23408.3 - 8.0.0-rc.1.23408.3 + 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23408.3 - 8.0.0-rc.1.23408.3 - 8.0.0-rc.1.23408.3 - 8.0.0-rc.1.23408.3 + 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.4 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23408.3 - 8.0.0-rc.1.23408.3 - 8.0.0-rc.1.23408.3 + 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.4 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23408.3 - 8.0.0-rc.1.23408.3 - 8.0.0-rc.1.23408.3 + 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.4 From 5e0a457a2ed88156c90ac4a7a1c7edc78befac51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 22:04:27 +0000 Subject: [PATCH 02/18] Update dependencies from https://github.com/dotnet/runtime build 20230808.8 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23408.8 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37d830658a5f..d144a972a4ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - 973626d3b36779d45332689da4d01c09db2c17d7 + cb083648a06e30b15fee6e6c638678ec2e03c261 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 10a4b1a5c092..8f587c2e7643 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.8 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.8 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23408.4 - 8.0.0-rc.1.23408.4 - 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.8 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23408.4 - 8.0.0-rc.1.23408.4 - 8.0.0-rc.1.23408.4 - 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.8 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23408.4 - 8.0.0-rc.1.23408.4 - 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.8 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23408.4 - 8.0.0-rc.1.23408.4 - 8.0.0-rc.1.23408.4 + 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.8 From b8bef73f66f8104a1c2bb8902bb97cbbc7ebc95a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 04:12:37 +0000 Subject: [PATCH 03/18] Update dependencies from https://github.com/dotnet/runtime build 20230808.14 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23408.14 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d144a972a4ee..286cc3fb513d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - cb083648a06e30b15fee6e6c638678ec2e03c261 + 41f58f65d27ccef704e98eab727137cceae7e5ac https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 8f587c2e7643..d1930d16a0d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.14 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.14 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23408.8 - 8.0.0-rc.1.23408.8 - 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.14 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23408.8 - 8.0.0-rc.1.23408.8 - 8.0.0-rc.1.23408.8 - 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.14 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23408.8 - 8.0.0-rc.1.23408.8 - 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.14 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23408.8 - 8.0.0-rc.1.23408.8 - 8.0.0-rc.1.23408.8 + 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.14 From 63719f3d7357226e209ead63503c37e4df5744ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 08:53:48 +0000 Subject: [PATCH 04/18] Update dependencies from https://github.com/dotnet/runtime build 20230808.18 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23408.18 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 286cc3fb513d..2231ad6c807b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - 41f58f65d27ccef704e98eab727137cceae7e5ac + 88633ae045e7741fffa17710dc48e9032e519258 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index d1930d16a0d9..d23ad54d6b0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.18 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.18 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23408.14 - 8.0.0-rc.1.23408.14 - 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23408.18 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23408.14 - 8.0.0-rc.1.23408.14 - 8.0.0-rc.1.23408.14 - 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23408.18 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23408.14 - 8.0.0-rc.1.23408.14 - 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23408.18 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23408.14 - 8.0.0-rc.1.23408.14 - 8.0.0-rc.1.23408.14 + 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23408.18 From c3f532e25212402ea10edd167749872c91494c80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 12:40:15 +0000 Subject: [PATCH 05/18] Update dependencies from https://github.com/dotnet/runtime build 20230809.1 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23409.1 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2231ad6c807b..489880cd5b6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - 88633ae045e7741fffa17710dc48e9032e519258 + b35572540e0904c6a23dc5466f73c361ed877dc1 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index d23ad54d6b0c..3d0fd91e2b88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23409.1 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23409.1 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23408.18 - 8.0.0-rc.1.23408.18 - 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23408.18 - 8.0.0-rc.1.23408.18 - 8.0.0-rc.1.23408.18 - 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.1 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23408.18 - 8.0.0-rc.1.23408.18 - 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.1 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23408.18 - 8.0.0-rc.1.23408.18 - 8.0.0-rc.1.23408.18 + 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.1 From 964a311c5bd2ee6f2dbcbd4ab583065117433128 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Wed, 9 Aug 2023 13:24:07 -0700 Subject: [PATCH 06/18] Update tests for embedding clsidmap in comhost --- ...GivenThatWeWantToBuildAComServerLibrary.cs | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAComServerLibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAComServerLibrary.cs index 7dfcdeb10898..758c48ae1e35 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAComServerLibrary.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAComServerLibrary.cs @@ -72,7 +72,7 @@ public void It_generates_a_regfree_com_manifest_when_requested() }); } - [WindowsOnlyTheory] + [Theory] [InlineData($"{ToolsetInfo.LatestWinRuntimeIdentifier}-x64")] [InlineData($"{ToolsetInfo.LatestWinRuntimeIdentifier}-x86")] public void It_embeds_the_clsidmap_in_the_comhost_when_rid_specified(string rid) @@ -147,30 +147,6 @@ public void It_fails_to_find_comhost_for_platforms_without_comhost() .HaveStdOutContaining("NETSDK1091: "); } - [PlatformSpecificTheory(TestPlatforms.Linux | TestPlatforms.OSX | TestPlatforms.FreeBSD)] - [InlineData($"{ToolsetInfo.LatestWinRuntimeIdentifier}-x64")] - [InlineData($"{ToolsetInfo.LatestWinRuntimeIdentifier}-x86")] - public void It_fails_to_embed_clsid_when_not_on_windows(string rid) - { - var testAsset = _testAssetsManager - .CopyTestAsset("ComServer", identifier: rid) - .WithSource() - .WithProjectChanges(project => - { - var ns = project.Root.Name.Namespace; - var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); - propertyGroup.Add(new XElement("RuntimeIdentifier", rid)); - }); - - var buildCommand = new BuildCommand(testAsset); - buildCommand - .Execute() - .Should() - .Fail() - .And - .HaveStdOutContaining("NETSDK1092: "); - } - [WindowsOnlyFact] public void It_embeds_single_typelib_with_default_id() { From b56c211b98d8f0ffbfb70b186084c43286915d03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 22:05:43 +0000 Subject: [PATCH 07/18] Update dependencies from https://github.com/dotnet/runtime build 20230809.6 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23409.6 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 489880cd5b6b..225ea852a613 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - b35572540e0904c6a23dc5466f73c361ed877dc1 + e7a993092612264016229e45d508cf071727518b https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 3d0fd91e2b88..23b0c4498774 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.6 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.6 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23409.1 - 8.0.0-rc.1.23409.1 - 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23409.1 - 8.0.0-rc.1.23409.1 - 8.0.0-rc.1.23409.1 - 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.6 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23409.1 - 8.0.0-rc.1.23409.1 - 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.6 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23409.1 - 8.0.0-rc.1.23409.1 - 8.0.0-rc.1.23409.1 + 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.6 From 69ec94545343814bfdf3f1963376fc5284c92ba2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Aug 2023 01:41:35 +0000 Subject: [PATCH 08/18] Update dependencies from https://github.com/dotnet/runtime build 20230809.16 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23409.16 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 225ea852a613..bc75881b1bee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - e7a993092612264016229e45d508cf071727518b + 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 23b0c4498774..1c50a75bf0bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.16 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.16 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23409.6 - 8.0.0-rc.1.23409.6 - 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.16 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23409.6 - 8.0.0-rc.1.23409.6 - 8.0.0-rc.1.23409.6 - 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.16 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23409.6 - 8.0.0-rc.1.23409.6 - 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.16 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23409.6 - 8.0.0-rc.1.23409.6 - 8.0.0-rc.1.23409.6 + 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.16 From 5fd22d2fa9e723b8a71bbe4bbe880c6fc31a0f32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Aug 2023 04:40:45 +0000 Subject: [PATCH 09/18] Update dependencies from https://github.com/dotnet/runtime build 20230809.17 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23409.17 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc75881b1bee..88cba5ff7ac7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - 41bc9351e2fa6ab70dc8750fe4c765d92ffcb846 + 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 1c50a75bf0bc..4d1cefe7ce45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.17 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.17 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23409.16 - 8.0.0-rc.1.23409.16 - 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23409.17 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23409.16 - 8.0.0-rc.1.23409.16 - 8.0.0-rc.1.23409.16 - 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23409.17 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23409.16 - 8.0.0-rc.1.23409.16 - 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23409.17 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23409.16 - 8.0.0-rc.1.23409.16 - 8.0.0-rc.1.23409.16 + 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23409.17 From 67aabe993ce6c6490231b195bd54887d3b27047d Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Thu, 10 Aug 2023 12:54:57 +0200 Subject: [PATCH 10/18] Fix ICU tests. --- .../WasmBuildIntegrationTest.cs | 99 ++++++++++++------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs index f21ada32adbd..dcdf8a758dfd 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs @@ -12,6 +12,13 @@ public class WasmBuildIntegrationTest : BlazorWasmBaselineTests public WasmBuildIntegrationTest(ITestOutputHelper log) : base(log, GenerateBaselines) { } private static string customIcuFilename = "icudt_custom.dat"; + private static string fullIcuFilename = "icudt.dat"; + private static string hybridIcuFilename = "icudt_hybrid.dat"; + private static string[] icuShardFilenames = new string[] { + "icudt_EFIGS.dat", + "icudt_CJK.dat", + "icudt_no_CJK.dat" + }; [Fact] public void BuildMinimal_Works() @@ -280,10 +287,11 @@ public void Build_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationData bootJsonData.resources.icu.Should().BeNull(); new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.native.wasm")).Should().Exist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt.dat")).Should().NotExist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt_CJK.dat")).Should().NotExist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt_EFIGS.dat")).Should().NotExist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt_no_CJK.dat")).Should().NotExist(); + new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", fullIcuFilename)).Should().NotExist(); + foreach (var shardFilename in icuShardFilenames) + { + new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", shardFilename)).Should().NotExist(); + } } [Fact] @@ -317,10 +325,11 @@ public void Publish_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationDa bootJsonData.resources.icu.Should().BeNull(); new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "dotnet.native.wasm")).Should().Exist(); - new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "icudt.dat")).Should().NotExist(); - new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "icudt_CJK.dat")).Should().NotExist(); - new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "icudt_EFIGS.dat")).Should().NotExist(); - new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "icudt_no_CJK.dat")).Should().NotExist(); + new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", fullIcuFilename)).Should().NotExist(); + foreach (var shardFilename in icuShardFilenames) + { + new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", shardFilename)).Should().NotExist(); + } } [Fact] @@ -351,17 +360,19 @@ public void Build_WithBlazorWebAssemblyLoadCustomGlobalizationData_SetsGlobaliza bootJsonData.resources.wasmNative.Should().ContainKey("dotnet.native.wasm"); bootJsonData.resources.icu.Should().ContainKey(customIcuFilename); - bootJsonData.resources.icu.Should().NotContainKey("icudt.dat"); - bootJsonData.resources.icu.Should().NotContainKey("icudt_CJK.dat"); - bootJsonData.resources.icu.Should().NotContainKey("icudt_EFIGS.dat"); - bootJsonData.resources.icu.Should().NotContainKey("icudt_no_CJK.dat"); + bootJsonData.resources.icu.Should().NotContainKey(fullIcuFilename); + foreach (var shardFilename in icuShardFilenames) + { + bootJsonData.resources.icu.Should().NotContainKey(shardFilename); + } new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.native.wasm")).Should().Exist(); new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", customIcuFilename)).Should().Exist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt.dat")).Should().NotExist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt_CJK.dat")).Should().NotExist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt_EFIGS.dat")).Should().NotExist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt_no_CJK.dat")).Should().NotExist(); + new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", fullIcuFilename)).Should().NotExist(); + foreach (var shardFilename in icuShardFilenames) + { + new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", shardFilename)).Should().NotExist(); + } } [Fact] @@ -392,21 +403,23 @@ public void Publish_WithBlazorWebAssemblyLoadCustomGlobalizationData_SetsGlobali bootJsonData.resources.wasmNative.Should().ContainKey("dotnet.native.wasm"); bootJsonData.resources.icu.Should().ContainKey(customIcuFilename); - bootJsonData.resources.icu.Should().NotContainKey("icudt.dat"); - bootJsonData.resources.icu.Should().NotContainKey("icudt_CJK.dat"); - bootJsonData.resources.icu.Should().NotContainKey("icudt_EFIGS.dat"); - bootJsonData.resources.icu.Should().NotContainKey("icudt_no_CJK.dat"); + bootJsonData.resources.icu.Should().NotContainKey(fullIcuFilename); + foreach (var shardFilename in icuShardFilenames) + { + bootJsonData.resources.icu.Should().NotContainKey(shardFilename); + } new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "dotnet.native.wasm")).Should().Exist(); new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", customIcuFilename)).Should().Exist(); - new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "icudt.dat")).Should().NotExist(); - new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "icudt_CJK.dat")).Should().NotExist(); - new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "icudt_EFIGS.dat")).Should().NotExist(); - new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "icudt_no_CJK.dat")).Should().NotExist(); + new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", fullIcuFilename)).Should().NotExist(); + foreach (var shardFilename in icuShardFilenames) + { + new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", shardFilename)).Should().NotExist(); + } } [Fact] - public void Build_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsGlobalizationMode() + public void Build_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsICUDataMode() { // Arrange var testAppName = "BlazorWasmMinimal"; @@ -432,14 +445,20 @@ public void Build_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsGlobalizatio bootJsonData.globalizationMode.Should().Be("all"); bootJsonData.resources.wasmNative.Should().ContainKey("dotnet.native.wasm"); - bootJsonData.resources.icu.Should().ContainKey("icudt.dat"); - bootJsonData.resources.icu.Should().ContainKey("icudt_EFIGS.dat"); + bootJsonData.resources.icu.Should().ContainKey(fullIcuFilename); + bootJsonData.resources.icu.Should().NotContainKey(hybridIcuFilename); + foreach (var shardFilename in icuShardFilenames) + { + bootJsonData.resources.icu.Should().NotContainKey(shardFilename); + } new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.native.wasm")).Should().Exist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt.dat")).Should().Exist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt_CJK.dat")).Should().Exist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt_EFIGS.dat")).Should().Exist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "icudt_no_CJK.dat")).Should().Exist(); + new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", fullIcuFilename)).Should().Exist(); + new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", hybridIcuFilename)).Should().NotExist(); + foreach (var shardFilename in icuShardFilenames) + { + new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", shardFilename)).Should().NotExist(); + } } [Fact] @@ -470,14 +489,20 @@ public void Publish_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsGlobalizat bootJsonData.globalizationMode.Should().Be("all"); bootJsonData.resources.wasmNative.Should().ContainKey("dotnet.native.wasm"); - bootJsonData.resources.icu.Should().ContainKey("icudt.dat"); - bootJsonData.resources.icu.Should().ContainKey("icudt_EFIGS.dat"); + bootJsonData.resources.icu.Should().ContainKey(fullIcuFilename); + bootJsonData.resources.icu.Should().NotContainKey(hybridIcuFilename); + foreach (var shardFilename in icuShardFilenames) + { + bootJsonData.resources.icu.Should().NotContainKey(shardFilename); + } new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "dotnet.native.wasm")).Should().Exist(); - new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "icudt.dat")).Should().Exist(); - new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "icudt_CJK.dat")).Should().Exist(); - new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "icudt_EFIGS.dat")).Should().Exist(); - new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "icudt_no_CJK.dat")).Should().Exist(); + new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", fullIcuFilename)).Should().Exist(); + new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", hybridIcuFilename)).Should().NotExist(); + foreach (var shardFilename in icuShardFilenames) + { + new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", shardFilename)).Should().NotExist(); + } } [Fact] From 1a7fbda53a92439e8eba9c4a7c4623334761518f Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Thu, 10 Aug 2023 13:22:15 +0200 Subject: [PATCH 11/18] Re-generate baseline. Reason: the default app has only ICU shards - no full nor hybrid file. --- ...iesAreCopiedToBuildOutput.Build.files.json | 8 -- ...edToBuildOutput.Build.staticwebassets.json | 78 +----------- ...s_CanIncludeBrowserAssets.Build.files.json | 8 -- ...deBrowserAssets.Build.staticwebassets.json | 76 ------------ ...CanIncludeBrowserAssets.Publish.files.json | 12 -- ...BrowserAssets.Publish.staticwebassets.json | 114 ------------------ 6 files changed, 1 insertion(+), 295 deletions(-) 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 fca9da6b7fa8..177b27414e84 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 @@ -211,10 +211,8 @@ "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\es\\Microsoft.CodeAnalysis.resources.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.CSharp.resources.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm", - "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", - "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\it\\Microsoft.CodeAnalysis.CSharp.resources.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\it\\Microsoft.CodeAnalysis.resources.wasm", @@ -449,10 +447,8 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\es\\Microsoft.CodeAnalysis.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\fr\\Microsoft.CodeAnalysis.CSharp.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm.gz", - "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_EFIGS.dat.gz", - "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\it\\Microsoft.CodeAnalysis.CSharp.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\it\\Microsoft.CodeAnalysis.resources.wasm.gz", @@ -907,14 +903,10 @@ "${OutputPath}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.CSharp.resources.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm", "${OutputPath}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\it\\Microsoft.CodeAnalysis.CSharp.resources.wasm", 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 c4d285f7a41d..2d50d84ea817 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 @@ -4072,7 +4072,7 @@ "AssetTraitValue": "es-ES", "CopyToOutputDirectory": "PreserveNewest", "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\classlibrarywithsatelliteassemblies.resources.wasm" + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\es-ES\\classlibrarywithsatelliteassemblies.resources.wasm" }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\es\\Microsoft.CodeAnalysis.CSharp.resources.wasm", @@ -4150,25 +4150,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\fr\\Microsoft.CodeAnalysis.resources.wasm" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm", @@ -4207,25 +4188,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm", @@ -8710,25 +8672,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\fr\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "blazorwasm", @@ -8767,25 +8710,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json index e8862db74c5a..1aa68006691a 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json @@ -196,10 +196,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js.map", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.runtime.js.map", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\mscorlib.wasm", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\netstandard.wasm", @@ -400,10 +398,8 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.js.map.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.runtime.js.map.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.wasm.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_EFIGS.dat.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\mscorlib.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\netstandard.wasm.gz", @@ -807,14 +803,10 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js.map.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\mscorlib.wasm", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json index 06a218d4a978..7c12a93a9a1f 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json @@ -3797,25 +3797,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -3854,25 +3835,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -7711,25 +7673,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "RazorComponentAppMultitarget", @@ -7768,25 +7711,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "SourceId": "RazorComponentAppMultitarget", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json index e87a4a82c1a1..29c0899189eb 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json @@ -24,18 +24,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -65,18 +59,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json index c941c688af54..67a66c3bcc06 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json @@ -111,25 +111,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -168,25 +149,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -624,44 +586,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "RazorComponentAppMultitarget", @@ -738,44 +662,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.br", "SourceId": "RazorComponentAppMultitarget", From 7220f0347c424c95c7e46829d702dcb9ed49424d Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Thu, 10 Aug 2023 13:36:07 +0200 Subject: [PATCH 12/18] Revert "Re-generate baseline. Reason: the default app has only ICU shards - no full nor hybrid file." This reverts commit 1a7fbda53a92439e8eba9c4a7c4623334761518f. --- ...iesAreCopiedToBuildOutput.Build.files.json | 8 ++ ...edToBuildOutput.Build.staticwebassets.json | 78 +++++++++++- ...s_CanIncludeBrowserAssets.Build.files.json | 8 ++ ...deBrowserAssets.Build.staticwebassets.json | 76 ++++++++++++ ...CanIncludeBrowserAssets.Publish.files.json | 12 ++ ...BrowserAssets.Publish.staticwebassets.json | 114 ++++++++++++++++++ 6 files changed, 295 insertions(+), 1 deletion(-) 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 177b27414e84..fca9da6b7fa8 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 @@ -211,8 +211,10 @@ "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\es\\Microsoft.CodeAnalysis.resources.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.CSharp.resources.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\it\\Microsoft.CodeAnalysis.CSharp.resources.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\it\\Microsoft.CodeAnalysis.resources.wasm", @@ -447,8 +449,10 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\es\\Microsoft.CodeAnalysis.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\fr\\Microsoft.CodeAnalysis.CSharp.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm.gz", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_EFIGS.dat.gz", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\it\\Microsoft.CodeAnalysis.CSharp.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\it\\Microsoft.CodeAnalysis.resources.wasm.gz", @@ -903,10 +907,14 @@ "${OutputPath}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.CSharp.resources.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm", "${OutputPath}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm.gz", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\it\\Microsoft.CodeAnalysis.CSharp.resources.wasm", 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 2d50d84ea817..c4d285f7a41d 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 @@ -4072,7 +4072,7 @@ "AssetTraitValue": "es-ES", "CopyToOutputDirectory": "PreserveNewest", "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\es-ES\\classlibrarywithsatelliteassemblies.resources.wasm" + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\classlibrarywithsatelliteassemblies.resources.wasm" }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\es\\Microsoft.CodeAnalysis.CSharp.resources.wasm", @@ -4150,6 +4150,25 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\fr\\Microsoft.CodeAnalysis.resources.wasm" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt.dat", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "WasmResource", + "AssetTraitValue": "native", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" + }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm", @@ -4188,6 +4207,25 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt_hybrid.dat", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "WasmResource", + "AssetTraitValue": "native", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" + }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm", @@ -8672,6 +8710,25 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\fr\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm.gz" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt.dat.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "blazorwasm", @@ -8710,6 +8767,25 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt_hybrid.dat.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json index 1aa68006691a..e8862db74c5a 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json @@ -196,8 +196,10 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js.map", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.runtime.js.map", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", + "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\mscorlib.wasm", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\netstandard.wasm", @@ -398,8 +400,10 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.js.map.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.runtime.js.map.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.wasm.gz", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_EFIGS.dat.gz", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\mscorlib.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\netstandard.wasm.gz", @@ -803,10 +807,14 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js.map.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\mscorlib.wasm", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json index 7c12a93a9a1f..06a218d4a978 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json @@ -3797,6 +3797,25 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.wasm" }, + { + "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt.dat", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "WasmResource", + "AssetTraitValue": "native", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" + }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -3835,6 +3854,25 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, + { + "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt_hybrid.dat", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "WasmResource", + "AssetTraitValue": "native", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" + }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -7673,6 +7711,25 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.gz" }, + { + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt.dat.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" + }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "RazorComponentAppMultitarget", @@ -7711,6 +7768,25 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, + { + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt_hybrid.dat.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" + }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "SourceId": "RazorComponentAppMultitarget", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json index 29c0899189eb..e87a4a82c1a1 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json @@ -24,12 +24,18 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -59,12 +65,18 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", + "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", + "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json index 67a66c3bcc06..c941c688af54 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json @@ -111,6 +111,25 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, + { + "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt.dat", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "WasmResource", + "AssetTraitValue": "native", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" + }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -149,6 +168,25 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, + { + "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt_hybrid.dat", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "WasmResource", + "AssetTraitValue": "native", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" + }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -586,6 +624,44 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, + { + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt.dat.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" + }, + { + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt.dat.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" + }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "RazorComponentAppMultitarget", @@ -662,6 +738,44 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, + { + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt_hybrid.dat.br", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" + }, + { + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", + "SourceId": "RazorComponentAppMultitarget", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/icudt_hybrid.dat.gz", + "AssetKind": "Publish", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" + }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.br", "SourceId": "RazorComponentAppMultitarget", From c2858edb0799747946c19a3de481dd9be19c7cdd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Aug 2023 23:05:11 +0000 Subject: [PATCH 13/18] Update dependencies from https://github.com/dotnet/runtime build 20230810.9 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23410.9 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88cba5ff7ac7..39d2ad0a7b0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + bc43b7ece88885d4f0246c73313c5e19864e15db https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 4d1cefe7ce45..c4b47ebb1609 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23410.9 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23410.9 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.9 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.9 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.9 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.9 From d3c6e413a131dccc5e627c188dadb7c8328ef84f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Aug 2023 02:38:34 +0000 Subject: [PATCH 14/18] Update dependencies from https://github.com/dotnet/runtime build 20230810.11 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23410.11 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39d2ad0a7b0a..11304240e49f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - bc43b7ece88885d4f0246c73313c5e19864e15db + 04553bf3cf2365cc71b5ea4d553e772c85d6c272 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index c4b47ebb1609..4d450b039dc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.11 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.11 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23410.9 - 8.0.0-rc.1.23410.9 - 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23410.9 - 8.0.0-rc.1.23410.9 - 8.0.0-rc.1.23410.9 - 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.11 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23410.9 - 8.0.0-rc.1.23410.9 - 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.11 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23410.9 - 8.0.0-rc.1.23410.9 - 8.0.0-rc.1.23410.9 + 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.11 From d0439624de39d4ad45074b2103692c9489a93800 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Fri, 11 Aug 2023 00:05:55 -0700 Subject: [PATCH 15/18] Try to update Blazor baselines --- ...ootJsonManifest.Build.staticwebassets.json | 76 ------------ ...iesAreCopiedToBuildOutput.Build.files.json | 8 -- ...edToBuildOutput.Build.staticwebassets.json | 78 +----------- ...duleTargetPaths.Build.staticwebassets.json | 76 ------------ ...izeBlazorInitialization.Publish.files.json | 18 --- ...nitialization.Publish.staticwebassets.json | 114 ------------------ ...tBuildAndPublishModules.Publish.files.json | 18 --- ...ublishModules.Publish.staticwebassets.json | 114 ------------------ ...izeBlazorInitialization.Publish.files.json | 12 -- ...nitialization.Publish.staticwebassets.json | 114 ------------------ ...nBlazorBootJsonManifest.Publish.files.json | 18 --- ...tJsonManifest.Publish.staticwebassets.json | 114 ------------------ ...Assets_BuildMinimal_Works.Build.files.json | 8 -- ...ldMinimal_Works.Build.staticwebassets.json | 76 ------------ ...Assets_Build_Hosted_Works.Build.files.json | 4 - ...ld_Hosted_Works.Build.staticwebassets.json | 76 ------------ ...ts_PublishMinimal_Works.Publish.files.json | 18 --- ...Minimal_Works.Publish.staticwebassets.json | 114 ------------------ ...mentationFiles_AsAssets.Publish.files.json | 12 -- ...iles_AsAssets.Publish.staticwebassets.json | 114 ------------------ ...ts_Publish_Hosted_Works.Publish.files.json | 12 -- ..._Hosted_Works.Publish.staticwebassets.json | 114 ------------------ ...s_CanIncludeBrowserAssets.Build.files.json | 8 -- ...deBrowserAssets.Build.staticwebassets.json | 76 ------------ ...CanIncludeBrowserAssets.Publish.files.json | 12 -- ...BrowserAssets.Publish.staticwebassets.json | 114 ------------------ 26 files changed, 1 insertion(+), 1517 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json index 753f4c226fcc..531970b1b979 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 @@ -3797,25 +3797,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -3854,25 +3835,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -7711,25 +7673,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "blazorwasm-minimal", @@ -7768,25 +7711,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.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 fca9da6b7fa8..177b27414e84 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 @@ -211,10 +211,8 @@ "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\es\\Microsoft.CodeAnalysis.resources.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.CSharp.resources.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm", - "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", - "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\it\\Microsoft.CodeAnalysis.CSharp.resources.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\it\\Microsoft.CodeAnalysis.resources.wasm", @@ -449,10 +447,8 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\es\\Microsoft.CodeAnalysis.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\fr\\Microsoft.CodeAnalysis.CSharp.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm.gz", - "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_EFIGS.dat.gz", - "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\it\\Microsoft.CodeAnalysis.CSharp.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\it\\Microsoft.CodeAnalysis.resources.wasm.gz", @@ -907,14 +903,10 @@ "${OutputPath}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.CSharp.resources.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm", "${OutputPath}\\wwwroot\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\it\\Microsoft.CodeAnalysis.CSharp.resources.wasm", 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 c4d285f7a41d..2d50d84ea817 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 @@ -4072,7 +4072,7 @@ "AssetTraitValue": "es-ES", "CopyToOutputDirectory": "PreserveNewest", "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\classlibrarywithsatelliteassemblies.resources.wasm" + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\es-ES\\classlibrarywithsatelliteassemblies.resources.wasm" }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\es\\Microsoft.CodeAnalysis.CSharp.resources.wasm", @@ -4150,25 +4150,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\fr\\Microsoft.CodeAnalysis.resources.wasm" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm", @@ -4207,25 +4188,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm", @@ -8710,25 +8672,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\fr\\_framework\\fr\\Microsoft.CodeAnalysis.resources.wasm.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "blazorwasm", @@ -8767,25 +8710,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.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 d5f7583665fc..bec3ac15253d 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 @@ -3884,25 +3884,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm", @@ -3941,25 +3922,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm", @@ -7836,25 +7798,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "blazorwasm", @@ -7893,25 +7836,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.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 96f322c15523..cbd201c32f9d 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 @@ -204,18 +204,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -228,10 +222,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", @@ -371,14 +363,10 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\blazorwasm-minimal.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\dotnet.js.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\dotnet.wasm.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_EFIGS.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_EFIGS.dat.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\netstandard.wasm.br", @@ -653,18 +641,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.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 e01a1faa8230..ab1185cfdbef 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 @@ -111,25 +111,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -168,25 +149,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -2904,44 +2866,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "blazorwasm-minimal", @@ -3018,44 +2942,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.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 0bfd4da38bbe..1a94dd9e5ca8 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 @@ -201,18 +201,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -225,10 +219,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", @@ -366,14 +358,10 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\blazorwasm-minimal.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\dotnet.js.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\dotnet.wasm.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_EFIGS.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_EFIGS.dat.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\netstandard.wasm.br", @@ -644,18 +632,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.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 0228e667160d..f9596062b38b 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 @@ -111,25 +111,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -168,25 +149,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -2866,44 +2828,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "blazorwasm-minimal", @@ -2980,44 +2904,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.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 1fd489172c25..e2b8ce40c61b 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 @@ -211,18 +211,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -448,18 +442,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.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 312745b1c922..164a4010eb6f 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 @@ -179,25 +179,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm", @@ -236,25 +217,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm", @@ -3029,44 +2991,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "blazorwasm", @@ -3143,44 +3067,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.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 0bfd4da38bbe..1a94dd9e5ca8 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 @@ -201,18 +201,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -225,10 +219,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", @@ -366,14 +358,10 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\blazorwasm-minimal.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\dotnet.js.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\dotnet.wasm.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_EFIGS.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_EFIGS.dat.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\netstandard.wasm.br", @@ -644,18 +632,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.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 62c1bccc35eb..14af11049e3e 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 @@ -111,25 +111,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -168,25 +149,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -2866,44 +2828,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "blazorwasm-minimal", @@ -2980,44 +2904,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.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 5f01d18e467c..91c05f5e1b90 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 @@ -196,10 +196,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js.map", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.runtime.js.map", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\mscorlib.wasm", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\netstandard.wasm", @@ -400,10 +398,8 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.js.map.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.runtime.js.map.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.wasm.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_EFIGS.dat.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\mscorlib.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\netstandard.wasm.gz", @@ -809,14 +805,10 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js.map.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\mscorlib.wasm", 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 d1ff4dd73aca..8436d8c72a75 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 @@ -3797,25 +3797,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -3854,25 +3835,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -7711,25 +7673,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "blazorwasm-minimal", @@ -7768,25 +7711,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.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 a38c17edeb9d..ee26de6c05d0 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 @@ -397,14 +397,10 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js.map.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\mscorlib.wasm", 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 7918464158a9..6295bf583c29 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 @@ -3865,25 +3865,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm", @@ -3922,25 +3903,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm", @@ -7817,25 +7779,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "blazorwasm", @@ -7874,25 +7817,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.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 17bdce282af6..71adfb4d6140 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 @@ -201,18 +201,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -226,10 +220,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", @@ -367,14 +359,10 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\blazorwasm-minimal.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\dotnet.js.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\dotnet.wasm.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_EFIGS.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_EFIGS.dat.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\netstandard.wasm.br", @@ -647,18 +635,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.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 dd83be5fd976..ac53e47abbf4 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 @@ -111,25 +111,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -168,25 +149,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm-minimal", @@ -2866,44 +2828,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "blazorwasm-minimal", @@ -2980,44 +2904,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.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 c8174aefb074..fb4cf752da2c 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 @@ -208,18 +208,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -440,18 +434,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.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 d23b9cd74db5..bacfb24ce52d 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 @@ -160,25 +160,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm", @@ -217,25 +198,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm", @@ -2972,44 +2934,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "blazorwasm", @@ -3086,44 +3010,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.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 c8174aefb074..fb4cf752da2c 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 @@ -208,18 +208,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -440,18 +434,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.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 d23b9cd74db5..bacfb24ce52d 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 @@ -160,25 +160,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "blazorwasm", @@ -217,25 +198,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "blazorwasm", @@ -2972,44 +2934,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "blazorwasm", @@ -3086,44 +3010,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.br", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json index e8862db74c5a..1aa68006691a 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.files.json @@ -196,10 +196,8 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js.map", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.runtime.js.map", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\mscorlib.wasm", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\netstandard.wasm", @@ -400,10 +398,8 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.js.map.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.runtime.js.map.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.wasm.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_EFIGS.dat.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\mscorlib.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\netstandard.wasm.gz", @@ -807,14 +803,10 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js.map.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\mscorlib.wasm", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json index 06a218d4a978..7c12a93a9a1f 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_CrosstargetingTests_CanIncludeBrowserAssets.Build.staticwebassets.json @@ -3797,25 +3797,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -3854,25 +3835,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -7711,25 +7673,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt.dat.gz", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_CJK.dat.gz", "SourceId": "RazorComponentAppMultitarget", @@ -7768,25 +7711,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\icudt_no_CJK.dat.gz", "SourceId": "RazorComponentAppMultitarget", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json index e87a4a82c1a1..29c0899189eb 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.files.json @@ -24,18 +24,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", @@ -65,18 +59,12 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_EFIGS.dat.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt_hybrid.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json index c941c688af54..67a66c3bcc06 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Publish_CrosstargetingTests_CanIncludeBrowserAssets.Publish.staticwebassets.json @@ -111,25 +111,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -168,25 +149,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat", "SourceId": "RazorComponentAppMultitarget", @@ -624,44 +586,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "RazorComponentAppMultitarget", @@ -738,44 +662,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_EFIGS.dat.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.br", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_hybrid.dat.gz", - "SourceId": "RazorComponentAppMultitarget", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt_hybrid.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_hybrid.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt_hybrid.dat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_no_CJK.dat.br", "SourceId": "RazorComponentAppMultitarget", From 44344b4f5d47982783741667595b66fd45765123 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Aug 2023 08:00:05 +0000 Subject: [PATCH 16/18] Update dependencies from https://github.com/dotnet/runtime build 20230810.15 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23410.15 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11304240e49f..34072f04b554 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - 04553bf3cf2365cc71b5ea4d553e772c85d6c272 + 786b9872ad306d5b0febdc2e6c820b69e0e232dc https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 4d450b039dc7..74555a6a9b72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.15 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.15 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23410.11 - 8.0.0-rc.1.23410.11 - 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23410.15 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23410.11 - 8.0.0-rc.1.23410.11 - 8.0.0-rc.1.23410.11 - 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23410.15 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23410.11 - 8.0.0-rc.1.23410.11 - 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23410.15 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23410.11 - 8.0.0-rc.1.23410.11 - 8.0.0-rc.1.23410.11 + 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23410.15 From 6e999c950ef4b5f069612d1a845b24600056079f Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Fri, 11 Aug 2023 09:09:46 -0700 Subject: [PATCH 17/18] Change symbol suffix from .dwarf to .dsym --- .../GivenThatWeWantToPublishAnAotApp.cs | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 74b104222299..b5b61d69b995 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -56,14 +56,12 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string var sharedLibSuffix = GetSharedLibSuffix(); var publishedDll = Path.Combine(publishDirectory, $"{projectName}{sharedLibSuffix}"); var publishedExe = Path.Combine(publishDirectory, $"{testProject.Name}{Constants.ExeSuffix}"); - var symbolSuffix = GetSymbolSuffix(); - var publishedDebugFile = Path.Combine(publishDirectory, $"{testProject.Name}{symbolSuffix}"); // NativeAOT published dir should not contain a non-host stand alone package File.Exists(publishedDll).Should().BeFalse(); // The exe exist and should be native File.Exists(publishedExe).Should().BeTrue(); - File.Exists(publishedDebugFile).Should().BeTrue(); + DoSymbolsExist(publishDirectory, testProject.Name).Should().BeTrue(); IsNativeImage(publishedExe).Should().BeTrue(); GetKnownILCompilerPackVersion(testAsset, targetFramework, out string expectedVersion); @@ -144,8 +142,6 @@ public void NativeAot_app_runs_in_debug_with_no_config_when_PublishAot_is_enable var publishDirectory = publishCommand.GetOutputDirectory(targetFramework: targetFramework, configuration: projectConfiguration, runtimeIdentifier: rid).FullName; var sharedLibSuffix = GetSharedLibSuffix(); var publishedExe = Path.Combine(publishDirectory, $"{testProject.Name}{Constants.ExeSuffix}"); - var symbolSuffix = GetSymbolSuffix(); - var publishedDebugFile = Path.Combine(publishDirectory, $"{testProject.Name}{symbolSuffix}"); var publishedRuntimeConfig = Path.Combine(publishDirectory, $"{testProject.Name}.runtimeconfig.json"); var publishedDeps = Path.Combine(publishDirectory, $"{testProject.Name}.deps.json"); @@ -156,7 +152,7 @@ public void NativeAot_app_runs_in_debug_with_no_config_when_PublishAot_is_enable // The exe exist and should be native File.Exists(publishedExe).Should().BeTrue(); // There should be a debug file - File.Exists(publishedDebugFile).Should().BeTrue(); + DoSymbolsExist(publishDirectory, testProject.Name).Should().BeTrue(); IsNativeImage(publishedExe).Should().BeTrue(); // The app accesses the runtime config file key-value pair @@ -198,8 +194,6 @@ public void NativeAot_app_runs_in_release_with_no_config_when_PublishAot_is_enab var publishDirectory = publishCommand.GetOutputDirectory(targetFramework: targetFramework, configuration: projectConfiguration, runtimeIdentifier: rid).FullName; var sharedLibSuffix = GetSharedLibSuffix(); var publishedExe = Path.Combine(publishDirectory, $"{testProject.Name}{Constants.ExeSuffix}"); - var symbolSuffix = GetSymbolSuffix(); - var publishedDebugFile = Path.Combine(publishDirectory, $"{testProject.Name}{symbolSuffix}"); var publishedRuntimeConfig = Path.Combine(publishDirectory, $"{testProject.Name}.runtimeconfig.json"); var publishedDeps = Path.Combine(publishDirectory, $"{testProject.Name}.deps.json"); @@ -210,7 +204,7 @@ public void NativeAot_app_runs_in_release_with_no_config_when_PublishAot_is_enab // The exe exist and should be native File.Exists(publishedExe).Should().BeTrue(); // There should be a debug file - File.Exists(publishedDebugFile).Should().BeTrue(); + DoSymbolsExist(publishDirectory, testProject.Name).Should().BeTrue(); IsNativeImage(publishedExe).Should().BeTrue(); // The app accesses the runtime config file key-value pair @@ -293,14 +287,12 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_enabled(string var sharedLibSuffix = GetSharedLibSuffix(); var publishedDll = Path.Combine(publishDirectory, $"{projectName}{sharedLibSuffix}"); var publishedExe = Path.Combine(publishDirectory, $"{testProject.Name}{Constants.ExeSuffix}"); - var symbolSuffix = GetSymbolSuffix(); - var publishedDebugFile = Path.Combine(publishDirectory, $"{testProject.Name}{symbolSuffix}"); // NativeAOT published dir should not contain a non-host stand alone package File.Exists(publishedDll).Should().BeFalse(); // The exe exist and should be native File.Exists(publishedExe).Should().BeTrue(); - File.Exists(publishedDebugFile).Should().BeTrue(); + DoSymbolsExist(publishDirectory, testProject.Name).Should().BeTrue(); IsNativeImage(publishedExe).Should().BeTrue(); var command = new RunExeCommand(Log, publishedExe) @@ -981,24 +973,31 @@ private static string GetSharedLibSuffix() throw new PlatformNotSupportedException(); } - private static string GetSymbolSuffix() + private static bool DoSymbolsExist(string baseDir, string baseName) { + string suffix; if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - return ".pdb"; + suffix = ".pdb"; } else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { - return ".dbg"; + suffix = ".dbg"; } else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { - return ".dwarf"; + suffix = ".dsym"; } else { throw new PlatformNotSupportedException(); } + + var path = Path.Combine(baseDir, baseName + suffix); + // Symbol file is a directory on OSX + return RuntimeInformation.IsOSPlatform(OSPlatform.OSX) + ? Directory.Exists(path) + : File.Exists(path); } private TestProject CreateTestProjectWithAotLibrary(string targetFramework, string projectName) From d5a8fd1ef1d49223c43dab18d2e4a6df6b1a7032 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 13 Aug 2023 16:01:04 +0000 Subject: [PATCH 18/18] Update dependencies from https://github.com/dotnet/runtime build 20230813.2 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , 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.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.1.23408.3 -> To Version 8.0.0-rc.1.23413.2 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rc.1.23402.3 -> To Version 8.0.0-rc.1.23411.2 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34072f04b554..f21efb2123a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ 0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/emsdk - 7a17b406530ad1d08895bcb1eeb8a64c62951da6 + abfa03c97f4175d4d209435cd0e71f558e36c3fd @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 14a299529957175bb8613eac57a3a6a7b5020dea - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 9a7b1d30fd536da1b71d74b184e857ee96c12a76 - + https://github.com/dotnet/runtime - 786b9872ad306d5b0febdc2e6c820b69e0e232dc + af651f48d07c87c94e1225859e63e919719b687b https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 74555a6a9b72..bfe8c7a97084 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23407.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23413.2 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23413.2 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23403.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23410.15 - 8.0.0-rc.1.23410.15 - 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23413.2 + 8.0.0-rc.1.23413.2 + 8.0.0-rc.1.23413.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23410.15 - 8.0.0-rc.1.23410.15 - 8.0.0-rc.1.23410.15 - 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23413.2 + 8.0.0-rc.1.23413.2 + 8.0.0-rc.1.23413.2 + 8.0.0-rc.1.23413.2 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23410.15 - 8.0.0-rc.1.23410.15 - 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23413.2 + 8.0.0-rc.1.23413.2 + 8.0.0-rc.1.23413.2 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23410.15 - 8.0.0-rc.1.23410.15 - 8.0.0-rc.1.23410.15 + 8.0.0-rc.1.23413.2 + 8.0.0-rc.1.23413.2 + 8.0.0-rc.1.23413.2 @@ -208,7 +208,7 @@ - 8.0.0-rc.1.23402.3 + 8.0.0-rc.1.23411.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))