Skip to content
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

[release/9.x] Use dotnet-public net9.0 versions #7915

Merged
merged 2 commits into from
Feb 4, 2025
Merged

[release/9.x] Use dotnet-public net9.0 versions #7915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10c927c
Use .NET 9 libraries from dotnet-public feed (#7913)
jander-msft Feb 4, 2025
58664ce
Fix Helix ASP.NET 9.0 version
jander-msft Feb 4, 2025
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
11 changes: 5 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,11 @@
<PropertyGroup Label="Runtime Versions">
<MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
<MicrosoftNETCoreApp50Version>5.0.17</MicrosoftNETCoreApp50Version>
<MicrosoftNETCoreApp90Version>$(MicrosoftNETCoreAppRuntimewinx64Version)</MicrosoftNETCoreApp90Version>
<MicrosoftAspNetCoreApp50Version>$(MicrosoftNETCoreApp50Version)</MicrosoftAspNetCoreApp50Version>
<MicrosoftAspNetCoreApp60Version>$(MicrosoftNETCoreApp60Version)</MicrosoftAspNetCoreApp60Version>
<MicrosoftAspNetCoreApp70Version>$(MicrosoftNETCoreApp70Version)</MicrosoftAspNetCoreApp70Version>
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>
<MicrosoftAspNetCoreApp90Version>$(MicrosoftAspNetCoreAppRuntimewinx64Version)</MicrosoftAspNetCoreApp90Version>
<MicrosoftAspNetCoreApp90Version>$(MicrosoftNETCoreApp90Version)</MicrosoftAspNetCoreApp90Version>
</PropertyGroup>
<PropertyGroup Label="SDK Versions">
<!-- Use a non-final versioned sentinel package for installation of specific SDK version. -->
Expand Down Expand Up @@ -118,10 +117,10 @@
<PropertyGroup Label=".NET 9 Dependent" Condition=" '$(TargetFramework)' == 'net9.0' ">
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp90Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
<MicrosoftAspNetCoreAuthenticationNegotiateVersion>$(MicrosoftAspNetCoreApp90Version)</MicrosoftAspNetCoreAuthenticationNegotiateVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftNETCoreApp90Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>$(MicrosoftNETCoreApp90Version)</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftNETCoreApp90Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftNETCoreApp90Version)</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions90Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging90Version)</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions90Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole90Version)</MicrosoftExtensionsLoggingConsoleVersion>
<SystemTextJsonVersion>$(SystemTextJson90Version)</SystemTextJsonVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(UseMicrosoftDiagnosticsMonitoringShippedVersion)' == 'true'">
Expand Down
10 changes: 10 additions & 0 deletions eng/dependabot/net9.0/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
Packages in this file have versions updated periodically by Dependabot specifically for .NET 9.
-->
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractions90Version)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLogging90Version)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractions90Version)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsole90Version)" />
<!--
We want to update "Microsoft.NETCore.App.Runtime.*" but those packages are considered platform packages and cannot be added
as a package reference. Use Microsoft.NETCore.DotNetAppHost instead which is released in lockstep with the runtime packages and
with the same version number.
-->
<PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp90Version)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJson90Version)" />
</ItemGroup>
</Project>
11 changes: 11 additions & 0 deletions eng/dependabot/net9.0/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
<Project>
<!-- Import references updated by Dependabot. -->
<PropertyGroup>
<!-- Microsoft.Extensions.Configuration.Abstractions -->
<MicrosoftExtensionsConfigurationAbstractions90Version>9.0.1</MicrosoftExtensionsConfigurationAbstractions90Version>
<!-- Microsoft.Extensions.Logging -->
<MicrosoftExtensionsLogging90Version>9.0.1</MicrosoftExtensionsLogging90Version>
<!-- Microsoft.Extensions.Logging.Abstractions -->
<MicrosoftExtensionsLoggingAbstractions90Version>9.0.1</MicrosoftExtensionsLoggingAbstractions90Version>
<!-- Microsoft.Extensions.Logging.Console -->
<MicrosoftExtensionsLoggingConsole90Version>9.0.1</MicrosoftExtensionsLoggingConsole90Version>
<!-- Microsoft.NETCore.App -->
<MicrosoftNETCoreApp90Version>9.0.1</MicrosoftNETCoreApp90Version>
<!-- System.Text.Json -->
<SystemTextJson90Version>9.0.0</SystemTextJson90Version>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion eng/helix/Helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<AdditionalDotNetPackage Include="$(MicrosoftAspNetCoreApp80Version)">
<PackageType>aspnetcore-runtime</PackageType>
</AdditionalDotNetPackage>
<AdditionalDotNetPackage Include="$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)">
<AdditionalDotNetPackage Include="$(MicrosoftAspNetCoreApp90Version)">
<PackageType>aspnetcore-runtime</PackageType>
</AdditionalDotNetPackage>
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
"$(MicrosoftAspNetCoreApp60Version)",
"$(MicrosoftAspNetCoreApp70Version)",
"$(MicrosoftAspNetCoreApp80Version)",
"$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)"
"$(MicrosoftAspNetCoreApp90Version)"
],
"aspnetcore/x86": [
"$(MicrosoftAspNetCoreApp60Version)",
"$(MicrosoftAspNetCoreApp70Version)",
"$(MicrosoftAspNetCoreApp80Version)",
"$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)"
"$(MicrosoftAspNetCoreApp90Version)"
],
"dotnet": [
"$(MicrosoftNETCoreApp60Version)",
"$(MicrosoftNETCoreApp70Version)",
"$(MicrosoftNETCoreApp80Version)",
"$(VSRedistCommonNetCoreSharedFrameworkx6490Version)"
"$(MicrosoftNETCoreApp90Version)"
],
"dotnet/x86": [
"$(MicrosoftNETCoreApp60Version)",
"$(MicrosoftNETCoreApp70Version)",
"$(MicrosoftNETCoreApp80Version)",
"$(VSRedistCommonNetCoreSharedFrameworkx6490Version)"
"$(MicrosoftNETCoreApp90Version)"
]
}
},
Expand Down