Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support .NET 9 #10593

Merged
merged 18 commits into from
Oct 2, 2024
Merged

Support .NET 9 #10593

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
78ef6fe
Support .NET 9
martincostello Sep 12, 2024
f2b2f3f
Fix NuGet audit warnings
martincostello Sep 12, 2024
6ee5c6e
Disable NuGet audit
martincostello Sep 12, 2024
12199cd
Update expected test output
martincostello Sep 21, 2024
79b8813
Enable terminal logger
martincostello Sep 21, 2024
630c228
Merge branch 'main' into dotnet-9
martincostello Sep 21, 2024
dd2acae
Run tests with .NET 8 SDK
martincostello Sep 21, 2024
ece057b
Fix type annotations
martincostello Sep 21, 2024
cd4fa52
Update specs
martincostello Sep 21, 2024
54984f3
Revert expected output
martincostello Sep 21, 2024
b79b55d
Fix tests
martincostello Sep 21, 2024
7c9c796
Fix test
martincostello Sep 21, 2024
9f620d4
Add C# Dev Kit
martincostello Sep 21, 2024
c452545
Add .NET 9 to devcontainer
martincostello Sep 21, 2024
3e0cb4b
Update to .NET 9
martincostello Sep 21, 2024
97c41dc
Update target framework
martincostello Sep 21, 2024
27ef275
Update assertion for terminal logger
martincostello Sep 21, 2024
63b57cf
Merge branch 'main' into dotnet-9
martincostello Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tests 
    - Fix tests broken by error about usage of CPVM.
    - Update Microsoft.Windows.SDK.NET.Ref version.
  • Loading branch information
@martincostello
martincostello committed Sep 21, 2024
commit b79b55d9ff49a643334928118ddd86faf2d38988
8 changes: 7 additions & 1 deletion nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.Sdk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ await TestUpdateForProject("Some.Package", "12.0.1", "13.0.1",
projectContents: $"""
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
Expand All @@ -199,6 +200,7 @@ await TestUpdateForProject("Some.Package", "12.0.1", "13.0.1",
(Path: "src/Project/Project.csproj", Content: """
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -244,7 +246,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:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

[
("data/FrameworkList.xml", Encoding.UTF8.GetBytes("""
<FileList Name="Windows SDK .NET 6.0">
Expand Down Expand Up @@ -548,6 +550,7 @@ await TestUpdateForProject("Some.Transient.Dependency", "5.0.1", "5.0.2", isTran
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

Expand All @@ -562,6 +565,7 @@ await TestUpdateForProject("Some.Transient.Dependency", "5.0.1", "5.0.2", isTran
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

Expand All @@ -588,6 +592,7 @@ await TestUpdateForProject("Some.Transitive.Package", "1.0.0", "1.0.1", isTransi
projectContents: """
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
Expand All @@ -608,6 +613,7 @@ await TestUpdateForProject("Some.Transitive.Package", "1.0.0", "1.0.1", isTransi
expectedProjectContents: """
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
Expand Down
Loading