Skip to content

Commit a359a4c

Browse files
authored
Expand EOL list to include net7 6 months after it goes OOS per design (#43440)
2 parents 5811dfc + 9522277 commit a359a4c

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2121
receive servicing updates and security fixes.
2222
-->
2323
<ItemGroup>
24-
<_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0" />
24+
<_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;7.0" />
2525
</ItemGroup>
2626
<PropertyGroup>
2727
<_MinimumNonEolSupportedNetCoreTargetFramework>net6.0</_MinimumNonEolSupportedNetCoreTargetFramework>

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public GivenThatWeWantToTargetEolFrameworks(ITestOutputHelper log) : base(log)
1515
[InlineData("netcoreapp3.0")]
1616
[InlineData("netcoreapp3.1")]
1717
[InlineData("net5.0")]
18+
[InlineData("net7.0")]
1819
public void It_warns_that_framework_is_out_of_support(string targetFrameworks)
1920
{
2021
var testProject = new TestProject()

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
4343

4444
var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
4545
publishCommand
46-
.Execute($"/p:UseCurrentRuntimeIdentifier=true", "/p:SelfContained=true")
46+
.Execute($"/p:UseCurrentRuntimeIdentifier=true", "/p:SelfContained=true", "/p:CheckEolTargetFramework=false")
4747
.Should().Pass()
4848
.And.NotHaveStdOutContaining("IL2026")
4949
.And.NotHaveStdErrContaining("NETSDK1179")
@@ -87,7 +87,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_false(string t
8787

8888
var publishCommand = new PublishCommand(testAsset);
8989
publishCommand
90-
.Execute($"/p:RuntimeIdentifier={rid}", "/p:SelfContained=true")
90+
.Execute($"/p:RuntimeIdentifier={rid}", "/p:SelfContained=true", "/p:CheckEolTargetFramework=false")
9191
.Should().Pass()
9292
.And.NotHaveStdOutContaining("IL2026")
9393
.And.NotHaveStdErrContaining("NETSDK1179")

src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ public async void AotVariants(string name, string language)
230230

231231
var templatesToTest = new[]
232232
{
233-
new { Template = consoleTemplateShortname, Frameworks = new[] { null, "net6.0", "net7.0", "net8.0" } },
234-
new { Template = "classlib", Frameworks = new[] { null, "net6.0", "net7.0", "net8.0", "netstandard2.0", "netstandard2.1" } }
233+
new { Template = consoleTemplateShortname, Frameworks = new[] { null, "net6.0", "net8.0" } },
234+
new { Template = "classlib", Frameworks = new[] { null, "net6.0", "net8.0", "netstandard2.0", "netstandard2.1" } }
235235
};
236236

237237
//features: top-level statements; nullables; implicit usings; filescoped namespaces
@@ -240,9 +240,9 @@ public async void AotVariants(string name, string language)
240240
//C# 12 is not supported yet - https://github.com/dotnet/sdk/issues/29195
241241
string?[] supportedLanguageVersions = { null, "ISO-2", "2", "3", "4", "5", "6", "7", "7.1", "7.2", "7.3", "8.0", "9.0", "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" };
242242

243-
string?[] nullableSupportedInFrameworkByDefault = { null, "net6.0", "net7.0", "net8.0", "netstandard2.1" };
244-
string?[] implicitUsingsSupportedInFramework = { null, "net6.0", "net7.0", "net8.0" };
245-
string?[] fileScopedNamespacesSupportedFrameworkByDefault = { null, "net6.0", "net7.0", "net8.0" };
243+
string?[] nullableSupportedInFrameworkByDefault = { null, "net6.0", "net8.0", "netstandard2.1" };
244+
string?[] implicitUsingsSupportedInFramework = { null, "net6.0", "net8.0" };
245+
string?[] fileScopedNamespacesSupportedFrameworkByDefault = { null, "net6.0", "net8.0" };
246246

247247
string?[] nullableSupportedLanguages = { "8.0", "9.0", "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" };
248248
string?[] topLevelStatementSupportedLanguages = { null, "9.0", "10.0", "11", "11.0", /*"12",*/ "latest", "latestMajor", "default", "preview" };

0 commit comments

Comments
 (0)