Skip to content

Commit 9deabc5

Browse files
committed
Reapply .NET 7 and lower removal from global.json and Versions.props
1 parent a8a3d56 commit 9deabc5

File tree

2 files changed

+2
-32
lines changed

2 files changed

+2
-32
lines changed

eng/Versions.props

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<!-- The TFMs of the dotnet-monitor tool. -->
2828
<ToolTargetFrameworks>$(LatestTargetFramework)</ToolTargetFrameworks>
2929
<!-- The TFMs of that the dotnet-monitor tool supports diagnosing. -->
30-
<TestTargetFrameworks>net6.0;net7.0;net8.0;net9.0;$(LatestTargetFramework)</TestTargetFrameworks>
30+
<TestTargetFrameworks>net8.0;net9.0;$(LatestTargetFramework)</TestTargetFrameworks>
3131
<!-- The TFM for generating schema.json and OpenAPI docs. -->
32-
<SchemaTargetFramework>net10.0</SchemaTargetFramework>
32+
<SchemaTargetFramework>$(LatestTargetFramework)</SchemaTargetFramework>
3333
</PropertyGroup>
3434
<PropertyGroup Label="Arcade">
3535
<UsingToolXliff>false</UsingToolXliff>
@@ -70,11 +70,6 @@
7070
<MicrosoftFileFormatsVersion>1.0.615501</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>
7272
<PropertyGroup Label="Runtime Versions">
73-
<MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
74-
<MicrosoftNETCoreApp50Version>5.0.17</MicrosoftNETCoreApp50Version>
75-
<MicrosoftAspNetCoreApp50Version>$(MicrosoftNETCoreApp50Version)</MicrosoftAspNetCoreApp50Version>
76-
<MicrosoftAspNetCoreApp60Version>$(MicrosoftNETCoreApp60Version)</MicrosoftAspNetCoreApp60Version>
77-
<MicrosoftAspNetCoreApp70Version>$(MicrosoftNETCoreApp70Version)</MicrosoftAspNetCoreApp70Version>
7873
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>
7974
<MicrosoftAspNetCoreApp90Version>$(MicrosoftNETCoreApp90Version)</MicrosoftAspNetCoreApp90Version>
8075
<MicrosoftNETCoreApp100Version>$(MicrosoftNETCoreAppRuntimewinx64Version)</MicrosoftNETCoreApp100Version>
@@ -90,23 +85,6 @@
9085
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
9186
<MicrosoftDiagnosticsTracingTraceEventVersion>3.0.7</MicrosoftDiagnosticsTracingTraceEventVersion>
9287
</PropertyGroup>
93-
<PropertyGroup Label=".NET 6 Dependent" Condition=" '$(TargetFramework)' == 'net6.0' ">
94-
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp60Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
95-
<MicrosoftAspNetCoreAuthenticationNegotiateVersion>$(MicrosoftAspNetCoreApp60Version)</MicrosoftAspNetCoreAuthenticationNegotiateVersion>
96-
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions60Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
97-
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging60Version)</MicrosoftExtensionsLoggingVersion>
98-
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions60Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
99-
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole60Version)</MicrosoftExtensionsLoggingConsoleVersion>
100-
<SystemTextJsonVersion>$(SystemTextJson80Version)</SystemTextJsonVersion>
101-
</PropertyGroup>
102-
<PropertyGroup Label=".NET 7 Dependent" Condition=" '$(TargetFramework)' == 'net7.0' ">
103-
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp70Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
104-
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions70Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
105-
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging70Version)</MicrosoftExtensionsLoggingVersion>
106-
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions70Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
107-
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole70Version)</MicrosoftExtensionsLoggingConsoleVersion>
108-
<SystemTextJsonVersion>$(SystemTextJson80Version)</SystemTextJsonVersion>
109-
</PropertyGroup>
11088
<PropertyGroup Label=".NET 8 Dependent" Condition=" '$(TargetFramework)' == 'net8.0' ">
11189
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp80Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
11290
<MicrosoftAspNetCoreAuthenticationNegotiateVersion>$(MicrosoftAspNetCoreApp80Version)</MicrosoftAspNetCoreAuthenticationNegotiateVersion>

global.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,21 @@
33
"dotnet": "10.0.100-preview.3.25178.6",
44
"runtimes": {
55
"aspnetcore": [
6-
"$(MicrosoftAspNetCoreApp60Version)",
7-
"$(MicrosoftAspNetCoreApp70Version)",
86
"$(MicrosoftAspNetCoreApp80Version)",
97
"$(MicrosoftAspNetCoreApp90Version)",
108
"$(MicrosoftAspNetCoreApp100Version)"
119
],
1210
"aspnetcore/x86": [
13-
"$(MicrosoftAspNetCoreApp60Version)",
14-
"$(MicrosoftAspNetCoreApp70Version)",
1511
"$(MicrosoftAspNetCoreApp80Version)",
1612
"$(MicrosoftAspNetCoreApp90Version)",
1713
"$(MicrosoftAspNetCoreApp100Version)"
1814
],
1915
"dotnet": [
20-
"$(MicrosoftNETCoreApp60Version)",
21-
"$(MicrosoftNETCoreApp70Version)",
2216
"$(MicrosoftNETCoreApp80Version)",
2317
"$(MicrosoftNETCoreApp90Version)",
2418
"$(MicrosoftNETCoreApp100Version)"
2519
],
2620
"dotnet/x86": [
27-
"$(MicrosoftNETCoreApp60Version)",
28-
"$(MicrosoftNETCoreApp70Version)",
2921
"$(MicrosoftNETCoreApp80Version)",
3022
"$(MicrosoftNETCoreApp90Version)",
3123
"$(MicrosoftNETCoreApp100Version)"

0 commit comments

Comments
 (0)