Skip to content

Commit 1b87a11

Browse files
[main] Update dependencies from dotnet/runtime (dotnet#42262)
[main] Update dependencies from dotnet/runtime - Coherency Updates: - Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-preview.7.24365.1 to 9.0.0-rc.1.24373.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.SourceBuild.Intermediate.emsdk: from 9.0.0-preview.7.24365.1 to 9.0.0-rc.1.24373.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Merge branch 'main' into darc-main-f291a482-3bda-49b6-8005-dd1ec1224b1b - Merge branch 'main' into darc-main-f291a482-3bda-49b6-8005-dd1ec1224b1b - Merge branch 'main' into darc-main-f291a482-3bda-49b6-8005-dd1ec1224b1b - Merge branch 'main' into darc-main-f291a482-3bda-49b6-8005-dd1ec1224b1b - Disable fingerprinting for wasm assets and skip failing tests - Disable fingerprinting for AoT tests - Additional fix - Merge branch 'main' into darc-main-f291a482-3bda-49b6-8005-dd1ec1224b1b - Update aspnetcore dependencies - Merge branch 'main' into darc-main-f291a482-3bda-49b6-8005-dd1ec1224b1b
1 parent 74dafbf commit 1b87a11

16 files changed

+704
-241
lines changed

eng/Version.Details.xml

Lines changed: 110 additions & 110 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -121,43 +121,43 @@
121121
</PropertyGroup>
122122
<PropertyGroup>
123123
<!-- Dependencies from https://github.com/dotnet/runtime -->
124-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCoreAppRefPackageVersion>
125-
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24366.18</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
126-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
127-
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsDependencyModelPackageVersion>
128-
<MicrosoftNETHostModelVersion>9.0.0-preview.7.24366.18</MicrosoftNETHostModelVersion>
129-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
130-
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsLoggingAbstractionsVersion>
131-
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsLoggingConsoleVersion>
132-
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsLoggingVersion>
133-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETILLinkTasksPackageVersion>
134-
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.7.24366.18</SystemServiceProcessServiceControllerVersion>
124+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETCoreAppRefPackageVersion>
125+
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-rc.1.24376.16</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
126+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
127+
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsDependencyModelPackageVersion>
128+
<MicrosoftNETHostModelVersion>9.0.0-rc.1.24376.16</MicrosoftNETHostModelVersion>
129+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
130+
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsLoggingAbstractionsVersion>
131+
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsLoggingConsoleVersion>
132+
<MicrosoftExtensionsLoggingVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsLoggingVersion>
133+
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETILLinkTasksPackageVersion>
134+
<SystemServiceProcessServiceControllerVersion>9.0.0-rc.1.24376.16</SystemServiceProcessServiceControllerVersion>
135135
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
136-
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCorePlatformsPackageVersion>
137-
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.7.24366.18</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
138-
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCoreAppHostwinx64PackageVersion>
139-
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0-preview.7.24366.18</MicrosoftBclAsyncInterfacesPackageVersion>
140-
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
141-
<MicrosoftWin32SystemEventsPackageVersion>9.0.0-preview.7.24366.18</MicrosoftWin32SystemEventsPackageVersion>
136+
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETCorePlatformsPackageVersion>
137+
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-rc.1.24376.16</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
138+
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETCoreAppHostwinx64PackageVersion>
139+
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0-rc.1.24376.16</MicrosoftBclAsyncInterfacesPackageVersion>
140+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
141+
<MicrosoftWin32SystemEventsPackageVersion>9.0.0-rc.1.24376.16</MicrosoftWin32SystemEventsPackageVersion>
142142
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
143-
<SystemCodeDomPackageVersion>9.0.0-preview.7.24366.18</SystemCodeDomPackageVersion>
143+
<SystemCodeDomPackageVersion>9.0.0-rc.1.24376.16</SystemCodeDomPackageVersion>
144144
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
145-
<SystemCompositionAttributedModelPackageVersion>9.0.0-preview.7.24366.18</SystemCompositionAttributedModelPackageVersion>
146-
<SystemCompositionConventionPackageVersion>9.0.0-preview.7.24366.18</SystemCompositionConventionPackageVersion>
147-
<SystemCompositionHostingPackageVersion>9.0.0-preview.7.24366.18</SystemCompositionHostingPackageVersion>
148-
<SystemCompositionRuntimePackageVersion>9.0.0-preview.7.24366.18</SystemCompositionRuntimePackageVersion>
149-
<SystemCompositionTypedPartsPackageVersion>9.0.0-preview.7.24366.18</SystemCompositionTypedPartsPackageVersion>
150-
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-preview.7.24366.18</SystemConfigurationConfigurationManagerPackageVersion>
151-
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.7.24366.18</SystemReflectionMetadataLoadContextVersion>
145+
<SystemCompositionAttributedModelPackageVersion>9.0.0-rc.1.24376.16</SystemCompositionAttributedModelPackageVersion>
146+
<SystemCompositionConventionPackageVersion>9.0.0-rc.1.24376.16</SystemCompositionConventionPackageVersion>
147+
<SystemCompositionHostingPackageVersion>9.0.0-rc.1.24376.16</SystemCompositionHostingPackageVersion>
148+
<SystemCompositionRuntimePackageVersion>9.0.0-rc.1.24376.16</SystemCompositionRuntimePackageVersion>
149+
<SystemCompositionTypedPartsPackageVersion>9.0.0-rc.1.24376.16</SystemCompositionTypedPartsPackageVersion>
150+
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-rc.1.24376.16</SystemConfigurationConfigurationManagerPackageVersion>
151+
<SystemReflectionMetadataLoadContextVersion>9.0.0-rc.1.24376.16</SystemReflectionMetadataLoadContextVersion>
152152
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
153-
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.7.24366.18</SystemResourcesExtensionsPackageVersion>
154-
<SystemSecurityCryptographyPkcsPackageVersion>9.0.0-preview.7.24366.18</SystemSecurityCryptographyPkcsPackageVersion>
155-
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.7.24366.18</SystemSecurityCryptographyProtectedDataPackageVersion>
156-
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-preview.7.24366.18</SystemSecurityCryptographyXmlPackageVersion>
157-
<SystemSecurityPermissionsPackageVersion>9.0.0-preview.7.24366.18</SystemSecurityPermissionsPackageVersion>
158-
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.7.24366.18</SystemTextEncodingCodePagesPackageVersion>
159-
<SystemTextJsonPackageVersion>9.0.0-preview.7.24366.18</SystemTextJsonPackageVersion>
160-
<SystemWindowsExtensionsPackageVersion>9.0.0-preview.7.24366.18</SystemWindowsExtensionsPackageVersion>
153+
<SystemResourcesExtensionsPackageVersion>9.0.0-rc.1.24376.16</SystemResourcesExtensionsPackageVersion>
154+
<SystemSecurityCryptographyPkcsPackageVersion>9.0.0-rc.1.24376.16</SystemSecurityCryptographyPkcsPackageVersion>
155+
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-rc.1.24376.16</SystemSecurityCryptographyProtectedDataPackageVersion>
156+
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-rc.1.24376.16</SystemSecurityCryptographyXmlPackageVersion>
157+
<SystemSecurityPermissionsPackageVersion>9.0.0-rc.1.24376.16</SystemSecurityPermissionsPackageVersion>
158+
<SystemTextEncodingCodePagesPackageVersion>9.0.0-rc.1.24376.16</SystemTextEncodingCodePagesPackageVersion>
159+
<SystemTextJsonPackageVersion>9.0.0-rc.1.24376.16</SystemTextJsonPackageVersion>
160+
<SystemWindowsExtensionsPackageVersion>9.0.0-rc.1.24376.16</SystemWindowsExtensionsPackageVersion>
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
@@ -241,19 +241,19 @@
241241
</PropertyGroup>
242242
<PropertyGroup>
243243
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
244-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreAppRefPackageVersion>
245-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
246-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
247-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
248-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
249-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreAnalyzersPackageVersion>
250-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreTestHostPackageVersion>
251-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
252-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreAppRefInternalPackageVersion>
253-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-rc.1.24375.10</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
254-
<dotnetdevcertsPackageVersion>9.0.0-rc.1.24375.10</dotnetdevcertsPackageVersion>
255-
<dotnetuserjwtsPackageVersion>9.0.0-rc.1.24375.10</dotnetuserjwtsPackageVersion>
256-
<dotnetusersecretsPackageVersion>9.0.0-rc.1.24375.10</dotnetusersecretsPackageVersion>
244+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreAppRefPackageVersion>
245+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
246+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
247+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
248+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
249+
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreAnalyzersPackageVersion>
250+
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreTestHostPackageVersion>
251+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
252+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
253+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-rc.1.24376.4</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
254+
<dotnetdevcertsPackageVersion>9.0.0-rc.1.24376.4</dotnetdevcertsPackageVersion>
255+
<dotnetuserjwtsPackageVersion>9.0.0-rc.1.24376.4</dotnetuserjwtsPackageVersion>
256+
<dotnetusersecretsPackageVersion>9.0.0-rc.1.24376.4</dotnetusersecretsPackageVersion>
257257
</PropertyGroup>
258258
<PropertyGroup>
259259
<!-- Dependencies from https://github.com/dotnet/razor -->
@@ -355,7 +355,7 @@
355355
<XamarinMacOSWorkloadManifestVersion>14.2.9714-net9-p6</XamarinMacOSWorkloadManifestVersion>
356356
<XamarinTvOSWorkloadManifestVersion>17.2.9714-net9-p6</XamarinTvOSWorkloadManifestVersion>
357357
<!-- Workloads from dotnet/emsdk -->
358-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.7.24365.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
358+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-rc.1.24373.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
359359
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
360360
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
361361
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>

test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@ public void AoT_Publish_InRelease_Works()
1616
{
1717
// Arrange
1818
var testAppName = "BlazorWasmWithLibrary";
19-
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm" });
19+
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm" })
20+
.WithProjectChanges((p, doc) =>
21+
{
22+
var itemGroup = new XElement("PropertyGroup");
23+
itemGroup.Add(new XElement("WasmFingerprintAssets", false));
24+
doc.Root.Add(itemGroup);
25+
});
26+
2027
File.WriteAllText(Path.Combine(testInstance.TestRoot, "blazorwasm", "App.razor.css"), "h1 { font-size: 16px; }");
2128

2229
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
@@ -52,7 +59,13 @@ public void AoT_Publish_WithExistingWebConfig_Works()
5259
{
5360
// Arrange
5461
var testAppName = "BlazorWasmWithLibrary";
55-
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm" });
62+
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm" })
63+
.WithProjectChanges((p, doc) =>
64+
{
65+
var itemGroup = new XElement("PropertyGroup");
66+
itemGroup.Add(new XElement("WasmFingerprintAssets", false));
67+
doc.Root.Add(itemGroup);
68+
});
5669

5770
var webConfigContents = "test webconfig contents";
5871
File.WriteAllText(Path.Combine(testInstance.TestRoot, "blazorwasm", "web.config"), webConfigContents);
@@ -74,7 +87,17 @@ public void AoT_Publish_HostedAppWithScopedCss_VisualStudio()
7487
{
7588
// Simulates publishing the same way VS does by setting BuildProjectReferences=false.
7689
var testAppName = "BlazorHosted";
77-
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm", "blazorhosted" });
90+
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm", "blazorhosted" })
91+
.WithProjectChanges((p, doc) =>
92+
{
93+
if (Path.GetFileName(p) == "blazorwasm.csproj")
94+
{
95+
var itemGroup = new XElement("PropertyGroup");
96+
itemGroup.Add(new XElement("WasmFingerprintAssets", false));
97+
doc.Root.Add(itemGroup);
98+
}
99+
});
100+
78101
File.WriteAllText(Path.Combine(testInstance.TestRoot, "blazorwasm", "App.razor.css"), "h1 { font-size: 16px; }");
79102

80103
// VS builds projects individually and then a publish with BuildDependencies=false, but building the main project is a close enough approximation for this test.

0 commit comments

Comments
 (0)