diff --git a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets index 5921ae4ce6a4..a3c3a9d7a3da 100644 --- a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets +++ b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets @@ -62,8 +62,8 @@ Copyright (c) .NET Foundation. All rights reserved. false false - - false + + false false diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json index 1f16255c17df..68b19576fe2e 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json @@ -15,11 +15,14 @@ "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Configuration.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.DependencyInjection.Abstractions.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.DependencyInjection.wasm", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.FileProviders.Abstractions.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.FileProviders.Physical.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.FileSystemGlobbing.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Logging.Abstractions.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Logging.wasm", + "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Options.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Primitives.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.JSInterop.WebAssembly.wasm", @@ -254,11 +257,14 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Configuration.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.DependencyInjection.Abstractions.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.DependencyInjection.wasm.gz", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm.gz", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Diagnostics.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.FileProviders.Abstractions.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.FileProviders.Physical.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.FileSystemGlobbing.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Logging.Abstractions.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Logging.wasm.gz", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Options.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Primitives.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.JSInterop.WebAssembly.wasm.gz", @@ -513,6 +519,10 @@ "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.DependencyInjection.Abstractions.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.DependencyInjection.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.DependencyInjection.wasm.gz", + "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm", + "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm.gz", + "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.wasm", + "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.FileProviders.Abstractions.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.FileProviders.Abstractions.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.FileProviders.Physical.wasm", @@ -523,6 +533,8 @@ "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Logging.Abstractions.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Logging.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Logging.wasm.gz", + "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm", + "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Options.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Options.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.Extensions.Primitives.wasm", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json index b6fb6e6d228b..bb7e08e88c29 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json @@ -460,6 +460,52 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.Extensions.Diagnostics.Abstractions.wasm", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "WasmResource", + "AssetTraitValue": "runtime", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\Microsoft.Extensions.Diagnostics.Abstractions.wasm", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, + { + "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.wasm", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.Extensions.Diagnostics.wasm", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "WasmResource", + "AssetTraitValue": "runtime", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\Microsoft.Extensions.Diagnostics.wasm", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.FileProviders.Abstractions.wasm", "SourceId": "blazorwasm", @@ -575,6 +621,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.Extensions.Options.ConfigurationExtensions.wasm", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "WasmResource", + "AssetTraitValue": "runtime", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Options.wasm", "SourceId": "blazorwasm", @@ -5980,6 +6049,52 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm.gz", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.Extensions.Diagnostics.Abstractions.wasm.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm.gz", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Diagnostics.wasm.gz", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.Extensions.Diagnostics.wasm.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.wasm", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\Microsoft.Extensions.Diagnostics.wasm.gz", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.FileProviders.Abstractions.wasm.gz", "SourceId": "blazorwasm", @@ -6095,6 +6210,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm.gz", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.Extensions.Options.ConfigurationExtensions.wasm.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "PreserveNewest", + "CopyToPublishDirectory": "Never", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm.gz", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Options.wasm.gz", "SourceId": "blazorwasm", @@ -12122,6 +12260,80 @@ } ] }, + { + "Route": "_framework/Microsoft.Extensions.Diagnostics.Abstractions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "application/wasm" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_framework/Microsoft.Extensions.Diagnostics.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Diagnostics.wasm", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "application/wasm" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, { "Route": "_framework/Microsoft.Extensions.FileProviders.Abstractions.wasm", "AssetFile": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.FileProviders.Abstractions.wasm", @@ -12307,6 +12519,43 @@ } ] }, + { + "Route": "_framework/Microsoft.Extensions.Options.ConfigurationExtensions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "application/wasm" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, { "Route": "_framework/Microsoft.Extensions.Options.wasm", "AssetFile": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\Microsoft.Extensions.Options.wasm", @@ -22097,6 +22346,206 @@ } ] }, + { + "Route": "_framework/Microsoft.Extensions.Diagnostics.Abstractions.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "application/wasm" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_framework/Microsoft.Extensions.Diagnostics.Abstractions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Diagnostics.Abstractions.wasm.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "application/wasm" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_framework/Microsoft.Extensions.Diagnostics.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Diagnostics.wasm.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "application/wasm" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_framework/Microsoft.Extensions.Diagnostics.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Diagnostics.wasm.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "application/wasm" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, { "Route": "_framework/Microsoft.Extensions.FileProviders.Abstractions.wasm.gz", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.FileProviders.Abstractions.wasm.gz", @@ -22597,6 +23046,106 @@ } ] }, + { + "Route": "_framework/Microsoft.Extensions.Options.ConfigurationExtensions.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "application/wasm" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_framework/Microsoft.Extensions.Options.ConfigurationExtensions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Options.ConfigurationExtensions.wasm.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "application/wasm" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, { "Route": "_framework/Microsoft.Extensions.Options.wasm.gz", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Options.wasm.gz", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs index 69aa7d6c2a60..362d8d419884 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs @@ -24,8 +24,10 @@ public void Build_IsIncremental() var buildOutputDirectory = build.GetOutputDirectory(DefaultTfm).ToString(); + // ActiveIssue https://github.com/dotnet/runtime/issues/115646 var filesToIgnore = new[] { + Path.Combine(buildOutputDirectory, "blazorwasm.runtimeconfig.json"), Path.Combine(buildOutputDirectory, "RazorClassLibrary.staticwebassets.endpoints.json"), Path.Combine(buildOutputDirectory, "blazorwasm.staticwebassets.endpoints.json") }; @@ -43,7 +45,11 @@ public void Build_IsIncremental() newThumbPrint.Count.Should().Be(thumbPrint.Count); for (var j = 0; j < thumbPrint.Count; j++) { - thumbPrint[j].Equals(newThumbPrint[j]).Should().BeTrue(); + var first = thumbPrint[j]; + var actual = newThumbPrint[j]; + actual.Path.Equals(first.Path).Should().BeTrue($"because {actual.Path} should match {first.Path} on build {i}"); + actual.Hash.Equals(first.Hash).Should().BeTrue($"because {actual.Hash} should match {first.Hash} for {first.Path} on build {i}"); + actual.LastWriteTimeUtc.Equals(first.LastWriteTimeUtc).Should().BeTrue($"because {actual.LastWriteTimeUtc} should match {first.LastWriteTimeUtc} for {first.Path} on build {i}"); } } } diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs index e899e182f713..6b26bd237940 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs @@ -152,8 +152,8 @@ public void Publish_Works_WithLibraryUsingHintPath() new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "blazorwasm.wasm")).Should().Exist(); new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "System.Text.Json.wasm")).Should().Exist(); new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "System.Text.Json.wasm.gz")).Should().Exist(); - new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "System.wasm")).Should().Exist(); - new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "System.wasm.gz")).Should().Exist(); + new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "System.Private.CoreLib.wasm")).Should().Exist(); + new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "System.Private.CoreLib.wasm.gz")).Should().Exist(); new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "RazorClassLibrary.wasm")).Should().Exist(); } diff --git a/test/Microsoft.NET.TestFramework/Utilities/FileThumbPrint.cs b/test/Microsoft.NET.TestFramework/Utilities/FileThumbPrint.cs index 8f188989dce9..d4417971ffe5 100644 --- a/test/Microsoft.NET.TestFramework/Utilities/FileThumbPrint.cs +++ b/test/Microsoft.NET.TestFramework/Utilities/FileThumbPrint.cs @@ -61,7 +61,18 @@ public bool Equals(FileThumbPrint? other) string.Equals(Hash, other.Hash, StringComparison.Ordinal); } - public override int GetHashCode() => LastWriteTimeUtc.GetHashCode(); + public override int GetHashCode() + { +#if NETCOREAPP3_1_OR_GREATER + return HashCode.Combine(Path, LastWriteTimeUtc, Hash); +#else + int hashCode = 1601069575; + hashCode = hashCode * -1521134295 + EqualityComparer.Default.GetHashCode(Path); + hashCode = hashCode * -1521134295 + EqualityComparer.Default.GetHashCode(LastWriteTimeUtc); + hashCode = hashCode * -1521134295 + EqualityComparer.Default.GetHashCode(Hash); + return hashCode; +#endif + } private string GetDebuggerDisplay() { diff --git a/test/TestAssets/TestProjects/BlazorWasmWithLibrary/blazorwasm/App.razor b/test/TestAssets/TestProjects/BlazorWasmWithLibrary/blazorwasm/App.razor index 13f3043f0c49..eba23da9b5ae 100644 --- a/test/TestAssets/TestProjects/BlazorWasmWithLibrary/blazorwasm/App.razor +++ b/test/TestAssets/TestProjects/BlazorWasmWithLibrary/blazorwasm/App.razor @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/TestProjects/BlazorWasmWithLibrary/blazorwasm/blazorwasm.csproj b/test/TestAssets/TestProjects/BlazorWasmWithLibrary/blazorwasm/blazorwasm.csproj index dc34774033dc..ba80f0186b5f 100644 --- a/test/TestAssets/TestProjects/BlazorWasmWithLibrary/blazorwasm/blazorwasm.csproj +++ b/test/TestAssets/TestProjects/BlazorWasmWithLibrary/blazorwasm/blazorwasm.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/test/TestAssets/TestProjects/WatchBlazorWasm/App.razor b/test/TestAssets/TestProjects/WatchBlazorWasm/App.razor index 13f3043f0c49..eba23da9b5ae 100644 --- a/test/TestAssets/TestProjects/WatchBlazorWasm/App.razor +++ b/test/TestAssets/TestProjects/WatchBlazorWasm/App.razor @@ -1,4 +1,4 @@ - +