Skip to content

Commit 65c1246

Browse files
SimonZhao888SimonZhao888
authored
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#50077)
2 parents 12e4b48 + e7ce960 commit 65c1246

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ 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;7.0" />
24+
<_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;6.0;7.0" />
2525
</ItemGroup>
2626
<PropertyGroup>
27-
<_MinimumNonEolSupportedNetCoreTargetFramework>net6.0</_MinimumNonEolSupportedNetCoreTargetFramework>
27+
<_MinimumNonEolSupportedNetCoreTargetFramework>net8.0</_MinimumNonEolSupportedNetCoreTargetFramework>
2828
</PropertyGroup>
2929

3030
<Target Name="_CheckForEolTargetFrameworks" AfterTargets="_CheckForUnsupportedNETCoreVersion"

‎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("net6.0")]
1819
[InlineData("net7.0")]
1920
public void It_warns_that_framework_is_out_of_support(string targetFrameworks)
2021
{

‎src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ public void ILLink_analyzer_warnings_are_produced_using_EnableSingleFileAnalyzer
656656
[InlineData("netstandard2.0", true)]
657657
[InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for single-file
658658
[InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for single-file and targeting.
659-
[InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs.
659+
[InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for single-file
660660
[InlineData("alias-ns2", true)]
661661
[InlineData("alias-n6", false)]
662662
[InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases.
@@ -669,18 +669,19 @@ public void EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted
669669
TargetFrameworks = targetFrameworks
670670
};
671671
testProject.AdditionalProperties["EnableSingleFileAnalyzer"] = "true";
672+
testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs
672673
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks)
673674
.WithProjectChanges(AddTargetFrameworkAliases);
674-
675+
675676
var buildCommand = new BuildCommand(testAsset);
676-
var resultAssertion = buildCommand.Execute("/bl:my.binlog")
677+
var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false")
677678
.Should().Pass();
678679
if (shouldWarn) {
679680
// Note: can't check for Strings.EnableSingleFileAnalyzerUnsupported because each line of
680681
// the message gets prefixed with a file path by MSBuild.
681682
resultAssertion
682683
.And.HaveStdOutContaining($"warning NETSDK1211")
683-
.And.HaveStdOutContaining($"<EnableSingleFileAnalyzer Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))\">true</EnableSingleFileAnalyzer>");
684+
.And.HaveStdOutContaining($"<EnableSingleFileAnalyzer Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))\">true</EnableSingleFileAnalyzer>");
684685
} else {
685686
resultAssertion.And.NotHaveStdOutContaining($"warning");
686687
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ public void IsAotCompatible_implies_enable_analyzers(string targetFramework)
594594
[InlineData("netstandard2.0", true)]
595595
[InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for AOT
596596
[InlineData("netstandard2.0;net7.0", false)] // Net7.0 is the min TFM supported for AOT and targeting.
597-
[InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for AOT, but leaves a "gap" for the supported net7.0 TFMs.
597+
[InlineData("netstandard2.0;net8.0", false)] // net8.0 is supported for AOT and targeting.
598598
[InlineData("alias-ns2", true)]
599599
[InlineData("alias-n6", false)]
600600
[InlineData("alias-n7;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases.
@@ -609,18 +609,19 @@ public void IsAotCompatible_warns_when_expected_for_not_correctly_multitarget_li
609609
TargetFrameworks = targetFrameworks
610610
};
611611
testProject.AdditionalProperties["IsAotCompatible"] = "true";
612+
testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs
612613
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks)
613614
.WithProjectChanges(AddTargetFrameworkAliases);
614615

615616
var buildCommand = new BuildCommand(testAsset);
616-
var resultAssertion = buildCommand.Execute()
617+
var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false")
617618
.Should().Pass();
618619
if (shouldWarn) {
619620
resultAssertion
620621
// Note: can't check for Strings.IsAotCompatibleUnsupported because each line of
621622
// the message gets prefixed with a file path by MSBuild.
622623
.And.HaveStdOutContaining($"warning NETSDK1210")
623-
.And.HaveStdOutContaining($"<IsAotCompatible Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))\">true</IsAotCompatible>");
624+
.And.HaveStdOutContaining($"<IsAotCompatible Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))\">true</IsAotCompatible>");
624625
} else {
625626
resultAssertion.And.NotHaveStdOutContaining($"warning");
626627
}

‎src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ public void PublishTrimmed_fails_for_unsupported_target_framework(string targetF
169169
[InlineData("netstandard2.0", true)]
170170
[InlineData("netstandard2.1", true)]
171171
[InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for trimming
172-
[InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for trimming and targeting.
173-
[InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for trimming, but leaves a "gap" for the supported net6.0/net7.0 TFMs.
172+
[InlineData("netstandard2.0;net6.0", false)] // net6.0 is the min TFM supported for trimming and targeting.
173+
[InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for trimming and targeting.
174174
[InlineData("alias-ns2", true)]
175175
[InlineData("alias-n6", false)]
176176
[InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases.
@@ -182,18 +182,19 @@ public void IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libr
182182

183183
var testProject = CreateTestProjectForILLinkTesting(targetFrameworks, projectName);
184184
testProject.AdditionalProperties["IsTrimmable"] = "true";
185+
testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs
185186
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks)
186187
.WithProjectChanges(AddTargetFrameworkAliases);
187188

188189
var buildCommand = new BuildCommand(testAsset);
189-
var resultAssertion = buildCommand.Execute()
190+
var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false")
190191
.Should().Pass();
191192
if (shouldWarn) {
192193
resultAssertion
193194
// Note: can't check for Strings.IsTrimmableUnsupported because each line of
194195
// the message gets prefixed with a file path by MSBuild.
195196
.And.HaveStdOutContaining($"warning NETSDK1212")
196-
.And.HaveStdOutContaining($"<IsTrimmable Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))\">true</IsTrimmable>");
197+
.And.HaveStdOutContaining($"<IsTrimmable Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))\">true</IsTrimmable>");
197198
} else {
198199
resultAssertion.And.NotHaveStdOutContaining($"warning");
199200
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ public async void FeaturesSupport(
385385
string finalProjectName = Path.Combine(projectDir, $"{projName}.{extension}");
386386

387387
Dictionary<string, string> environmentUnderTest = new() { ["DOTNET_NOLOGO"] = false.ToString() };
388+
environmentUnderTest["CheckEolTargetFramework"] = false.ToString();
388389
TestContext.Current.AddTestEnvironmentVariables(environmentUnderTest);
389390

390391
TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: name)
@@ -419,7 +420,7 @@ public async void FeaturesSupport(
419420
{
420421
new DotnetBuildCommand(_log, "MyProject")
421422
.WithWorkingDirectory(workingDir)
422-
.Execute()
423+
.Execute("/p:CheckEolTargetFramework=false")
423424
.Should()
424425
.Pass()
425426
.And.NotHaveStdErr();

0 commit comments

Comments
 (0)