Skip to content

Commit 65fc05a

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/8.0.4xx' into internal-merge-8.0.4xx-2025-08-06-0848
2 parents 3a960ae + 1605e86 commit 65fc05a

File tree

11 files changed

+58
-36
lines changed

11 files changed

+58
-36
lines changed

‎.vsts-ci.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ resources:
5454
ref: refs/tags/release
5555

5656
extends:
57-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
57+
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
58+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
59+
${{ else }}:
60+
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
5861
parameters:
5962
sdl:
6063
sourceAnalysisPool:

‎NuGet.config‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
77
<add key="darc-pub-dotnet-emsdk-6fd14a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-emsdk-6fd14a4-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46-3/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-emsdk-6fd14a4-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46-2/nuget/v3/index.json" />
810
<add key="darc-pub-dotnet-emsdk-6fd14a4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46-1/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-emsdk -->
1012
<!-- Begin: Package sources from dotnet-format -->
@@ -16,6 +18,8 @@
1618
<!-- End: Package sources from dotnet-format -->
1719
<!-- Begin: Package sources from dotnet-aspnetcore -->
1820
<add key="darc-int-dotnet-aspnetcore-277e317" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-aspnetcore-277e317-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d-2/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-aspnetcore-277e317-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d-1/nuget/v3/index.json" />
1923
<!-- End: Package sources from dotnet-aspnetcore -->
2024
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
2125
<add key="darc-pub-DotNet-msbuild-Trusted-286d171" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-286d1713/nuget/v3/index.json" />
@@ -24,12 +28,16 @@
2428
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2529
<!-- Begin: Package sources from dotnet-runtime -->
2630
<add key="darc-int-dotnet-runtime-fce8ed9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90/nuget/v3/index.json" />
31+
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-2/nuget/v3/index.json" />
32+
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-1/nuget/v3/index.json" />
2733
<!-- End: Package sources from dotnet-runtime -->
2834
<!-- Begin: Package sources from dotnet-templating -->
29-
<add key="darc-pub-dotnet-templating-99c3700" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-99c37009/nuget/v3/index.json" />
35+
<add key="darc-pub-dotnet-templating-9b452dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9b452ddd/nuget/v3/index.json" />
3036
<!-- End: Package sources from dotnet-templating -->
3137
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3238
<add key="darc-int-dotnet-windowsdesktop-5fa74c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5fa74c83/nuget/v3/index.json" />
39+
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5fa74c83-2/nuget/v3/index.json" />
40+
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5fa74c83-1/nuget/v3/index.json" />
3341
<!-- End: Package sources from dotnet-windowsdesktop -->
3442
<!-- Begin: Package sources from dotnet-winforms -->
3543
<!-- End: Package sources from dotnet-winforms -->
@@ -56,16 +64,22 @@
5664
<!-- Begin: Package sources from dotnet-templating -->
5765
<!-- End: Package sources from dotnet-templating -->
5866
<!-- Begin: Package sources from dotnet-aspnetcore -->
67+
<add key="darc-int-dotnet-aspnetcore-277e317-1" value="true" />
68+
<add key="darc-int-dotnet-aspnetcore-277e317-2" value="true" />
5969
<add key="darc-int-dotnet-aspnetcore-277e317" value="true" />
70+
<!-- End: Package sources from dotnet-aspnetcore -->
6071
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
6172
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6273
<!-- Begin: Package sources from dotnet-format -->
6374
<!-- End: Package sources from dotnet-format -->
64-
<!-- End: Package sources from dotnet-aspnetcore -->
6575
<!-- Begin: Package sources from dotnet-runtime -->
76+
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="true" />
77+
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="true" />
6678
<add key="darc-int-dotnet-runtime-fce8ed9" value="true" />
6779
<!-- End: Package sources from dotnet-runtime -->
6880
<!-- Begin: Package sources from dotnet-windowsdesktop -->
81+
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-1" value="true" />
82+
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-2" value="true" />
6983
<add key="darc-int-dotnet-windowsdesktop-5fa74c8" value="true" />
7084
<!-- Begin: Package sources from dotnet-winforms -->
7185
<!-- End: Package sources from dotnet-winforms -->

‎eng/Version.Details.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.414">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>99c37009221081cb8ba4edc41411f81532cf6554</Sha>
6+
<Sha>9b452ddd4f2c1e62e373bfe6530f7970f24401d9</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.414-servicing.25404.12">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.414-servicing.25407.10">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>99c37009221081cb8ba4edc41411f81532cf6554</Sha>
10+
<Sha>9b452ddd4f2c1e62e373bfe6530f7970f24401d9</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.414-servicing.25404.12">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.414-servicing.25407.10">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>99c37009221081cb8ba4edc41411f81532cf6554</Sha>
14+
<Sha>9b452ddd4f2c1e62e373bfe6530f7970f24401d9</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.19">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25378.1">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
496+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25378.1">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25407.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
501+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25378.1">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25407.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
505+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25378.1">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25407.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
509+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25378.1</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25407.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -149,7 +149,7 @@
149149
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
150150
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
151151
<!-- test dependencies -->
152-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.414-servicing.25404.12</MicrosoftTemplateEngineMocksPackageVersion>
152+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.414-servicing.25407.10</MicrosoftTemplateEngineMocksPackageVersion>
153153
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
154154
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
155155
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -215,7 +215,7 @@
215215
<PropertyGroup>
216216
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
217217
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
218-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25378.1</MicrosoftDotNetXUnitExtensionsVersion>
218+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25407.1</MicrosoftDotNetXUnitExtensionsVersion>
219219
<MoqPackageVersion>4.18.4</MoqPackageVersion>
220220
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
221221
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.117",
3+
"dotnet": "8.0.119",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25378.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1"
1919
}
2020
}

‎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
}

0 commit comments

Comments
 (0)