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.

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

Upgrade Arcade to .NET 9 SDK and TFM #14279

Merged
merged 11 commits into from
Dec 13, 2023

Conversation

ViktorHofer
Copy link
Member

@ViktorHofer ViktorHofer commented Dec 12, 2023

Builds on top of the work from last year: #12096

Installer version: 9.0.100-alpha.1.23613.1
AspNetCore runtime version: 9.0.0-alpha.1.23612.4

Changes were performed via search and replace...

Builds on top of the work from last year: dotnet#12096

Installer version: 9.0.100-alpha.1.23612.1
AspNetCore runtime version: 9.0.0-alpha.1.23577.26
@ViktorHofer ViktorHofer self-assigned this Dec 12, 2023
mthalman
mthalman previously approved these changes Dec 12, 2023
…otations. We can't get everything right, but we can do the best we can.

Suppress warnings in a few places and use DynamicDependency where necessary to preserve existing behavior.
@ViktorHofer
Copy link
Member Author

Now blocked on #14172

Copy link
Member

@mthalman mthalman left a comment

Choose a reason for hiding this comment

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

This will require some patch removal when flowing to installer: https://github.com/dotnet/installer/tree/main/src/SourceBuild/patches/arcade

@@ -2,7 +2,7 @@
<Project>

<PropertyGroup>
<ApiCompatAssembly Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.ApiCompat.dll</ApiCompatAssembly>
<ApiCompatAssembly Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)..\tools\net9.0\Microsoft.DotNet.ApiCompat.dll</ApiCompatAssembly>
Copy link
Member

Choose a reason for hiding this comment

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

Any reason why these kinds of paths can't use $(NetCurrent)?

Copy link
Member

Choose a reason for hiding this comment

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

I think these end imported from the NuGet package itself, where NetCurrent may not already be defined?

Copy link
Member Author

Choose a reason for hiding this comment

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

This file is evaluated in the consuming project, in a different repository than Arcade so the NetCurrent property won't be available.

@ViktorHofer ViktorHofer merged commit b1e481c into dotnet:main Dec 13, 2023
15 checks passed
@ViktorHofer ViktorHofer deleted the UpdateTo90SDKAndTfm branch December 13, 2023 21:39
@mthalman mthalman mentioned this pull request Dec 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants