Skip to content

Commit 88ee279

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge pull request #27149 from dotnet/darc-main-b89ef279-c278-4e48-9a05-29840bb46c47
[main] Update dependencies from dotnet/runtime
2 parents 5b79145 + 8cd88bb commit 88ee279

File tree

30 files changed

+1227
-689
lines changed

30 files changed

+1227
-689
lines changed

‎eng/Version.Details.xml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,41 @@
66
<Sha>f6fbedbfd0a92b965b31675e55a38adbf159f162</Sha>
77
<SourceBuild RepoName="templating" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22411.12">
9+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22422.24">
1010
<Uri>https://github.com/dotnet/runtime</Uri>
11-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
11+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
1212
</Dependency>
13-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22411.12">
13+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22422.24">
1414
<Uri>https://github.com/dotnet/runtime</Uri>
15-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
15+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
1616
</Dependency>
17-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22411.12">
17+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22422.24">
1818
<Uri>https://github.com/dotnet/runtime</Uri>
19-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
19+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22411.12">
21+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22422.24">
2222
<Uri>https://github.com/dotnet/runtime</Uri>
23-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
23+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22411.12">
25+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22422.24">
2626
<Uri>https://github.com/dotnet/runtime</Uri>
27-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
27+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22411.12">
29+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22422.24">
3030
<Uri>https://github.com/dotnet/runtime</Uri>
31-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
31+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rc.1.22411.12">
33+
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22422.24">
3434
<Uri>https://github.com/dotnet/runtime</Uri>
35-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
35+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.1.22411.12">
37+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22422.24">
3838
<Uri>https://github.com/dotnet/runtime</Uri>
39-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
39+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22411.12">
41+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22422.24">
4242
<Uri>https://github.com/dotnet/runtime</Uri>
43-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
43+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22416-02">
4646
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -110,44 +110,44 @@
110110
<Sha>86951339aa858607be7aa8df2edfbefda862742d</Sha>
111111
<SourceBuild RepoName="linker" ManagedOnly="true" />
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rc.1.22411.12">
113+
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22422.24">
114114
<Uri>https://github.com/dotnet/runtime</Uri>
115-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
115+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
116116
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
117117
</Dependency>
118118
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22423.2">
119119
<Uri>https://github.com/dotnet/linker</Uri>
120120
<Sha>86951339aa858607be7aa8df2edfbefda862742d</Sha>
121121
</Dependency>
122-
<Dependency Name="System.CodeDom" Version="7.0.0-rc.1.22411.12">
122+
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22422.24">
123123
<Uri>https://github.com/dotnet/runtime</Uri>
124-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
124+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
125125
</Dependency>
126-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rc.1.22411.12">
126+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22422.24">
127127
<Uri>https://github.com/dotnet/runtime</Uri>
128-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
128+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
129129
</Dependency>
130-
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22411.12">
130+
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22422.24">
131131
<Uri>https://github.com/dotnet/runtime</Uri>
132-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
132+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
133133
</Dependency>
134-
<Dependency Name="System.Resources.Extensions" Version="7.0.0-rc.1.22411.12">
134+
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22422.24">
135135
<Uri>https://github.com/dotnet/runtime</Uri>
136-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
136+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22416.7">
139139
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
140140
<Sha>d84ac6d64ab97febc153dfa903b52a828f47f44d</Sha>
141141
</Dependency>
142-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22415.6">
142+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22416.7">
143143
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
144144
<Sha>1ce737df56e7c14e2ba7adb308d9c045d6d67a8c</Sha>
145145
</Dependency>
146146
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22416.7">
147147
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
148148
<Sha>d84ac6d64ab97febc153dfa903b52a828f47f44d</Sha>
149149
</Dependency>
150-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22415.6">
150+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22416.7">
151151
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
152152
<Sha>1ce737df56e7c14e2ba7adb308d9c045d6d67a8c</Sha>
153153
</Dependency>
@@ -167,7 +167,7 @@
167167
<Uri>https://github.com/dotnet/aspnetcore</Uri>
168168
<Sha>64ecf4b7013a07d2132845941cb4dcb999e10ebf</Sha>
169169
</Dependency>
170-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22416.5">
170+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22417.14">
171171
<Uri>https://github.com/dotnet/aspnetcore</Uri>
172172
<Sha>77ea9ee147f495dd05a1d50906e3d455a5f4f2a0</Sha>
173173
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
@@ -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.22411.12">
282+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22422.24">
283283
<Uri>https://github.com/dotnet/runtime</Uri>
284-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
284+
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</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.22411.12</SystemSecurityCryptographyProtectedDataPackageVersion>
38+
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22422.24</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.22411.12</SystemReflectionMetadataLoadContextVersion>
43+
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22422.24</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.22411.12</MicrosoftNETCoreAppRefPackageVersion>
52-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22411.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
53-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22411.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
51+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftNETCoreAppRefPackageVersion>
52+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22422.24</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
53+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22422.24</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
5454
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
55-
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rc.1.22411.12</MicrosoftExtensionsDependencyModelPackageVersion>
56-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22411.12</MicrosoftNETCoreDotNetHostResolverPackageVersion>
57-
<MicrosoftNETHostModelVersion>7.0.0-rc.1.22411.12</MicrosoftNETHostModelVersion>
55+
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftExtensionsDependencyModelPackageVersion>
56+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftNETCoreDotNetHostResolverPackageVersion>
57+
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22422.24</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.22411.12</SystemCodeDomPackageVersion>
94-
<SystemTextEncodingCodePagesPackageVersion>7.0.0-rc.1.22411.12</SystemTextEncodingCodePagesPackageVersion>
95-
<SystemResourcesExtensionsPackageVersion>7.0.0-rc.1.22411.12</SystemResourcesExtensionsPackageVersion>
96-
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-rc.1.22411.12</MicrosoftDotNetILCompilerPackageVersion>
93+
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22422.24</SystemCodeDomPackageVersion>
94+
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22422.24</SystemTextEncodingCodePagesPackageVersion>
95+
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22422.24</SystemResourcesExtensionsPackageVersion>
96+
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftDotNetILCompilerPackageVersion>
9797
</PropertyGroup>
9898
<PropertyGroup>
9999
<!-- Dependencies from https://github.com/dotnet/format -->

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "7.0.100-preview.5.22307.18",
44
"runtimes": {
55
"dotnet": [
6-
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
6+
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
77
]
88
},
99
"vs-opt": {

‎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

0 commit comments

Comments
 (0)