Skip to content

Commit c94f010

Browse files
SimonZhao888SimonZhao888
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#50076)
2 parents 65fd998 + a83a66c commit c94f010

File tree

10 files changed

+29
-22
lines changed

10 files changed

+29
-22
lines changed

‎src/SourceBuild/content/eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25263.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
7+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

‎src/SourceBuild/content/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
2424
are not necessary, and this property is removed from the file.
2525
-->
26-
<PrivateSourceBuiltSdkVersion>9.0.107</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.107-servicing.25270.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.108</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.108-servicing.25317.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->

‎src/SourceBuild/content/global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.107"
3+
"dotnet": "9.0.108"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2"
99
}
1010
}

‎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/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Reference Include="System.Net.Http" />
3636
<Reference Include="System.Xml" />
3737
<PackageReference Include="Microsoft.Web.Deployment" />
38-
<PackageReference Include="System.Text.Json" />
38+
<PackageReference Include="System.Text.Json" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
3939
</ItemGroup>
4040
<ItemGroup>
4141
<Compile Include="**\*.cs" />

‎test/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
{

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,8 @@ public void PublishSingleFile_fails_for_unsupported_target_framework(string targ
734734
[InlineData("net6.0", false)]
735735
[InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for single-file
736736
[InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for single-file and targeting.
737-
[InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs.
737+
[InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for single-file
738+
[InlineData("netstandard2.0;net9.0", true)] // Net9.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs.
738739
[InlineData("alias-ns2", true)]
739740
[InlineData("alias-n6", false)]
740741
[InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases.
@@ -747,18 +748,19 @@ public void EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted
747748
TargetFrameworks = targetFrameworks
748749
};
749750
testProject.AdditionalProperties["EnableSingleFileAnalyzer"] = "true";
751+
testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs
750752
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks)
751753
.WithProjectChanges(AddTargetFrameworkAliases);
752-
754+
753755
var buildCommand = new BuildCommand(testAsset);
754-
var resultAssertion = buildCommand.Execute("/bl:my.binlog")
756+
var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false")
755757
.Should().Pass();
756758
if (shouldWarn) {
757759
// Note: can't check for Strings.EnableSingleFileAnalyzerUnsupported because each line of
758760
// the message gets prefixed with a file path by MSBuild.
759761
resultAssertion
760762
.And.HaveStdOutContaining($"warning NETSDK1211")
761-
.And.HaveStdOutContaining($"<EnableSingleFileAnalyzer Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))\">true</EnableSingleFileAnalyzer>");
763+
.And.HaveStdOutContaining($"<EnableSingleFileAnalyzer Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))\">true</EnableSingleFileAnalyzer>");
762764
} else {
763765
resultAssertion.And.NotHaveStdOutContaining($"warning");
764766
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,8 @@ public void PublishAot_fails_for_unsupported_target_framework(string targetFrame
630630
[InlineData("net7.0", false)]
631631
[InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for AOT
632632
[InlineData("netstandard2.0;net7.0", false)] // Net7.0 is the min TFM supported for AOT and targeting.
633-
[InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for AOT, but leaves a "gap" for the supported net7.0 TFMs.
633+
[InlineData("netstandard2.0;net8.0", false)] // net8.0 is supported for AOT and targeting.
634+
[InlineData("netstandard2.0;net9.0", true)] // Net9.0 is supported for AOT, but leaves a "gap" for the supported net8.0 TFMs.
634635
[InlineData("alias-ns2", true)]
635636
[InlineData("alias-n6", true)]
636637
[InlineData("alias-n7", false)]
@@ -646,18 +647,19 @@ public void IsAotCompatible_warns_when_expected_for_not_correctly_multitarget_li
646647
TargetFrameworks = targetFrameworks
647648
};
648649
testProject.AdditionalProperties["IsAotCompatible"] = "true";
650+
testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs
649651
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks)
650652
.WithProjectChanges(AddTargetFrameworkAliases);
651653

652654
var buildCommand = new BuildCommand(testAsset);
653-
var resultAssertion = buildCommand.Execute()
655+
var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false")
654656
.Should().Pass();
655657
if (shouldWarn) {
656658
resultAssertion
657659
// Note: can't check for Strings.IsAotCompatibleUnsupported because each line of
658660
// the message gets prefixed with a file path by MSBuild.
659661
.And.HaveStdOutContaining($"warning NETSDK1210")
660-
.And.HaveStdOutContaining($"<IsAotCompatible Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))\">true</IsAotCompatible>");
662+
.And.HaveStdOutContaining($"<IsAotCompatible Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))\">true</IsAotCompatible>");
661663
} else {
662664
resultAssertion.And.NotHaveStdOutContaining($"warning");
663665
}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,9 @@ public void PublishTrimmed_fails_for_unsupported_target_framework(string targetF
185185
[InlineData("net5.0", true)]
186186
[InlineData("net6.0", false)]
187187
[InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for trimming
188-
[InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for trimming and targeting.
189-
[InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for trimming, but leaves a "gap" for the supported net6.0/net7.0 TFMs.
188+
[InlineData("netstandard2.0;net6.0", false)] // net6.0 is the min TFM supported for trimming and targeting.
189+
[InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for trimming and targeting.
190+
[InlineData("netstandard2.0;net9.0", true)] // Net8.0 is supported for trimming, but leaves a "gap" for the supported net6.0/net7.0 TFMs.
190191
[InlineData("alias-ns2", true)]
191192
[InlineData("alias-n6", false)]
192193
[InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases.
@@ -198,19 +199,19 @@ public void IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libr
198199

199200
var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFrameworks, projectName);
200201
testProject.AdditionalProperties["IsTrimmable"] = "true";
201-
testProject.AdditionalProperties["NoWarn"] = "NETSDK1138"; // Silence warning about targeting EOL TFMs
202+
testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs
202203
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks)
203204
.WithProjectChanges(AddTargetFrameworkAliases);
204205

205206
var buildCommand = new BuildCommand(testAsset);
206-
var resultAssertion = buildCommand.Execute()
207+
var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false")
207208
.Should().Pass();
208209
if (shouldWarn) {
209210
resultAssertion
210211
// Note: can't check for Strings.IsTrimmableUnsupported because each line of
211212
// the message gets prefixed with a file path by MSBuild.
212213
.And.HaveStdOutContaining($"warning NETSDK1212")
213-
.And.HaveStdOutContaining($"<IsTrimmable Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))\">true</IsTrimmable>");
214+
.And.HaveStdOutContaining($"<IsTrimmable Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))\">true</IsTrimmable>");
214215
} else {
215216
resultAssertion.And.NotHaveStdOutContaining($"warning");
216217
}

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

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

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

391392
TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: name)
@@ -420,7 +421,7 @@ public async Task FeaturesSupport(
420421
{
421422
new DotnetBuildCommand(_log, "MyProject")
422423
.WithWorkingDirectory(workingDir)
423-
.Execute()
424+
.Execute("/p:CheckEolTargetFramework=false")
424425
.Should()
425426
.Pass()
426427
.And.NotHaveStdErr();

0 commit comments

Comments
 (0)