Skip to content

Commit e40de65

Browse files
authored
[main] Remove .NET 7 and lower references except for startup hook (#8067)
1 parent 4b0116d commit e40de65

File tree

73 files changed

+54
-794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+54
-794
lines changed

.github/dependabot.template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#! to the list of TFMs that the major version uses for build and test.
99
#@ def getTfms():
1010
#@ return {
11-
#@ "9": [ "net9.0", "net8.0", "net7.0", "net6.0" ],
12-
#@ "8": [ "net8.0", "net7.0", "net6.0" ],
11+
#@ "9": [ "net9.0", "net8.0" ],
12+
#@ "8": [ "net8.0" ],
1313
#@ }
1414
#@ end
1515

.github/dependabot.yml

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -51,40 +51,6 @@ updates:
5151
- Microsoft.Extensions.*
5252
- Microsoft.NETCore.DotNetHost
5353
- System.Text.Json
54-
- package-ecosystem: nuget
55-
directory: /eng/dependabot/net7.0
56-
schedule:
57-
interval: daily
58-
target-branch: main
59-
ignore:
60-
- dependency-name: '*'
61-
update-types:
62-
- version-update:semver-major
63-
commit-message:
64-
prefix: '[main] '
65-
groups:
66-
runtime-dependencies:
67-
patterns:
68-
- Microsoft.Extensions.*
69-
- Microsoft.NETCore.DotNetHost
70-
- System.Text.Json
71-
- package-ecosystem: nuget
72-
directory: /eng/dependabot/net6.0
73-
schedule:
74-
interval: daily
75-
target-branch: main
76-
ignore:
77-
- dependency-name: '*'
78-
update-types:
79-
- version-update:semver-major
80-
commit-message:
81-
prefix: '[main] '
82-
groups:
83-
runtime-dependencies:
84-
patterns:
85-
- Microsoft.Extensions.*
86-
- Microsoft.NETCore.DotNetHost
87-
- System.Text.Json
8854
- package-ecosystem: nuget
8955
directory: /eng/dependabot/independent
9056
schedule:
@@ -148,40 +114,6 @@ updates:
148114
- Microsoft.Extensions.*
149115
- Microsoft.NETCore.DotNetHost
150116
- System.Text.Json
151-
- package-ecosystem: nuget
152-
directory: /eng/dependabot/net7.0
153-
schedule:
154-
interval: daily
155-
target-branch: release/9.x
156-
ignore:
157-
- dependency-name: '*'
158-
update-types:
159-
- version-update:semver-major
160-
commit-message:
161-
prefix: '[release/9.x] '
162-
groups:
163-
runtime-dependencies:
164-
patterns:
165-
- Microsoft.Extensions.*
166-
- Microsoft.NETCore.DotNetHost
167-
- System.Text.Json
168-
- package-ecosystem: nuget
169-
directory: /eng/dependabot/net6.0
170-
schedule:
171-
interval: daily
172-
target-branch: release/9.x
173-
ignore:
174-
- dependency-name: '*'
175-
update-types:
176-
- version-update:semver-major
177-
commit-message:
178-
prefix: '[release/9.x] '
179-
groups:
180-
runtime-dependencies:
181-
patterns:
182-
- Microsoft.Extensions.*
183-
- Microsoft.NETCore.DotNetHost
184-
- System.Text.Json
185117
- package-ecosystem: nuget
186118
directory: /eng/dependabot/independent
187119
schedule:
@@ -228,40 +160,6 @@ updates:
228160
- Microsoft.Extensions.*
229161
- Microsoft.NETCore.DotNetHost
230162
- System.Text.Json
231-
- package-ecosystem: nuget
232-
directory: /eng/dependabot/net7.0
233-
schedule:
234-
interval: daily
235-
target-branch: release/8.x
236-
ignore:
237-
- dependency-name: '*'
238-
update-types:
239-
- version-update:semver-major
240-
commit-message:
241-
prefix: '[release/8.x] '
242-
groups:
243-
runtime-dependencies:
244-
patterns:
245-
- Microsoft.Extensions.*
246-
- Microsoft.NETCore.DotNetHost
247-
- System.Text.Json
248-
- package-ecosystem: nuget
249-
directory: /eng/dependabot/net6.0
250-
schedule:
251-
interval: daily
252-
target-branch: release/8.x
253-
ignore:
254-
- dependency-name: '*'
255-
update-types:
256-
- version-update:semver-major
257-
commit-message:
258-
prefix: '[release/8.x] '
259-
groups:
260-
runtime-dependencies:
261-
patterns:
262-
- Microsoft.Extensions.*
263-
- Microsoft.NETCore.DotNetHost
264-
- System.Text.Json
265163
- package-ecosystem: nuget
266164
directory: /eng/dependabot/independent
267165
schedule:
@@ -308,37 +206,3 @@ updates:
308206
- Microsoft.Extensions.*
309207
- Microsoft.NETCore.DotNetHost
310208
- System.Text.Json
311-
- package-ecosystem: nuget
312-
directory: /eng/dependabot/net7.0
313-
schedule:
314-
interval: daily
315-
target-branch: release/8.0
316-
ignore:
317-
- dependency-name: '*'
318-
update-types:
319-
- version-update:semver-major
320-
commit-message:
321-
prefix: '[release/8.0] '
322-
groups:
323-
runtime-dependencies:
324-
patterns:
325-
- Microsoft.Extensions.*
326-
- Microsoft.NETCore.DotNetHost
327-
- System.Text.Json
328-
- package-ecosystem: nuget
329-
directory: /eng/dependabot/net6.0
330-
schedule:
331-
interval: daily
332-
target-branch: release/8.0
333-
ignore:
334-
- dependency-name: '*'
335-
update-types:
336-
- version-update:semver-major
337-
commit-message:
338-
prefix: '[release/8.0] '
339-
groups:
340-
runtime-dependencies:
341-
patterns:
342-
- Microsoft.Extensions.*
343-
- Microsoft.NETCore.DotNetHost
344-
- System.Text.Json

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"args": {
1515
"fileName": "${workspaceFolder}/eng/branch-vscode-config",
1616
"key": "TFM",
17-
"default": "net6.0"
17+
"default": "net9.0"
1818
}
1919
}
2020
],

NuGet.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
<!-- Begin: Package sources from dotnet-runtime -->
1515
<!-- End: Package sources from dotnet-runtime -->
1616
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
17-
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
18-
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
19-
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
2017
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
2118
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
2219
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />

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;$(LatestTargetFramework)</TestTargetFrameworks>
30+
<TestTargetFrameworks>net8.0;$(LatestTargetFramework)</TestTargetFrameworks>
3131
<!-- The TFM for generating schema.json and OpenAPI docs. -->
32-
<SchemaTargetFramework>net9.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
</PropertyGroup>
@@ -88,23 +83,6 @@
8883
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
8984
<MicrosoftDiagnosticsTracingTraceEventVersion>3.0.7</MicrosoftDiagnosticsTracingTraceEventVersion>
9085
</PropertyGroup>
91-
<PropertyGroup Label=".NET 6 Dependent" Condition=" '$(TargetFramework)' == 'net6.0' ">
92-
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp60Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
93-
<MicrosoftAspNetCoreAuthenticationNegotiateVersion>$(MicrosoftAspNetCoreApp60Version)</MicrosoftAspNetCoreAuthenticationNegotiateVersion>
94-
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions60Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
95-
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging60Version)</MicrosoftExtensionsLoggingVersion>
96-
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions60Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
97-
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole60Version)</MicrosoftExtensionsLoggingConsoleVersion>
98-
<SystemTextJsonVersion>$(SystemTextJson80Version)</SystemTextJsonVersion>
99-
</PropertyGroup>
100-
<PropertyGroup Label=".NET 7 Dependent" Condition=" '$(TargetFramework)' == 'net7.0' ">
101-
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp70Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
102-
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions70Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
103-
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging70Version)</MicrosoftExtensionsLoggingVersion>
104-
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions70Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
105-
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole70Version)</MicrosoftExtensionsLoggingConsoleVersion>
106-
<SystemTextJsonVersion>$(SystemTextJson80Version)</SystemTextJsonVersion>
107-
</PropertyGroup>
10886
<PropertyGroup Label=".NET 8 Dependent" Condition=" '$(TargetFramework)' == 'net8.0' ">
10987
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp80Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
11088
<MicrosoftAspNetCoreAuthenticationNegotiateVersion>$(MicrosoftAspNetCoreApp80Version)</MicrosoftAspNetCoreAuthenticationNegotiateVersion>

eng/dependabot/Versions.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<Project>
22
<Import Project="independent/Versions.props" />
33
<Import Project="nuget.org/Versions.props" />
4-
<Import Project="net6.0/Versions.props" />
5-
<Import Project="net7.0/Versions.props" />
64
<Import Project="net8.0/Versions.props" />
75
<Import Project="net9.0/Versions.props" />
8-
<Import Project="netcoreapp3.1/Versions.props" />
96
</Project>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- This isn't a real project, but Dependabot requires a project. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66
</Project>

eng/dependabot/net6.0/Directory.Build.props

Lines changed: 0 additions & 5 deletions
This file was deleted.

eng/dependabot/net6.0/NuGet.config

Lines changed: 0 additions & 1 deletion
This file was deleted.

eng/dependabot/net6.0/Packages.props

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)