Skip to content

Commit c3eca56

Browse files
Use .NET 9 libraries from dotnet-public feed (#7915)
Co-authored-by: Justin Anderson <[email protected]>
1 parent 186c513 commit c3eca56

File tree

5 files changed

+31
-11
lines changed

5 files changed

+31
-11
lines changed

Diff for: eng/Versions.props

+5-6
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,11 @@
7272
<PropertyGroup Label="Runtime Versions">
7373
<MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
7474
<MicrosoftNETCoreApp50Version>5.0.17</MicrosoftNETCoreApp50Version>
75-
<MicrosoftNETCoreApp90Version>$(MicrosoftNETCoreAppRuntimewinx64Version)</MicrosoftNETCoreApp90Version>
7675
<MicrosoftAspNetCoreApp50Version>$(MicrosoftNETCoreApp50Version)</MicrosoftAspNetCoreApp50Version>
7776
<MicrosoftAspNetCoreApp60Version>$(MicrosoftNETCoreApp60Version)</MicrosoftAspNetCoreApp60Version>
7877
<MicrosoftAspNetCoreApp70Version>$(MicrosoftNETCoreApp70Version)</MicrosoftAspNetCoreApp70Version>
7978
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>
80-
<MicrosoftAspNetCoreApp90Version>$(MicrosoftAspNetCoreAppRuntimewinx64Version)</MicrosoftAspNetCoreApp90Version>
79+
<MicrosoftAspNetCoreApp90Version>$(MicrosoftNETCoreApp90Version)</MicrosoftAspNetCoreApp90Version>
8180
</PropertyGroup>
8281
<PropertyGroup Label="SDK Versions">
8382
<!-- Use a non-final versioned sentinel package for installation of specific SDK version. -->
@@ -118,10 +117,10 @@
118117
<PropertyGroup Label=".NET 9 Dependent" Condition=" '$(TargetFramework)' == 'net9.0' ">
119118
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp90Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
120119
<MicrosoftAspNetCoreAuthenticationNegotiateVersion>$(MicrosoftAspNetCoreApp90Version)</MicrosoftAspNetCoreAuthenticationNegotiateVersion>
121-
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftNETCoreApp90Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
122-
<MicrosoftExtensionsLoggingVersion>$(MicrosoftNETCoreApp90Version)</MicrosoftExtensionsLoggingVersion>
123-
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftNETCoreApp90Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
124-
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftNETCoreApp90Version)</MicrosoftExtensionsLoggingConsoleVersion>
120+
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions90Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
121+
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging90Version)</MicrosoftExtensionsLoggingVersion>
122+
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions90Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
123+
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole90Version)</MicrosoftExtensionsLoggingConsoleVersion>
125124
<SystemTextJsonVersion>$(SystemTextJson90Version)</SystemTextJsonVersion>
126125
</PropertyGroup>
127126
<PropertyGroup Condition="'$(UseMicrosoftDiagnosticsMonitoringShippedVersion)' == 'true'">

Diff for: eng/dependabot/net9.0/Packages.props

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
Packages in this file have versions updated periodically by Dependabot specifically for .NET 9.
44
-->
55
<ItemGroup>
6+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractions90Version)" />
7+
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLogging90Version)" />
8+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractions90Version)" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsole90Version)" />
10+
<!--
11+
We want to update "Microsoft.NETCore.App.Runtime.*" but those packages are considered platform packages and cannot be added
12+
as a package reference. Use Microsoft.NETCore.DotNetAppHost instead which is released in lockstep with the runtime packages and
13+
with the same version number.
14+
-->
15+
<PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp90Version)" />
616
<PackageReference Include="System.Text.Json" Version="$(SystemTextJson90Version)" />
717
</ItemGroup>
818
</Project>

Diff for: eng/dependabot/net9.0/Versions.props

+11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
<Project>
22
<!-- Import references updated by Dependabot. -->
33
<PropertyGroup>
4+
<!-- Microsoft.Extensions.Configuration.Abstractions -->
5+
<MicrosoftExtensionsConfigurationAbstractions90Version>9.0.1</MicrosoftExtensionsConfigurationAbstractions90Version>
6+
<!-- Microsoft.Extensions.Logging -->
7+
<MicrosoftExtensionsLogging90Version>9.0.1</MicrosoftExtensionsLogging90Version>
8+
<!-- Microsoft.Extensions.Logging.Abstractions -->
9+
<MicrosoftExtensionsLoggingAbstractions90Version>9.0.1</MicrosoftExtensionsLoggingAbstractions90Version>
10+
<!-- Microsoft.Extensions.Logging.Console -->
11+
<MicrosoftExtensionsLoggingConsole90Version>9.0.1</MicrosoftExtensionsLoggingConsole90Version>
12+
<!-- Microsoft.NETCore.App -->
13+
<MicrosoftNETCoreApp90Version>9.0.1</MicrosoftNETCoreApp90Version>
14+
<!-- System.Text.Json -->
415
<SystemTextJson90Version>9.0.0</SystemTextJson90Version>
516
</PropertyGroup>
617
</Project>

Diff for: eng/helix/Helix.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<AdditionalDotNetPackage Include="$(MicrosoftAspNetCoreApp80Version)">
137137
<PackageType>aspnetcore-runtime</PackageType>
138138
</AdditionalDotNetPackage>
139-
<AdditionalDotNetPackage Include="$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)">
139+
<AdditionalDotNetPackage Include="$(MicrosoftAspNetCoreApp90Version)">
140140
<PackageType>aspnetcore-runtime</PackageType>
141141
</AdditionalDotNetPackage>
142142
</ItemGroup>

Diff for: global.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66
"$(MicrosoftAspNetCoreApp60Version)",
77
"$(MicrosoftAspNetCoreApp70Version)",
88
"$(MicrosoftAspNetCoreApp80Version)",
9-
"$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)"
9+
"$(MicrosoftAspNetCoreApp90Version)"
1010
],
1111
"aspnetcore/x86": [
1212
"$(MicrosoftAspNetCoreApp60Version)",
1313
"$(MicrosoftAspNetCoreApp70Version)",
1414
"$(MicrosoftAspNetCoreApp80Version)",
15-
"$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)"
15+
"$(MicrosoftAspNetCoreApp90Version)"
1616
],
1717
"dotnet": [
1818
"$(MicrosoftNETCoreApp60Version)",
1919
"$(MicrosoftNETCoreApp70Version)",
2020
"$(MicrosoftNETCoreApp80Version)",
21-
"$(VSRedistCommonNetCoreSharedFrameworkx6490Version)"
21+
"$(MicrosoftNETCoreApp90Version)"
2222
],
2323
"dotnet/x86": [
2424
"$(MicrosoftNETCoreApp60Version)",
2525
"$(MicrosoftNETCoreApp70Version)",
2626
"$(MicrosoftNETCoreApp80Version)",
27-
"$(VSRedistCommonNetCoreSharedFrameworkx6490Version)"
27+
"$(MicrosoftNETCoreApp90Version)"
2828
]
2929
}
3030
},

0 commit comments

Comments
 (0)