Support .NET 9 #10593

martincostello · 2024-09-12T14:17:43Z

What are you trying to accomplish?

Support .NET 9 by installing both the STS and LTS releases of .NET.

Relates to #10496, but doesn't resolve it in the general case (i.e. it won't work for .NET 10).

Anything you want to highlight for special attention from reviewers?

As .NET 9 is in RC and not "official" yet, I figured the least risky option (at the expense of increasing the image size) was to install both .NET 8 and .NET 9. These could then be updated on alternate years (LTS changes to 10 next year, STS changes to 11 in 2026, etc.)

The .NET 9 SDK also makes NuGet Audit enabled by default and breaks package restore when vulnerable packages are in the dependency tree. I've resolved that for building NuGetUpdated, but it might occur when upgrading users' own projects. I couldn't see an obvious place in the code to change the tool to set NuGetAudit=false to avoid that when updating packages. I did do a search for NoWarn, but those all seemed to be in projects being built rather than when invoking the tool.

How will you know you've accomplished your goal?

Dependabot can update NuGet packages for projects targeting net9.0.

Checklist

I have run the complete test suite to ensure all tests and linters pass.
I have thoroughly tested my code changes to ensure they work as expected, including adding additional tests for new functionality.
I have written clear and descriptive commit messages.
I have provided a detailed description of the changes in the pull request, including the problem it addresses, how it fixes the problem, and any relevant details about the implementation.
I have ensured that the code is well-documented and easy to understand.

Support .NET 9 by installing both the STS and LTS releases of .NET.

martincostello · 2024-09-12T14:21:33Z

From the tests' Docker build:

#9 [ 4/10] RUN dotnet --list-runtimes
#9 0.185 Microsoft.AspNetCore.App 8.0.8 [/usr/local/dotnet/current/shared/Microsoft.AspNetCore.App]
#9 0.185 Microsoft.AspNetCore.App 9.0.0-rc.1.24452.1 [/usr/local/dotnet/current/shared/Microsoft.AspNetCore.App]
#9 0.185 Microsoft.NETCore.App 8.0.8 [/usr/local/dotnet/current/shared/Microsoft.NETCore.App]
#9 0.185 Microsoft.NETCore.App 9.0.0-rc.1.24431.7 [/usr/local/dotnet/current/shared/Microsoft.NETCore.App]
#9 DONE 0.2s

#10 [ 5/10] RUN dotnet --list-sdks
#10 0.212 8.0.401 [/usr/local/dotnet/current/sdk]
#10 0.212 9.0.100-rc.1.24452.12 [/usr/local/dotnet/current/sdk]
#10 DONE 0.2s

Try to fix warnings building NuGetUpdater with the .NET 9 SDK from NuGet Audit.

Disable NuGet audit when running the native C# tests, as they don't seem to otherwise obey the changes in Directory.Build.props of the project itself.

martincostello · 2024-09-12T15:39:31Z

I'm going to move this out of draft so that someone who knows Ruby and the repo layout can point me at where I need to make the changes to make the build happy.

Update tests for the changes to the output format of `dotnet test` in .NET 9.

Forcibly enable the terminal logger in CI so the expected test output is present.

Attempt to run the tests with the .NET 8 SDK instead of .NET 9 to see if it fixes the failing tests.

Add cwd.

Account for extra parameter.

Revert to the expected output for .NET 8 SDK.

martincostello · 2024-09-21T12:02:48Z

Changing the C# tests to run in the current working directory of NuGetUpdater to force it to use the .NET SDK from global.json instead of rolling forward to the .NET 9 SDK has fixed one of the tests, but 4 tests are failing for NuGetUpdater.Core.Test for some reason I need to dig into.

- Fix tests broken by error about usage of CPVM. - Update Microsoft.Windows.SDK.NET.Ref version.

Add missing line to expected contents.

Add the C# Dev Kit extension to the devcontainers.

Install the .NET 9 SDK in the devcontainer.

Update NuGetUpdater to target .NET 9 so that tests can test compatibility with `net9.0`.

martincostello · 2024-09-21T15:44:40Z

nuget/helpers/lib/NuGetUpdater/Directory.Common.props

@@ -9,7 +9,7 @@
            NuGetUpdater\NuGetUpdater.Core\FrameworkChecker\SupportedFrameworks.cs
      2. Update tests as needed at `NuGetUpdater\NuGetUpdater.Core.Test\FrameworkChecker\CompatibilityCheckerFacts.cs`
    -->
-    <CommonTargetFramework>net8.0</CommonTargetFramework>
+    <CommonTargetFramework>net9.0</CommonTargetFramework>


Despite the comments above, the referenced files haven't been updated to explicitly add net9.0, and the changes for .NET 8 were only made 6 months ago, way after it was released: NuGet/NuGetGallery#9858

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Update.cs

martincostello · 2024-09-21T15:45:58Z

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.Sdk.cs

@@ -244,7 +249,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                    MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
                    MockNuGetPackage.CreateSimplePackage("Some.Package", "13.0.1", "net8.0"),
                    // necessary for the `net8.0-windows10.0.19041.0` TFM
-                    new("Microsoft.Windows.SDK.NET.Ref", "10.0.19041.31", Files:
+                    new("Microsoft.Windows.SDK.NET.Ref", "10.0.19041.34", Files:


The latest .NET 8 SDK bumps this version, so it's been updated so the tests can find the package in the local cache.

martincostello · 2024-09-21T15:48:32Z

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.Sdk.cs

@@ -186,6 +187,7 @@ await TestUpdateForProject("Some.Package", "12.0.1", "13.0.1",
                projectContents: $"""
                    <Project Sdk="Microsoft.NET.Sdk">
                      <PropertyGroup>
+                        <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>


The change to force the ruby tests for C# to use the version of the .NET SDK in global.json for NuGetUpdater cause an error that package versions shouldn't be used in projects using central package management. I think this is because the build then picks up the Directory.Packages.props file in that directory despite the test project not being in the directory tree of that file.

Update script to build for .NET 9.

martincostello · 2024-09-21T15:54:34Z

nuget/helpers/build

@@ -32,7 +32,7 @@ cd "$install_dir/lib/NuGetUpdater/NuGetUpdater.Cli"
 dotnet publish \
    --configuration Release \
    --output "$install_dir/NuGetUpdater" \
-    --framework net8.0 \
+    --framework net9.0 \


To test net9.0, the tests have to target net9.0 due to this logic for setting up the local package repository used in the tests:

dependabot-core/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/MockNuGetPackage.cs

Lines 332 to 337 in fa8d392

// find the actual SDK directory

string privateCoreLibPath = typeof(object).Assembly.Location; // e.g., C:\Program Files\dotnet\shared\Microsoft.NETCore.App\8.0.4\System.Private.CoreLib.dll

string sdkDirectory = Path.Combine(Path.GetDirectoryName(privateCoreLibPath)!, "..", "..", "..", "sdk", sdkVersionString); // e.g., C:\Program Files\dotnet\sdk\8.0.204

string bundledVersionsPropsPath = Path.Combine(sdkDirectory, "Microsoft.NETCoreSdk.BundledVersions.props");

FileInfo normalizedPath = new(bundledVersionsPropsPath);

return normalizedPath.FullName;

Otherwise the file read doesn't contain support for .NET 9, and then the local package repo doesn't contain any of the required fake packages and dotnet restore fails for net9.0 projects.

Update the assertions for the Ruby tests for C# to account for the behaviour changes for the new terminal logger.

martincostello · 2024-09-21T16:12:27Z

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.Sdk.cs

@@ -16,6 +16,7 @@ public class Sdk : UpdateWorkerTestBase
        [InlineData("net472")]
        [InlineData("net7.0")]
        [InlineData("net8.0")]
+        [InlineData("net9.0")]


If this test were skipped, the need to update NuGetUpdater to net9.0 itself can be reverted. Otherwise, the tests need reworking in some way to discover .NET SDK versions without relying on the exact version of .NET the tests are executing with.

martincostello · 2024-09-26T17:13:47Z

@brettfo Should I abandon this PR?

It looks like changes you've made in #10521 (specifically this bit) will have the stuff you're working on install the SDK in global.json if it's not installed, and would also resolve #10496 for arbitrary versions of .NET going forwards.

brettfo · 2024-09-26T17:59:04Z

@martincostello I think this PR is still needed. The changes in #10521 aren't active yet, that's just the skeleton for longer term future work. I marked one place where a PR that's about to get merged will conflict with this, but it's a minor fix.

martincostello · 2024-09-26T18:02:19Z

@brettfo Thanks - once that's merged I'll rebase this.

brettfo · 2024-10-01T21:06:53Z

@martincostello The other PRs have all been merged. Can you update this on the latest main? There should be 2 conflicts: 1 right before ProcessEx.RunAsync is called; the function was changed to take IEnumerable<string> arguments instead of string arguments, and another conflict in nuget/Dockerfile; we're now installing PowerShell and rearranged slightly.

martincostello · 2024-10-02T07:42:34Z

@brettfo Should be good now.

martincostello · 2024-10-03T06:17:14Z

My .NET 9 repos are now generating dependabot PRs again 🎉 (e.g. martincostello/costellobot#1736)

Support .NET 9

78ef6fe

Support .NET 9 by installing both the STS and LTS releases of .NET.

github-actions bot added the L: dotnet:nuget NuGet packages via nuget or dotnet label Sep 12, 2024

martincostello added 2 commits September 12, 2024 15:54

Fix NuGet audit warnings

f2b2f3f

Try to fix warnings building NuGetUpdater with the .NET 9 SDK from NuGet Audit.

Disable NuGet audit

6ee5c6e

Disable NuGet audit when running the native C# tests, as they don't seem to otherwise obey the changes in Directory.Build.props of the project itself.

martincostello marked this pull request as ready for review September 12, 2024 15:39

martincostello requested a review from a team as a code owner September 12, 2024 15:39

martincostello added 4 commits September 21, 2024 09:49

Update expected test output

12199cd

Update tests for the changes to the output format of `dotnet test` in .NET 9.

Enable terminal logger

79b8813

Forcibly enable the terminal logger in CI so the expected test output is present.

Merge branch 'main' into dotnet-9

630c228

Run tests with .NET 8 SDK

dd2acae

Attempt to run the tests with the .NET 8 SDK instead of .NET 9 to see if it fixes the failing tests.

martincostello requested a review from a team as a code owner September 21, 2024 11:17

martincostello added 2 commits September 21, 2024 11:19

Fix type annotations

ece057b

Add cwd.

Update specs

cd4fa52

Account for extra parameter.

github-actions bot added the L: github:actions GitHub Actions label Sep 21, 2024

Revert expected output

54984f3

Revert to the expected output for .NET 8 SDK.

martincostello added 5 commits September 21, 2024 13:40

Fix tests

b79b55d

- Fix tests broken by error about usage of CPVM. - Update Microsoft.Windows.SDK.NET.Ref version.

Fix test

7c9c796

Add missing line to expected contents.

Add C# Dev Kit

9f620d4

Add the C# Dev Kit extension to the devcontainers.

Add .NET 9 to devcontainer

c452545

Install the .NET 9 SDK in the devcontainer.

Update to .NET 9

3e0cb4b

Update NuGetUpdater to target .NET 9 so that tests can test compatibility with `net9.0`.

martincostello commented Sep 21, 2024

View reviewed changes

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Update.cs Outdated Show resolved Hide resolved

martincostello commented Sep 21, 2024

View reviewed changes

Update target framework

97c41dc

Update script to build for .NET 9.

martincostello commented Sep 21, 2024

View reviewed changes

Update assertion for terminal logger

27ef275

Update the assertions for the Ruby tests for C# to account for the behaviour changes for the new terminal logger.

martincostello commented Sep 21, 2024

View reviewed changes

brettfo approved these changes Sep 26, 2024

View reviewed changes

Merge branch 'main' into dotnet-9

63b57cf

thavaahariharangit approved these changes Oct 2, 2024

View reviewed changes

thavaahariharangit merged commit 03aa6dc into dependabot:main Oct 2, 2024
109 checks passed

martincostello deleted the dotnet-9 branch October 2, 2024 16:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support .NET 9 #10593

Support .NET 9 #10593

martincostello commented Sep 12, 2024 •

edited

Loading

martincostello commented Sep 12, 2024 •

edited

Loading

martincostello commented Sep 12, 2024

martincostello commented Sep 21, 2024

martincostello Sep 21, 2024

martincostello Sep 21, 2024

martincostello Sep 21, 2024

martincostello Sep 21, 2024

martincostello Sep 21, 2024 •

edited

Loading

martincostello commented Sep 26, 2024

brettfo commented Sep 26, 2024

martincostello commented Sep 26, 2024

brettfo commented Oct 1, 2024

martincostello commented Oct 2, 2024

martincostello commented Oct 3, 2024

	// find the actual SDK directory
	string privateCoreLibPath = typeof(object).Assembly.Location; // e.g., C:\Program Files\dotnet\shared\Microsoft.NETCore.App\8.0.4\System.Private.CoreLib.dll
	string sdkDirectory = Path.Combine(Path.GetDirectoryName(privateCoreLibPath)!, "..", "..", "..", "sdk", sdkVersionString); // e.g., C:\Program Files\dotnet\sdk\8.0.204
	string bundledVersionsPropsPath = Path.Combine(sdkDirectory, "Microsoft.NETCoreSdk.BundledVersions.props");
	FileInfo normalizedPath = new(bundledVersionsPropsPath);
	return normalizedPath.FullName;

Support .NET 9 #10593

Support .NET 9 #10593

Conversation

martincostello commented Sep 12, 2024 • edited Loading

What are you trying to accomplish?

Anything you want to highlight for special attention from reviewers?

How will you know you've accomplished your goal?

Checklist

martincostello commented Sep 12, 2024 • edited Loading

martincostello commented Sep 12, 2024

martincostello commented Sep 21, 2024

martincostello Sep 21, 2024

Choose a reason for hiding this comment

martincostello Sep 21, 2024

Choose a reason for hiding this comment

martincostello Sep 21, 2024

Choose a reason for hiding this comment

martincostello Sep 21, 2024

Choose a reason for hiding this comment

martincostello Sep 21, 2024 • edited Loading

Choose a reason for hiding this comment

martincostello commented Sep 26, 2024

brettfo commented Sep 26, 2024

martincostello commented Sep 26, 2024

brettfo commented Oct 1, 2024

martincostello commented Oct 2, 2024

martincostello commented Oct 3, 2024

martincostello commented Sep 12, 2024 •

edited

Loading

martincostello commented Sep 12, 2024 •

edited

Loading

martincostello Sep 21, 2024 •

edited

Loading