Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/aspnetcore (#40389)
Browse files Browse the repository at this point in the history
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <[email protected]>
3 people authored Apr 29, 2024

Partially verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
1 parent ed9502b commit 368240d
Showing 7 changed files with 62 additions and 56 deletions.
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -127,13 +127,13 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>75995e26b4c6f9a30ace7bcb65c0b4e42c0b397c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.11.0-preview.1.32">
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -263,49 +263,49 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>69680c66915b6e3d110db665dbdfd9ab9278851a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24223.1">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.4.24223.1">
<Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.4.24223.1">
<Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.4.24223.1">
<Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-preview.4.24223.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -324,9 +324,9 @@
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24226.3">
@@ -347,21 +347,21 @@
<Sha>d5d5f0c8e9e6eb1a0bfcf6987bf75a0d68c177c6</Sha>
<SourceBuild RepoName="razor" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.4.24223.1">
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.5.24225.4">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>f18510c2fbdfc11b8144ced4857b3d878fa70965</Sha>
<Sha>c157c5c1962a66c4fe0212ed767f167bb9cdfb79</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
26 changes: 13 additions & 13 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -247,19 +247,19 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24223.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<DotnetDevCertsPackageVersion>9.0.0-preview.4.24223.1</DotnetDevCertsPackageVersion>
<DotnetUserJwtsPackageVersion>9.0.0-preview.4.24223.1</DotnetUserJwtsPackageVersion>
<DotnetUserSecretsPackageVersion>9.0.0-preview.4.24223.1</DotnetUserSecretsPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.5.24225.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.5.24225.4</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<DotnetDevCertsPackageVersion>9.0.0-preview.5.24225.4</DotnetDevCertsPackageVersion>
<DotnetUserJwtsPackageVersion>9.0.0-preview.5.24225.4</DotnetUserJwtsPackageVersion>
<DotnetUserSecretsPackageVersion>9.0.0-preview.5.24225.4</DotnetUserSecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "9.0.100-preview.3.24204.13",
"dotnet": "9.0.100-preview.5.24225.4",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
Original file line number Diff line number Diff line change
@@ -13,9 +13,6 @@

<Nullable>Enable</Nullable>

<!-- Netfx version of the resolver builds against the lowest version of System.Text.Json that's guaranteed to be shipped with MSBuild in VS -->
<SystemTextJsonVersionOverride>8.0.0</SystemTextJsonVersionOverride>

<!-- Create FileDefinitions items for ResolveHostfxrCopyLocalContent target -->
<EmitLegacyAssetsFileItems>true</EmitLegacyAssetsFileItems>

@@ -90,7 +87,9 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersionOverride)" />
<!-- Netfx version builds against the lowest version of System.Text.Json that's guaranteed to be shipped with MSBuild in VS -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
<PackageReference Include="System.Text.Json" VersionOverride="8.0.0" />
<Reference Include="System" />
<Reference Include="System.Core" />
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="All" ExcludeAssets="Runtime" />
@@ -143,6 +142,7 @@
<ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>$(ResolverTargetFramework);net472</TargetFrameworks>
<TargetFrameworks Condition=" '$([MSBuild]::IsOSPlatform(`Windows`))' == 'false' ">$(ResolverTargetFramework)</TargetFrameworks>
<TargetFrameworks Condition="'$([MSBuild]::IsOSPlatform(`Windows`))' == 'false'">$(ResolverTargetFramework)</TargetFrameworks>

<PlatformTarget>AnyCPU</PlatformTarget>
<RuntimeIdentifiers Condition="$([MSBuild]::IsOSPlatform(`Windows`))">win-x86;win-x64</RuntimeIdentifiers>
@@ -26,9 +26,11 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<!-- Netfx version builds against the lowest version of System.Text.Json that's guaranteed to be shipped with MSBuild in VS -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
<PackageReference Include="System.Text.Json" VersionOverride="8.0.0" />
<Reference Include="System" />
<Reference Include="System.Core" />
<PackageReference Include="System.Text.Json" VersionOverride="8.0.0" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs
Original file line number Diff line number Diff line change
@@ -858,7 +858,9 @@ public void WhenProjectIsAddedSolutionHasUTF8BOM()
using (var stream = new FileStream(Path.Combine(projectDirectory, "App.sln"), FileMode.Open))
{
var bytes = new byte[preamble.Length];
#pragma warning disable CA2022 // Avoid inexact read
stream.Read(bytes, 0, bytes.Length);
#pragma warning restore CA2022 // Avoid inexact read
bytes.Should().BeEquivalentTo(preamble);
}
}
2 changes: 2 additions & 0 deletions test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs
Original file line number Diff line number Diff line change
@@ -637,7 +637,9 @@ public void WhenProjectIsRemovedSolutionHasUTF8BOM()
using (var stream = new FileStream(Path.Combine(projectDirectory, "App.sln"), FileMode.Open))
{
var bytes = new byte[preamble.Length];
#pragma warning disable CA2022 // Avoid inexact read
stream.Read(bytes, 0, bytes.Length);
#pragma warning restore CA2022 // Avoid inexact read
bytes.Should().BeEquivalentTo(preamble);
}
}

0 comments on commit 368240d

Please sign in to comment.