Skip to content

Commit

Permalink
Merge pull request #27307 from dotnet/darc-release/7.0.1xx-rc1-466f93…
Browse files Browse the repository at this point in the history 
…d7-9a64-49c6-84b3-2dbc8bcfb08b

[release/7.0.1xx-rc1] Update dependencies from dotnet/runtime
  • Loading branch information
@dsplaisted
dsplaisted committed Aug 22, 2022
2 parents 5d20158 + 2015c96 commit f4c17b4
Show file tree
Hide file tree
Showing 28 changed files with 45 additions and 678 deletions.
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@
<Sha>16f5a8ac118d0829744f80c4044138960847867f</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22418.9">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22418.9">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22418.9">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22418.9">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22418.9">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22418.9">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rc.1.22418.9">
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.1.22418.9">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22418.9">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22416-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -110,30 +110,30 @@
<Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rc.1.22418.9">
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22415.4">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0-rc.1.22418.9">
<Dependency Name="System.CodeDom" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rc.1.22418.9">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22418.9">
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="7.0.0-rc.1.22418.9">
<Dependency Name="System.Resources.Extensions" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-rc.1.22419.4">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -279,9 +279,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-rc.1.22418.9">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-rc.1.22421.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>08fdcb7e2d86292b529e7d662b691d8c86de678d</Sha>
<Sha>37ddbefcaf0e768218c2d2e782ef810f8bb1dd8b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22409.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,26 @@
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22411.2</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-rc.1.22418.9</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-rc.1.22421.12</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-rc.1.22418.9</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-rc.1.22421.12</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22402.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22418.9</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22418.9</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22418.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22421.12</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22421.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22421.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rc.1.22418.9</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22418.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-rc.1.22418.9</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rc.1.22421.12</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22421.12</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-rc.1.22421.12</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
Expand Down Expand Up @@ -90,10 +90,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>7.0.0-rc.1.22418.9</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-rc.1.22418.9</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-rc.1.22418.9</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-rc.1.22418.9</MicrosoftDotNetILCompilerPackageVersion>
<SystemCodeDomPackageVersion>7.0.0-rc.1.22421.12</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-rc.1.22421.12</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-rc.1.22421.12</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-rc.1.22421.12</MicrosoftDotNetILCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
4 changes: 0 additions & 4 deletions src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,6 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Remove dotnet.js/wasm from runtime pack, in favor of the relinked ones in @(WasmNativeAsset) -->
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
Condition="@(WasmNativeAsset->Count()) > 0 and '%(FileName)' == 'dotnet' and ('%(Extension)' == '.wasm' or '%(Extension)' == '.js')" />

<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
Condition="@(WasmNativeAsset->Count()) > 0 and '%(FileName)' == 'dotnet-crypto-worker' and '%(Extension)' == '.js'" />
</ItemGroup>

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

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

<PropertyGroup>
Expand Down
24 changes: 1 addition & 23 deletions src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,28 +118,6 @@ public override bool Execute()
assetCandidates.Add(newDotNetJs);
continue;
}
else if (candidate.GetMetadata("FileName") == "dotnet-crypto-worker" && candidate.GetMetadata("Extension") == ".js")
{
var itemHash = FileHasher.GetFileHash(candidate.ItemSpec);
var cacheBustedDotNetCryptoWorkerJSFileName = $"dotnet-crypto-worker.{candidate.GetMetadata("NuGetPackageVersion")}.{itemHash}.js";

var originalFileFullPath = Path.GetFullPath(candidate.ItemSpec);
var originalFileDirectory = Path.GetDirectoryName(originalFileFullPath);

var cacheBustedDotNetCryptoWorkerJSFullPath = Path.Combine(originalFileDirectory, cacheBustedDotNetCryptoWorkerJSFileName);

var newDotnetCryptoWorkerJs = new TaskItem(cacheBustedDotNetCryptoWorkerJSFullPath, candidate.CloneCustomMetadata());
newDotnetCryptoWorkerJs.SetMetadata("OriginalItemSpec", candidate.ItemSpec);

var newRelativePath = $"_framework/{cacheBustedDotNetCryptoWorkerJSFileName}";
newDotnetCryptoWorkerJs.SetMetadata("RelativePath", newRelativePath);

newDotnetCryptoWorkerJs.SetMetadata("AssetTraitName", "BlazorWebAssemblyResource");
newDotnetCryptoWorkerJs.SetMetadata("AssetTraitValue", "js-module-crypto");

assetCandidates.Add(newDotnetCryptoWorkerJs);
continue;
}
else if (string.IsNullOrEmpty(destinationSubPath))
{
var relativePath = candidate.GetMetadata("FileName") + candidate.GetMetadata("Extension");
Expand Down Expand Up @@ -303,7 +281,7 @@ public static bool ShouldFilterCandidate(
".json" when fromMonoPackage && (fileName == "emcc-props" || fileName == "package") => $"{fileName}{extension} is not used by Blazor",
".ts" when fromMonoPackage && fileName == "dotnet.d" => "dotnet type definition is not used by Blazor",
".ts" when fromMonoPackage && fileName == "dotnet-legacy.d" => "dotnet type definition is not used by Blazor",
".js" when assetType == "native" && fileName != "dotnet" && fileName != "dotnet-crypto-worker" => $"{fileName}{extension} is not used by Blazor",
".js" when assetType == "native" && fileName != "dotnet" => $"{fileName}{extension} is not used by Blazor",
".pdb" when !copySymbols => "copying symbols is disabled",
".symbols" when fromMonoPackage => "extension .symbols is not required.",
_ => null
Expand Down
38 changes: 2 additions & 36 deletions src/BlazorWasmSdk/Tasks/ComputeBlazorPublishAssets.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,8 @@ private List<ITaskItem> ProcessNativeAssets(
var key = kvp.Key;
var asset = kvp.Value;
var isDotNetJs = IsDotNetJs(key);
var isDotNetCryptoJs = IsDotNetCryptoJs(key);
var isDotNetWasm = IsDotNetWasm(key);
if (!isDotNetJs && !isDotNetWasm && !isDotNetCryptoJs)
if (!isDotNetJs && !isDotNetWasm)
{
if (resolvedNativeAssetToPublish.TryGetValue(Path.GetFileName(asset.GetMetadata("OriginalItemSpec")), out var existing))
{
Expand Down Expand Up @@ -216,34 +215,6 @@ private List<ITaskItem> ProcessNativeAssets(
continue;
}

if (isDotNetCryptoJs)
{
var aotDotNetCryptoJs = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == "dotnet-crypto-worker.js");
ITaskItem newDotNetCryptoJs = null;
if (aotDotNetCryptoJs != null)
{
newDotNetCryptoJs = new TaskItem(Path.GetFullPath(aotDotNetCryptoJs.ItemSpec), asset.CloneCustomMetadata());
newDotNetCryptoJs.SetMetadata("OriginalItemSpec", aotDotNetCryptoJs.ItemSpec);
newDotNetCryptoJs.SetMetadata("RelativePath", $"_framework/{$"dotnet-crypto-worker.{DotNetJsVersion}.{FileHasher.GetFileHash(aotDotNetCryptoJs.ItemSpec)}.js"}");

updateMap.Add(asset.ItemSpec, newDotNetCryptoJs);
Log.LogMessage(MessageImportance.Low, "Replacing asset '{0}' with AoT version '{1}'", asset.ItemSpec, newDotNetCryptoJs.ItemSpec);
}
else
{
newDotNetCryptoJs = new TaskItem(asset);
Log.LogMessage(MessageImportance.Low, "Promoting asset '{0}' to Publish asset.", asset.ItemSpec);
}

ApplyPublishProperties(newDotNetCryptoJs);
nativeStaticWebAssets.Add(newDotNetCryptoJs);
if (resolvedNativeAssetToPublish.TryGetValue("dotnet-crypto-worker.js", out var resolved))
{
filesToRemove.Add(resolved);
}
continue;
}

if (isDotNetWasm)
{
var aotDotNetWasm = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == "dotnet.wasm");
Expand Down Expand Up @@ -285,11 +256,6 @@ static bool IsDotNetJs(string key)
return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && fileName.EndsWith(".js", StringComparison.Ordinal) && !fileName.Contains("worker");
}

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

Expand Down Expand Up @@ -638,7 +604,7 @@ private void GroupResolvedFilesToPublish(
}
}

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

private static bool IsRuntimeAsset(string traitValue) => string.Equals(traitValue, "runtime", StringComparison.Ordinal);
private static bool IsSymbolAsset(string traitValue) => string.Equals(traitValue, "symbol", StringComparison.Ordinal);
Expand Down
5 changes: 0 additions & 5 deletions src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,6 @@ public void WriteBootJson(Stream output, string entryAssemblyName)
AddResourceToList(resource, resourceList, targetPath);
continue;
}
else if(string.Equals(assetTraitName, "BlazorWebAssemblyResource", StringComparison.OrdinalIgnoreCase) &&
string.Equals(assetTraitValue, "js-module-crypto", StringComparison.OrdinalIgnoreCase))
{
behavior = assetTraitValue;
}
else if (string.Equals("BlazorWebAssemblyResource", assetTraitName, StringComparison.OrdinalIgnoreCase) &&
assetTraitValue.StartsWith("extension:", StringComparison.OrdinalIgnoreCase))
{
Expand Down
Loading

0 comments on commit f4c17b4

Please sign in to comment.