Skip to content

[Blazor] Update SDK to account for the crypto worker file #26966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javiercn merged 9 commits into from
Aug 7, 2022
Merged

[Blazor] Update SDK to account for the crypto worker file #26966

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e592ce
Account for the crypto-worker-js file from the runtime at build time
javiercn Aug 3, 2022
836b9ac
Update baselines
javiercn Aug 3, 2022
c1066c6
rename runtimeAssets
pavelsavara Aug 4, 2022
8cc58cb
fixed publish
pavelsavara Aug 4, 2022
a995950
Update baselines
javiercn Aug 5, 2022
73f35a8
Apply suggestions from code review
javiercn Aug 5, 2022
11e9411
Address feedback
javiercn Aug 5, 2022
9a56f31
Fix culture bug
javiercn Aug 5, 2022
f082f8d
Fix bad merge
javiercn Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update baselines
  • Loading branch information
@javiercn
javiercn committed Aug 3, 2022
commit 836b9ac9901602b97c87a53732f7c38464e58935
104 changes: 69 additions & 35 deletions ...GenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1869,23 +1869,6 @@
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Private.DataContractSerialization.dll"
},
{
"Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\",
"BasePath": "/",
"RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Primary",
"RelatedAsset": "",
"AssetTraitName": "BlazorWebAssemblyResource",
"AssetTraitValue": "runtime",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll"
},
{
"Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll",
"SourceId": "blazorwasm-minimal",
Expand Down Expand Up @@ -2209,6 +2192,23 @@
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.Handles.dll"
},
{
"Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\",
"BasePath": "/",
"RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Primary",
"RelatedAsset": "",
"AssetTraitName": "BlazorWebAssemblyResource",
"AssetTraitValue": "runtime",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Runtime.InteropServices.JavaScript.dll"
},
{
"Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll",
"SourceId": "blazorwasm-minimal",
Expand Down Expand Up @@ -3297,6 +3297,23 @@
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazorwasm-minimal.pdb"
},
{
"Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\",
"BasePath": "/",
"RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Primary",
"RelatedAsset": "",
"AssetTraitName": "BlazorWebAssemblyResource",
"AssetTraitValue": "js-module-crypto",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet-crypto-worker.js"
},
{
"Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js",
"SourceId": "blazorwasm-minimal",
Expand Down Expand Up @@ -5303,23 +5320,6 @@
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll"
},
{
"Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\",
"BasePath": "/",
"RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Alternative",
"RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll",
"AssetTraitName": "Content-Encoding",
"AssetTraitValue": "gzip",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll"
},
{
"Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Uri.dll.gz]]",
"SourceId": "blazorwasm-minimal",
Expand Down Expand Up @@ -5643,6 +5643,23 @@
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll"
},
{
"Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\",
"BasePath": "/",
"RelativePath": "_framework/System.Runtime.InteropServices.JavaScript.dll.gz",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Alternative",
"RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll",
"AssetTraitName": "Content-Encoding",
"AssetTraitValue": "gzip",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll"
},
{
"Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]",
"SourceId": "blazorwasm-minimal",
Expand Down Expand Up @@ -6714,6 +6731,23 @@
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb"
},
{
"Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\",
"BasePath": "/",
"RelativePath": "_framework/dotnet-crypto-worker.[[hash]].js.gz",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Alternative",
"RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js",
"AssetTraitName": "Content-Encoding",
"AssetTraitValue": "gzip",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js"
},
{
"Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]",
"SourceId": "blazorwasm-minimal",
Expand Down Expand Up @@ -6919,4 +6953,4 @@
"OriginalItemSpec": "wwwroot\\index.html"
}
]
}
}
11 changes: 7 additions & 4 deletions ...StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,6 @@
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.CoreLib.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.DataContractSerialization.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Uri.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Private.Xml.Linq.dll",
Expand Down Expand Up @@ -265,6 +263,8 @@
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Extensions.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.Handles.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.JavaScript.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.RuntimeInformation.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Runtime.InteropServices.dll",
Expand Down Expand Up @@ -404,6 +404,8 @@
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.CSharp.resources.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet-crypto-worker.[[hash]].js.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.${RuntimeVersion}.[[hash]].js.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat",
Expand Down Expand Up @@ -585,7 +587,6 @@
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.ObjectModel.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.CoreLib.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.DataContractSerialization.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Uri.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Xml.Linq.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Private.Xml.dll.gz]]",
Expand All @@ -605,6 +606,7 @@
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.CompilerServices.VisualC.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.Extensions.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.Handles.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.JavaScript.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.RuntimeInformation.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.InteropServices.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Runtime.Intrinsics.dll.gz]]",
Expand Down Expand Up @@ -674,6 +676,7 @@
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/cs/Microsoft.CodeAnalysis.resources.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/de/Microsoft.CodeAnalysis.CSharp.resources.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/de/Microsoft.CodeAnalysis.resources.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet-crypto-worker.[[hash]].js.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.[[hash]].js.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.timezones.blat.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/dotnet.wasm.gz]]",
Expand Down Expand Up @@ -711,4 +714,4 @@
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\my-service-worker.js",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\serviceworkers\\my-service-worker.js",
"${ProjectPath}\\blazorwasm\\wwwroot\\js\\LinkedScript.js"
]
]
Loading