Merge pull request #27149 from dotnet/darc-main-b89ef279-c278-4e48-9a…

…05-29840bb46c47

[main] Update dependencies from dotnet/runtime

eng/Version.Details.xml

@@ -6,41 +6,41 @@
  <Sha>f6fbedbfd0a92b965b31675e55a38adbf159f162</Sha>
  <SourceBuild RepoName="templating" ManagedOnly="true" />
  </Dependency>
- <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
  <Dependency Name="Microsoft.Build" Version="17.4.0-preview-22416-02">
  <Uri>https://github.com/dotnet/msbuild</Uri>
@@ -110,44 +110,44 @@
  <Sha>86951339aa858607be7aa8df2edfbefda862742d</Sha>
  <SourceBuild RepoName="linker" ManagedOnly="true" />
  </Dependency>
- <Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  <SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
  </Dependency>
  <Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22423.2">
  <Uri>https://github.com/dotnet/linker</Uri>
  <Sha>86951339aa858607be7aa8df2edfbefda862742d</Sha>
  </Dependency>
- <Dependency Name="System.CodeDom" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
- <Dependency Name="System.Resources.Extensions" Version="7.0.0-rc.1.22411.12">
+ <Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
  </Dependency>
  <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22416.7">
  <Uri>https://github.com/dotnet/windowsdesktop</Uri>
  <Sha>d84ac6d64ab97febc153dfa903b52a828f47f44d</Sha>
  </Dependency>
- <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22415.6">
+ <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22416.7">
  <Uri>https://github.com/dotnet/windowsdesktop</Uri>
  <Sha>1ce737df56e7c14e2ba7adb308d9c045d6d67a8c</Sha>
  </Dependency>
  <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22416.7">
  <Uri>https://github.com/dotnet/windowsdesktop</Uri>
  <Sha>d84ac6d64ab97febc153dfa903b52a828f47f44d</Sha>
  </Dependency>
- <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22415.6">
+ <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22416.7">
  <Uri>https://github.com/dotnet/windowsdesktop</Uri>
  <Sha>1ce737df56e7c14e2ba7adb308d9c045d6d67a8c</Sha>
  </Dependency>
@@ -167,7 +167,7 @@
  <Uri>https://github.com/dotnet/aspnetcore</Uri>
  <Sha>64ecf4b7013a07d2132845941cb4dcb999e10ebf</Sha>
  </Dependency>
- <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22416.5">
+ <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22417.14">
  <Uri>https://github.com/dotnet/aspnetcore</Uri>
  <Sha>77ea9ee147f495dd05a1d50906e3d455a5f4f2a0</Sha>
  <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
@@ -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.22411.12">
+ <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22422.24">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
+ <Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</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>

eng/Versions.props

@@ -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.22411.12</SystemSecurityCryptographyProtectedDataPackageVersion>
+ <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22422.24</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.22411.12</SystemReflectionMetadataLoadContextVersion>
+ <SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22422.24</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.22411.12</MicrosoftNETCoreAppRefPackageVersion>
- <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22411.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
- <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22411.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+ <MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftNETCoreAppRefPackageVersion>
+ <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22422.24</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
+ <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22422.24</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
  <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
- <MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rc.1.22411.12</MicrosoftExtensionsDependencyModelPackageVersion>
- <MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22411.12</MicrosoftNETCoreDotNetHostResolverPackageVersion>
- <MicrosoftNETHostModelVersion>7.0.0-rc.1.22411.12</MicrosoftNETHostModelVersion>
+ <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftExtensionsDependencyModelPackageVersion>
+ <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+ <MicrosoftNETHostModelVersion>8.0.0-alpha.1.22422.24</MicrosoftNETHostModelVersion>
  <MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
  <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
  <MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
@@ -90,10 +90,10 @@
  </PropertyGroup>
  <PropertyGroup>
  <!-- Dependencies from https://github.com/dotnet/runtime -->
- <SystemCodeDomPackageVersion>7.0.0-rc.1.22411.12</SystemCodeDomPackageVersion>
- <SystemTextEncodingCodePagesPackageVersion>7.0.0-rc.1.22411.12</SystemTextEncodingCodePagesPackageVersion>
- <SystemResourcesExtensionsPackageVersion>7.0.0-rc.1.22411.12</SystemResourcesExtensionsPackageVersion>
- <MicrosoftDotNetILCompilerPackageVersion>7.0.0-rc.1.22411.12</MicrosoftDotNetILCompilerPackageVersion>
+ <SystemCodeDomPackageVersion>8.0.0-alpha.1.22422.24</SystemCodeDomPackageVersion>
+ <SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22422.24</SystemTextEncodingCodePagesPackageVersion>
+ <SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22422.24</SystemResourcesExtensionsPackageVersion>
+ <MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftDotNetILCompilerPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
  <!-- Dependencies from https://github.com/dotnet/format -->

global.json

@@ -3,7 +3,7 @@
  "dotnet": "7.0.100-preview.5.22307.18",
  "runtimes": {
  "dotnet": [
- "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
+ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
  ]
  },
  "vs-opt": {

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

@@ -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
@@ -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>

src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs

@@ -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");
@@ -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