Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/runtime (#42262)
Browse files Browse the repository at this point in the history 
[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
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] authored Jul 27, 2024
1 parent 74dafbf commit 1b87a11
Show file tree
Hide file tree
Showing 16 changed files with 704 additions and 241 deletions.
220 changes: 110 additions & 110 deletions eng/Version.Details.xml
View file

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,43 +121,43 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24366.18</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-preview.7.24366.18</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.7.24366.18</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-rc.1.24376.16</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-rc.1.24376.16</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-rc.1.24376.16</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.7.24366.18</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0-preview.7.24366.18</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>9.0.0-preview.7.24366.18</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>9.0.0-preview.7.24366.18</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-rc.1.24376.16</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-rc.1.24376.16</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0-rc.1.24376.16</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>9.0.0-rc.1.24376.16</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>9.0.0-rc.1.24376.16</MicrosoftWin32SystemEventsPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<SystemCodeDomPackageVersion>9.0.0-preview.7.24366.18</SystemCodeDomPackageVersion>
<SystemCodeDomPackageVersion>9.0.0-rc.1.24376.16</SystemCodeDomPackageVersion>
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
<SystemCompositionAttributedModelPackageVersion>9.0.0-preview.7.24366.18</SystemCompositionAttributedModelPackageVersion>
<SystemCompositionConventionPackageVersion>9.0.0-preview.7.24366.18</SystemCompositionConventionPackageVersion>
<SystemCompositionHostingPackageVersion>9.0.0-preview.7.24366.18</SystemCompositionHostingPackageVersion>
<SystemCompositionRuntimePackageVersion>9.0.0-preview.7.24366.18</SystemCompositionRuntimePackageVersion>
<SystemCompositionTypedPartsPackageVersion>9.0.0-preview.7.24366.18</SystemCompositionTypedPartsPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-preview.7.24366.18</SystemConfigurationConfigurationManagerPackageVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.7.24366.18</SystemReflectionMetadataLoadContextVersion>
<SystemCompositionAttributedModelPackageVersion>9.0.0-rc.1.24376.16</SystemCompositionAttributedModelPackageVersion>
<SystemCompositionConventionPackageVersion>9.0.0-rc.1.24376.16</SystemCompositionConventionPackageVersion>
<SystemCompositionHostingPackageVersion>9.0.0-rc.1.24376.16</SystemCompositionHostingPackageVersion>
<SystemCompositionRuntimePackageVersion>9.0.0-rc.1.24376.16</SystemCompositionRuntimePackageVersion>
<SystemCompositionTypedPartsPackageVersion>9.0.0-rc.1.24376.16</SystemCompositionTypedPartsPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-rc.1.24376.16</SystemConfigurationConfigurationManagerPackageVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-rc.1.24376.16</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.7.24366.18</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>9.0.0-preview.7.24366.18</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.7.24366.18</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-preview.7.24366.18</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>9.0.0-preview.7.24366.18</SystemSecurityPermissionsPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.7.24366.18</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>9.0.0-preview.7.24366.18</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>9.0.0-preview.7.24366.18</SystemWindowsExtensionsPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-rc.1.24376.16</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>9.0.0-rc.1.24376.16</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-rc.1.24376.16</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-rc.1.24376.16</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>9.0.0-rc.1.24376.16</SystemSecurityPermissionsPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-rc.1.24376.16</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>9.0.0-rc.1.24376.16</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>9.0.0-rc.1.24376.16</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
Expand Down Expand Up @@ -241,19 +241,19 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-rc.1.24375.10</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-rc.1.24375.10</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<dotnetdevcertsPackageVersion>9.0.0-rc.1.24375.10</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>9.0.0-rc.1.24375.10</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>9.0.0-rc.1.24375.10</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-rc.1.24376.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-rc.1.24376.4</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<dotnetdevcertsPackageVersion>9.0.0-rc.1.24376.4</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>9.0.0-rc.1.24376.4</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>9.0.0-rc.1.24376.4</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
Expand Down Expand Up @@ -355,7 +355,7 @@
<XamarinMacOSWorkloadManifestVersion>14.2.9714-net9-p6</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>17.2.9714-net9-p6</XamarinTvOSWorkloadManifestVersion>
<!-- Workloads from dotnet/emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.7.24365.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-rc.1.24373.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
Expand Down
29 changes: 26 additions & 3 deletions test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@ public void AoT_Publish_InRelease_Works()
{
// Arrange
var testAppName = "BlazorWasmWithLibrary";
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm" });
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm" })
.WithProjectChanges((p, doc) =>
{
var itemGroup = new XElement("PropertyGroup");
itemGroup.Add(new XElement("WasmFingerprintAssets", false));
doc.Root.Add(itemGroup);
});

File.WriteAllText(Path.Combine(testInstance.TestRoot, "blazorwasm", "App.razor.css"), "h1 { font-size: 16px; }");

var publishCommand = new PublishCommand(testInstance, "blazorwasm");
Expand Down Expand Up @@ -52,7 +59,13 @@ public void AoT_Publish_WithExistingWebConfig_Works()
{
// Arrange
var testAppName = "BlazorWasmWithLibrary";
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm" });
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm" })
.WithProjectChanges((p, doc) =>
{
var itemGroup = new XElement("PropertyGroup");
itemGroup.Add(new XElement("WasmFingerprintAssets", false));
doc.Root.Add(itemGroup);
});

var webConfigContents = "test webconfig contents";
File.WriteAllText(Path.Combine(testInstance.TestRoot, "blazorwasm", "web.config"), webConfigContents);
Expand All @@ -74,7 +87,17 @@ public void AoT_Publish_HostedAppWithScopedCss_VisualStudio()
{
// Simulates publishing the same way VS does by setting BuildProjectReferences=false.
var testAppName = "BlazorHosted";
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm", "blazorhosted" });
var testInstance = CreateAspNetSdkTestAssetWithAot(testAppName, new[] { "blazorwasm", "blazorhosted" })
.WithProjectChanges((p, doc) =>
{
if (Path.GetFileName(p) == "blazorwasm.csproj")
{
var itemGroup = new XElement("PropertyGroup");
itemGroup.Add(new XElement("WasmFingerprintAssets", false));
doc.Root.Add(itemGroup);
}
});

File.WriteAllText(Path.Combine(testInstance.TestRoot, "blazorwasm", "App.razor.css"), "h1 { font-size: 16px; }");

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

0 comments on commit 1b87a11

Please sign in to comment.