diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69e72fe34ffc..3805a62d4100 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ da81decbbf9590c893722f4bb9c7fff9038a8b4e - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf https://github.com/dotnet/msbuild @@ -110,30 +110,30 @@ 313671b195b1b36d56a8888a9a0e12edaac52c57 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf https://github.com/dotnet/linker 313671b195b1b36d56a8888a9a0e12edaac52c57 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf https://github.com/dotnet/windowsdesktop @@ -280,9 +280,9 @@ https://github.com/dotnet/arcade 6a638cd0c13962ab2a1943cb1c878be5a41dd82e - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + fe99c441fd6169725366d61d0ba4b8a4d4a11ecf https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 99f0934a92db..8767945cafae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 7.0.0-beta.22411.2 7.0.0-preview.22423.2 - 7.0.0-rc.1.22422.12 + 7.0.0-rc.2.22428.3 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rc.1.22422.12 + 7.0.0-rc.2.22428.3 4.6.0 2.0.0-beta4.22402.1 1.0.0-preview5.1.22263.1 @@ -48,13 +48,13 @@ - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 + 7.0.0-rc.2.22428.3 + 7.0.0-rc.2.22428.3 + 7.0.0-rc.2.22428.3 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 + 7.0.0-rc.2.22428.3 + 7.0.0-rc.2.22428.3 + 7.0.0-rc.2.22428.3 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -90,10 +90,10 @@ - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 + 7.0.0-rc.2.22428.3 + 7.0.0-rc.2.22428.3 + 7.0.0-rc.2.22428.3 + 7.0.0-rc.2.22428.3 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 934104e8543c..4a5f70b1c7c5 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 @@ -179,9 +179,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", @@ -370,8 +367,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Encodings.Web.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", @@ -462,7 +457,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Cryptography.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Encodings.Web.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", 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 4a790dee04c5..b2f1da88ef60 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 @@ -2277,40 +2277,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -3841,23 +3807,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm-minimal", 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 220263410bc2..ae3af804e486 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 @@ -176,9 +176,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", @@ -365,8 +362,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Encodings.Web.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", @@ -457,7 +452,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Cryptography.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Encodings.Web.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", 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 35761bd0f421..6b6a0bbb529c 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 @@ -2243,40 +2243,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -3807,23 +3773,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm-minimal", 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 0c93b30700ae..0859c739762d 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 @@ -186,9 +186,6 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", 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 127d989ad922..31c7f39c878f 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 @@ -2392,40 +2392,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm", @@ -3990,23 +3956,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm", 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 220263410bc2..ae3af804e486 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 @@ -176,9 +176,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", @@ -365,8 +362,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Encodings.Web.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", @@ -457,7 +452,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Cryptography.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Encodings.Web.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", 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 5b242e21a1a2..20c246ed0082 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 @@ -2243,40 +2243,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -3807,23 +3773,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm-minimal", 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 4b48c2e05d89..d523f58382e1 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 @@ -176,9 +176,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", @@ -368,8 +365,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Encodings.Web.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Text.Json.dll.gz]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.gz]]", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Thread.dll.br]]", @@ -460,7 +455,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Security.Cryptography.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Encodings.Web.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Thread.dll", "${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.ThreadPool.dll", 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 e96fd5807d41..12acebf1bf01 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 @@ -2243,40 +2243,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm-minimal", @@ -3841,23 +3807,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm-minimal", 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 7d5fccfb84d9..344fe8063a00 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 @@ -183,9 +183,6 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", 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 74334eca994d..01a7beaa35c0 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 @@ -2341,40 +2341,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm", @@ -3939,23 +3905,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm", 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 7d5fccfb84d9..344fe8063a00 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 @@ -183,9 +183,6 @@ "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Text.Json.dll.gz", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.br", - "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Channels.dll.gz", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.br", "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\System.Threading.Tasks.dll.gz", 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 74334eca994d..01a7beaa35c0 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 @@ -2341,40 +2341,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.br]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Channels.dll.gz]]", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\[[_framework/System.Threading.Tasks.dll.br]]", "SourceId": "blazorwasm", @@ -3939,23 +3905,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Text.Json.dll" }, - { - "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Threading.Channels.dll", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "runtime", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\linked\\System.Threading.Channels.dll" - }, { "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\${Tfm}\\linked\\System.Threading.Tasks.dll", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/AspNetSdkBaselineTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/AspNetSdkBaselineTest.cs index 608d8970e49a..70a5d1403142 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/AspNetSdkBaselineTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/AspNetSdkBaselineTest.cs @@ -356,8 +356,35 @@ internal void AssertManifest( .Should() .BeEquivalentTo(expected.ReferencedProjectsConfiguration.OrderBy(cm => cm.Identity)); manifest.DiscoveryPatterns.OrderBy(dp => dp.Name).Should().BeEquivalentTo(expected.DiscoveryPatterns.OrderBy(dp => dp.Name)); - manifest.Assets.OrderBy(a => a.BasePath).ThenBy(a => a.RelativePath).ThenBy(a => a.AssetKind) - .Should().BeEquivalentTo(expected.Assets.OrderBy(a => a.BasePath).ThenBy(a => a.RelativePath).ThenBy(a => a.AssetKind)); + var manifestAssets = manifest.Assets.OrderBy(a => a.BasePath).ThenBy(a => a.RelativePath).ThenBy(a => a.AssetKind); + var expectedAssets = expected.Assets.OrderBy(a => a.BasePath).ThenBy(a => a.RelativePath).ThenBy(a => a.AssetKind); + + manifestAssets.Should().BeEquivalentTo(expectedAssets, AssetDifferencesDetails(manifestAssets, expectedAssets)); + + static string AssetDifferencesDetails(IEnumerable manifestAssets, IEnumerable expectedAssets) + { + var missingAssets = expectedAssets.Except(manifestAssets); + var unexpectedAssets = manifestAssets.Except(expectedAssets); + + var differences = new List(); + + if (missingAssets.Any()) + { + differences.Add($"The following expected assets weren't found in the manifest {string.Join(", ", missingAssets.Select(a => a.Identity))}."); + } + + if (unexpectedAssets.Any()) + { + differences.Add($"The following additional unexpected assets were found in the manifest {string.Join(", ", unexpectedAssets.Select(a => a.Identity))}."); + } + + if (differences.Any()) + { + differences.Add("If the difference in baselines is expected, please re-generate the baselines. Instructions are available at https://aka.ms/aspnet/blazor/blazor-wasm-sdk-baselines"); + } + + return string.Join(Environment.NewLine, differences); + } } else {