Skip to content

[main] Update dependencies from dotnet/runtime #41988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jul 8, 2024
Merged

[main] Update dependencies from dotnet/runtime #41988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
307e039
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 4, 2024
be36d32
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 4, 2024
2e57860
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 5, 2024
a3b7f40
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 5, 2024
bc59a7e
Make sure we pass properties as individual arguments to msbuild
akoeplinger Jul 5, 2024
30aaef8
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 5, 2024
bfa299e
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 5, 2024
8281880
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 5, 2024
11d4a0a
Merge branch 'main' into darc-main-261c903f-8620-4b37-a41b-d596da608082
lewing Jul 6, 2024
9dd6617
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 6, 2024
285c0ce
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 6, 2024
6dd808c
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 6, 2024
6e7a71e
Stop using obsolete X509Certificate2 ctor
akoeplinger Jul 7, 2024
df80545
Fix passing correct config to publishCommand.GetOutputDirectory()
akoeplinger Jul 7, 2024
85236f1
Fix another missed configuration setting
akoeplinger Jul 7, 2024
3939399
Revert X509CertificateLoader.LoadCertificate change in RegistryTests.cs
akoeplinger Jul 7, 2024
3990883
Use LoadPkcs12 instead, X509ContentType.Pfx is equivalent to Pkcs12
akoeplinger Jul 7, 2024
b46f3f4
Fix Signature
akoeplinger Jul 7, 2024
879b9fa
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 7, 2024
1436696
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Jul 7, 2024
b507f3f
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 76 additions & 76 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.7.24352.15</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.7.24357.2</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.7.24352.15</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.7.24357.2</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.24324.3</SystemCommandLineVersion>
<SystemCommandLineRenderingVersion>0.4.0-alpha.24324.3</SystemCommandLineRenderingVersion>
Expand Down Expand Up @@ -130,21 +130,21 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.7.24352.15</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24352.15</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24352.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.7.24352.15</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-preview.7.24352.15</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.7.24352.15</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.7.24352.15</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.7.24352.15</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.7.24352.15</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.7.24352.15</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.7.24352.15</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.7.24357.2</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24357.2</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24357.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.7.24357.2</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-preview.7.24357.2</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.7.24357.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.7.24357.2</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.7.24357.2</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.7.24357.2</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.7.24357.2</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.7.24357.2</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.7.24352.15</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.7.24352.15</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.7.24352.15</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.7.24357.2</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.7.24357.2</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.7.24357.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -177,9 +177,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>9.0.0-preview.7.24352.15</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.7.24352.15</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.7.24352.15</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>9.0.0-preview.7.24357.2</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.7.24357.2</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.7.24357.2</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
Expand Down Expand Up @@ -235,19 +235,19 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24355.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24355.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24355.2</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24355.2</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24355.2</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24357.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24357.1</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24357.1</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24357.1</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
Expand Down
2 changes: 2 additions & 0 deletions src/Cli/dotnet/Installer/Windows/Security/Signature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ internal static class Signature
internal static unsafe int HasMicrosoftTrustedRoot(string path)
{
// Create an X509Certificate2 instance so we can access the certificate context and create a chain context.
#pragma warning disable SYSLIB0057 // can't use X509CertificateLoader here since it tries to parse the file as a certificate
using X509Certificate2 certificate = new(path);
#pragma warning restore SYSLIB0057

// We don't use X509Chain because it doesn't support verifying the specific policy and because we defer
// that to the WinTrust provider as it performs timestamp and revocation checks.
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ public async Task InsecureRegistry(bool isInsecureRegistry, bool serverIsHttps,
X509Certificate2 serverCertificate = request.CreateSelfSigned(DateTimeOffset.Now, DateTimeOffset.Now.AddYears(1));

// https://stackoverflow.com/questions/72096812/loading-x509certificate2-from-pem-file-results-in-no-credentials-are-available/72101855#72101855
serverCertificate = new X509Certificate2(serverCertificate.Export(X509ContentType.Pfx));
serverCertificate = X509CertificateLoader.LoadPkcs12(serverCertificate.Export(X509ContentType.Pfx), password: "");

sslOptions = new SslServerAuthenticationOptions()
{
Expand Down
6 changes: 3 additions & 3 deletions test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ public void AoT_Publish_HostedAppWithScopedCss_VisualStudio()

// VS builds projects individually and then a publish with BuildDependencies=false, but building the main project is a close enough approximation for this test.
var buildCommand = CreateBuildCommand(testInstance, "blazorwasm");
ExecuteCommand(buildCommand, "/p:BuildInsideVisualStudio=true /p:Configuration=Release").Should().Pass();
ExecuteCommand(buildCommand, "/p:BuildInsideVisualStudio=true", "/p:Configuration=Release").Should().Pass();

// Publish
var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
ExecuteCommand(publishCommand, "/p:BuildProjectReferences=false /p:BuildInsideVisualStudio=true /p:Configuration=Release").Should().Pass();
ExecuteCommand(publishCommand, "/p:BuildProjectReferences=false", "/p:BuildInsideVisualStudio=true", "/p:Configuration=Release").Should().Pass();

var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm, "Release");
var blazorPublishDirectory = Path.Combine(publishDirectory.ToString(), "wwwroot");

// Make sure the main project exists
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public void Build_InRelease_Works()
var testInstance = CreateAspNetSdkTestAsset(testAppName);

var buildCommand = CreateBuildCommand(testInstance, "blazorwasm");
ExecuteCommand(buildCommand,"/p:Configuration=Release")
ExecuteCommand(buildCommand, "/p:Configuration=Release")
.Should().Pass();

var buildOutputDirectory = buildCommand.GetOutputDirectory(DefaultTfm, "Release").ToString();
Expand Down
10 changes: 5 additions & 5 deletions test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ public void Publish_HostedApp_WithoutTrimming_Works()

// Publish
var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
ExecuteCommand(publishCommand, "/p:BuildDependencies=false /bl").Should().Pass();
ExecuteCommand(publishCommand, "/p:BuildDependencies=false", "/bl").Should().Pass();

var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
// Make sure the main project exists
Expand Down Expand Up @@ -847,7 +847,7 @@ public void Publish_HostedApp_VisualStudio()

// Publish
var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
ExecuteCommand(publishCommand, "/p:BuildProjectReferences=false /p:BuildInsideVisualStudio=true").Should().Pass();
ExecuteCommand(publishCommand, "/p:BuildProjectReferences=false", "/p:BuildInsideVisualStudio=true").Should().Pass();

var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
// Make sure the main project exists
Expand Down Expand Up @@ -927,13 +927,13 @@ public void Publish_HostedAppWithScopedCss_VisualStudio()

// VS builds projects individually and then a publish with BuildDependencies=false, but building the main project is a close enough approximation for this test.
var buildCommand = CreateBuildCommand(testInstance, "blazorwasm");
ExecuteCommand(buildCommand, "/bl:build.msbuild.binlog", "/p:BuildInsideVisualStudio=true /p:Configuration=Release").Should().Pass();
ExecuteCommand(buildCommand, "/bl:build.msbuild.binlog", "/p:BuildInsideVisualStudio=true", "/p:Configuration=Release").Should().Pass();

// Publish
var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
ExecuteCommand(publishCommand, "/bl:publish.msbuild.binlog", "/p:BuildProjectReferences=false /p:BuildInsideVisualStudio=true").Should().Pass();
ExecuteCommand(publishCommand, "/bl:publish.msbuild.binlog", "/p:BuildProjectReferences=false", "/p:BuildInsideVisualStudio=true", "/p:Configuration=Release").Should().Pass();

var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm, "Release");
var blazorPublishDirectory = Path.Combine(publishDirectory.ToString(), "wwwroot");

// Make sure the main project exists
Expand Down
16 changes: 16 additions & 0 deletions test/Microsoft.NET.TestFramework/AspNetSdkTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ protected virtual PublishCommand CreatePublishCommand(TestAsset asset, string re

protected virtual CommandResult ExecuteCommand(TestCommand command, params string[] arguments)
{
ValidateIndividualArgumentsContainNoSpaces(arguments);

if (_generateMSbuildLogs)
{
var i = 0;
Expand All @@ -145,6 +147,8 @@ protected virtual CommandResult ExecuteCommand(TestCommand command, params strin

protected virtual CommandResult ExecuteCommandWithoutRestore(MSBuildCommand command, params string[] arguments)
{
ValidateIndividualArgumentsContainNoSpaces(arguments);

if (_generateMSbuildLogs)
{
var i = 0;
Expand All @@ -158,6 +162,18 @@ protected virtual CommandResult ExecuteCommandWithoutRestore(MSBuildCommand comm
}
}

private void ValidateIndividualArgumentsContainNoSpaces(string[] arguments)
{
foreach (var argument in arguments)
{
// assume our tests don't need to pass msbuild properties with spaces
if (argument.Contains(' '))
{
throw new ArgumentException($"Individual arguments should not contain spaces to avoid quoting issues when passing to msbuild, pass them as separate array elements instead. Argument: {argument}");
}
}
}

private void ApplyDefaults(MSBuildCommand command)
{
if (GetNuGetCachePath() is { } cache)
Expand Down
Loading