Skip to content

Commit f4c17b4

Browse files
dsplaisteddsplaisted
authored
Merge pull request #27307 from dotnet/darc-release/7.0.1xx-rc1-466f93d7-9a64-49c6-84b3-2dbc8bcfb08b
[release/7.0.1xx-rc1] Update dependencies from dotnet/runtime
2 parents 5d20158 + 2015c96 commit f4c17b4

File tree

28 files changed

+45
-678
lines changed

28 files changed

+45
-678
lines changed

‎eng/Version.Details.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,41 @@
66
<Sha>16f5a8ac118d0829744f80c4044138960847867f</Sha>
77
<SourceBuild RepoName="templating" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22418.9">
9+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22421.12">
1010
<Uri>https://github.com/dotnet/runtime</Uri>
11-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
11+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
1212
</Dependency>
13-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22418.9">
13+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22421.12">
1414
<Uri>https://github.com/dotnet/runtime</Uri>
15-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
15+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
1616
</Dependency>
17-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22418.9">
17+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22421.12">
1818
<Uri>https://github.com/dotnet/runtime</Uri>
19-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
19+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22418.9">
21+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22421.12">
2222
<Uri>https://github.com/dotnet/runtime</Uri>
23-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
23+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22418.9">
25+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22421.12">
2626
<Uri>https://github.com/dotnet/runtime</Uri>
27-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
27+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22418.9">
29+
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22421.12">
3030
<Uri>https://github.com/dotnet/runtime</Uri>
31-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
31+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rc.1.22418.9">
33+
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rc.1.22421.12">
3434
<Uri>https://github.com/dotnet/runtime</Uri>
35-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
35+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.1.22418.9">
37+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.1.22421.12">
3838
<Uri>https://github.com/dotnet/runtime</Uri>
39-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
39+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22418.9">
41+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22421.12">
4242
<Uri>https://github.com/dotnet/runtime</Uri>
43-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
43+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22416-02">
4646
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -110,30 +110,30 @@
110110
<Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
111111
<SourceBuild RepoName="linker" ManagedOnly="true" />
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rc.1.22418.9">
113+
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rc.1.22421.12">
114114
<Uri>https://github.com/dotnet/runtime</Uri>
115-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
115+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
116116
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
117117
</Dependency>
118118
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22415.4">
119119
<Uri>https://github.com/dotnet/linker</Uri>
120120
<Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
121121
</Dependency>
122-
<Dependency Name="System.CodeDom" Version="7.0.0-rc.1.22418.9">
122+
<Dependency Name="System.CodeDom" Version="7.0.0-rc.1.22421.12">
123123
<Uri>https://github.com/dotnet/runtime</Uri>
124-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
124+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
125125
</Dependency>
126-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rc.1.22418.9">
126+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rc.1.22421.12">
127127
<Uri>https://github.com/dotnet/runtime</Uri>
128-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
128+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
129129
</Dependency>
130-
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22418.9">
130+
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22421.12">
131131
<Uri>https://github.com/dotnet/runtime</Uri>
132-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
132+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
133133
</Dependency>
134-
<Dependency Name="System.Resources.Extensions" Version="7.0.0-rc.1.22418.9">
134+
<Dependency Name="System.Resources.Extensions" Version="7.0.0-rc.1.22421.12">
135135
<Uri>https://github.com/dotnet/runtime</Uri>
136-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
136+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-rc.1.22419.4">
139139
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -279,9 +279,9 @@
279279
<Uri>https://github.com/dotnet/arcade</Uri>
280280
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
281281
</Dependency>
282-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-rc.1.22418.9">
282+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-rc.1.22421.12">
283283
<Uri>https://github.com/dotnet/runtime</Uri>
284-
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
284+
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
285285
</Dependency>
286286
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22409.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
287287
<Uri>https://github.com/dotnet/xliff-tasks</Uri>

‎eng/Versions.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@
3535
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
3636
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22411.2</MicrosoftDotNetSignToolVersion>
3737
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
38-
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-rc.1.22418.9</SystemSecurityCryptographyProtectedDataPackageVersion>
38+
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-rc.1.22421.12</SystemSecurityCryptographyProtectedDataPackageVersion>
3939
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
4040
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
4141
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
4242
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
43-
<SystemReflectionMetadataLoadContextVersion>7.0.0-rc.1.22418.9</SystemReflectionMetadataLoadContextVersion>
43+
<SystemReflectionMetadataLoadContextVersion>7.0.0-rc.1.22421.12</SystemReflectionMetadataLoadContextVersion>
4444
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
4545
<SystemCommandLineVersion>2.0.0-beta4.22402.1</SystemCommandLineVersion>
4646
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
4747
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
4848
</PropertyGroup>
4949
<PropertyGroup>
5050
<!-- Dependencies from https://github.com/dotnet/runtime -->
51-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22418.9</MicrosoftNETCoreAppRefPackageVersion>
52-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22418.9</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
53-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22418.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
51+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22421.12</MicrosoftNETCoreAppRefPackageVersion>
52+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22421.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
53+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22421.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
5454
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
55-
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rc.1.22418.9</MicrosoftExtensionsDependencyModelPackageVersion>
56-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22418.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
57-
<MicrosoftNETHostModelVersion>7.0.0-rc.1.22418.9</MicrosoftNETHostModelVersion>
55+
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rc.1.22421.12</MicrosoftExtensionsDependencyModelPackageVersion>
56+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22421.12</MicrosoftNETCoreDotNetHostResolverPackageVersion>
57+
<MicrosoftNETHostModelVersion>7.0.0-rc.1.22421.12</MicrosoftNETHostModelVersion>
5858
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
5959
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
6060
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
@@ -90,10 +90,10 @@
9090
</PropertyGroup>
9191
<PropertyGroup>
9292
<!-- Dependencies from https://github.com/dotnet/runtime -->
93-
<SystemCodeDomPackageVersion>7.0.0-rc.1.22418.9</SystemCodeDomPackageVersion>
94-
<SystemTextEncodingCodePagesPackageVersion>7.0.0-rc.1.22418.9</SystemTextEncodingCodePagesPackageVersion>
95-
<SystemResourcesExtensionsPackageVersion>7.0.0-rc.1.22418.9</SystemResourcesExtensionsPackageVersion>
96-
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-rc.1.22418.9</MicrosoftDotNetILCompilerPackageVersion>
93+
<SystemCodeDomPackageVersion>7.0.0-rc.1.22421.12</SystemCodeDomPackageVersion>
94+
<SystemTextEncodingCodePagesPackageVersion>7.0.0-rc.1.22421.12</SystemTextEncodingCodePagesPackageVersion>
95+
<SystemResourcesExtensionsPackageVersion>7.0.0-rc.1.22421.12</SystemResourcesExtensionsPackageVersion>
96+
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-rc.1.22421.12</MicrosoftDotNetILCompilerPackageVersion>
9797
</PropertyGroup>
9898
<PropertyGroup>
9999
<!-- Dependencies from https://github.com/dotnet/format -->

‎src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ Copyright (c) .NET Foundation. All rights reserved.
157157
<!-- Remove dotnet.js/wasm from runtime pack, in favor of the relinked ones in @(WasmNativeAsset) -->
158158
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
159159
Condition="@(WasmNativeAsset->Count()) > 0 and '%(FileName)' == 'dotnet' and ('%(Extension)' == '.wasm' or '%(Extension)' == '.js')" />
160-
161-
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
162-
Condition="@(WasmNativeAsset->Count()) > 0 and '%(FileName)' == 'dotnet-crypto-worker' and '%(Extension)' == '.js'" />
163160
</ItemGroup>
164161

165162
<ComputeBlazorBuildAssets
@@ -406,7 +403,6 @@ Copyright (c) .NET Foundation. All rights reserved.
406403

407404
<ItemGroup>
408405
<_DotNetJsItem Include="@(ResolvedFileToPublish)" Condition="'%(ResolvedFileToPublish.DestinationSubPath)' == 'dotnet.js' AND '%(ResolvedFileToPublish.AssetType)' == 'native'" />
409-
<_DotNetJsItem Include="@(ResolvedFileToPublish)" Condition="'%(ResolvedFileToPublish.DestinationSubPath)' == 'dotnet-crypto-worker.js' AND '%(ResolvedFileToPublish.AssetType)' == 'native'" />
410406
</ItemGroup>
411407

412408
<PropertyGroup>

‎src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -118,28 +118,6 @@ public override bool Execute()
118118
assetCandidates.Add(newDotNetJs);
119119
continue;
120120
}
121-
else if (candidate.GetMetadata("FileName") == "dotnet-crypto-worker" && candidate.GetMetadata("Extension") == ".js")
122-
{
123-
var itemHash = FileHasher.GetFileHash(candidate.ItemSpec);
124-
var cacheBustedDotNetCryptoWorkerJSFileName = $"dotnet-crypto-worker.{candidate.GetMetadata("NuGetPackageVersion")}.{itemHash}.js";
125-
126-
var originalFileFullPath = Path.GetFullPath(candidate.ItemSpec);
127-
var originalFileDirectory = Path.GetDirectoryName(originalFileFullPath);
128-
129-
var cacheBustedDotNetCryptoWorkerJSFullPath = Path.Combine(originalFileDirectory, cacheBustedDotNetCryptoWorkerJSFileName);
130-
131-
var newDotnetCryptoWorkerJs = new TaskItem(cacheBustedDotNetCryptoWorkerJSFullPath, candidate.CloneCustomMetadata());
132-
newDotnetCryptoWorkerJs.SetMetadata("OriginalItemSpec", candidate.ItemSpec);
133-
134-
var newRelativePath = $"_framework/{cacheBustedDotNetCryptoWorkerJSFileName}";
135-
newDotnetCryptoWorkerJs.SetMetadata("RelativePath", newRelativePath);
136-
137-
newDotnetCryptoWorkerJs.SetMetadata("AssetTraitName", "BlazorWebAssemblyResource");
138-
newDotnetCryptoWorkerJs.SetMetadata("AssetTraitValue", "js-module-crypto");
139-
140-
assetCandidates.Add(newDotnetCryptoWorkerJs);
141-
continue;
142-
}
143121
else if (string.IsNullOrEmpty(destinationSubPath))
144122
{
145123
var relativePath = candidate.GetMetadata("FileName") + candidate.GetMetadata("Extension");
@@ -303,7 +281,7 @@ public static bool ShouldFilterCandidate(
303281
".json" when fromMonoPackage && (fileName == "emcc-props" || fileName == "package") => $"{fileName}{extension} is not used by Blazor",
304282
".ts" when fromMonoPackage && fileName == "dotnet.d" => "dotnet type definition is not used by Blazor",
305283
".ts" when fromMonoPackage && fileName == "dotnet-legacy.d" => "dotnet type definition is not used by Blazor",
306-
".js" when assetType == "native" && fileName != "dotnet" && fileName != "dotnet-crypto-worker" => $"{fileName}{extension} is not used by Blazor",
284+
".js" when assetType == "native" && fileName != "dotnet" => $"{fileName}{extension} is not used by Blazor",
307285
".pdb" when !copySymbols => "copying symbols is disabled",
308286
".symbols" when fromMonoPackage => "extension .symbols is not required.",
309287
_ => null

‎src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,8 @@ private List<ITaskItem> ProcessNativeAssets(
157157
var key = kvp.Key;
158158
var asset = kvp.Value;
159159
var isDotNetJs = IsDotNetJs(key);
160-
var isDotNetCryptoJs = IsDotNetCryptoJs(key);
161160
var isDotNetWasm = IsDotNetWasm(key);
162-
if (!isDotNetJs && !isDotNetWasm && !isDotNetCryptoJs)
161+
if (!isDotNetJs && !isDotNetWasm)
163162
{
164163
if (resolvedNativeAssetToPublish.TryGetValue(Path.GetFileName(asset.GetMetadata("OriginalItemSpec")), out var existing))
165164
{
@@ -216,34 +215,6 @@ private List<ITaskItem> ProcessNativeAssets(
216215
continue;
217216
}
218217

219-
if (isDotNetCryptoJs)
220-
{
221-
var aotDotNetCryptoJs = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == "dotnet-crypto-worker.js");
222-
ITaskItem newDotNetCryptoJs = null;
223-
if (aotDotNetCryptoJs != null)
224-
{
225-
newDotNetCryptoJs = new TaskItem(Path.GetFullPath(aotDotNetCryptoJs.ItemSpec), asset.CloneCustomMetadata());
226-
newDotNetCryptoJs.SetMetadata("OriginalItemSpec", aotDotNetCryptoJs.ItemSpec);
227-
newDotNetCryptoJs.SetMetadata("RelativePath", $"_framework/{$"dotnet-crypto-worker.{DotNetJsVersion}.{FileHasher.GetFileHash(aotDotNetCryptoJs.ItemSpec)}.js"}");
228-
229-
updateMap.Add(asset.ItemSpec, newDotNetCryptoJs);
230-
Log.LogMessage(MessageImportance.Low, "Replacing asset '{0}' with AoT version '{1}'", asset.ItemSpec, newDotNetCryptoJs.ItemSpec);
231-
}
232-
else
233-
{
234-
newDotNetCryptoJs = new TaskItem(asset);
235-
Log.LogMessage(MessageImportance.Low, "Promoting asset '{0}' to Publish asset.", asset.ItemSpec);
236-
}
237-
238-
ApplyPublishProperties(newDotNetCryptoJs);
239-
nativeStaticWebAssets.Add(newDotNetCryptoJs);
240-
if (resolvedNativeAssetToPublish.TryGetValue("dotnet-crypto-worker.js", out var resolved))
241-
{
242-
filesToRemove.Add(resolved);
243-
}
244-
continue;
245-
}
246-
247218
if (isDotNetWasm)
248219
{
249220
var aotDotNetWasm = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == "dotnet.wasm");
@@ -285,11 +256,6 @@ static bool IsDotNetJs(string key)
285256
return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && fileName.EndsWith(".js", StringComparison.Ordinal) && !fileName.Contains("worker");
286257
}
287258

288-
static bool IsDotNetCryptoJs(string key)
289-
{
290-
var fileName = Path.GetFileName(key);
291-
return fileName.StartsWith("dotnet-crypto-worker.", StringComparison.Ordinal) && fileName.EndsWith(".js", StringComparison.Ordinal);
292-
}
293259
static bool IsDotNetWasm(string key) => string.Equals("dotnet.wasm", Path.GetFileName(key), StringComparison.Ordinal);
294260
}
295261

@@ -638,7 +604,7 @@ private void GroupResolvedFilesToPublish(
638604
}
639605
}
640606

641-
private static bool IsNativeAsset(string traitValue) => string.Equals(traitValue, "native", StringComparison.Ordinal) || string.Equals(traitValue, "js-module-crypto", StringComparison.Ordinal);
607+
private static bool IsNativeAsset(string traitValue) => string.Equals(traitValue, "native", StringComparison.Ordinal);
642608

643609
private static bool IsRuntimeAsset(string traitValue) => string.Equals(traitValue, "runtime", StringComparison.Ordinal);
644610
private static bool IsSymbolAsset(string traitValue) => string.Equals(traitValue, "symbol", StringComparison.Ordinal);

‎src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,6 @@ public void WriteBootJson(Stream output, string entryAssemblyName)
171171
AddResourceToList(resource, resourceList, targetPath);
172172
continue;
173173
}
174-
else if(string.Equals(assetTraitName, "BlazorWebAssemblyResource", StringComparison.OrdinalIgnoreCase) &&
175-
string.Equals(assetTraitValue, "js-module-crypto", StringComparison.OrdinalIgnoreCase))
176-
{
177-
behavior = assetTraitValue;
178-
}
179174
else if (string.Equals("BlazorWebAssemblyResource", assetTraitName, StringComparison.OrdinalIgnoreCase) &&
180175
assetTraitValue.StartsWith("extension:", StringComparison.OrdinalIgnoreCase))
181176
{

0 commit comments

Comments
 (0)