-
Notifications
You must be signed in to change notification settings - Fork 430
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
Add templates for 9.0 #6058
Add templates for 9.0 #6058
Conversation
- duplicated from Aspire.ProjectTemplates - And the `-f net8.0` option is replaced with `-f net9.0` in the various `template.json` files.
I'm still doing some cleanup work on the tests, but in general this can be review can be started, especially the templates part. The first two commits have the template changes. |
Follow up work:
|
"thirdPartyNotices": "https://aka.ms/dotnet/aspire/8.0-third-party-notices", | ||
"groupIdentity": "Aspire.AppHost", | ||
"groupIdentity": "Aspire.AppHost.9", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the package ID contains 9.0
I think we'd want the groupIdentity
to be Aspire.AppHost.9.0
here (and the identity
above Aspire.AppHost.CSharp.9.0.net8
)? That means different 9.x versions can be installed side-by-side (the package IDs already have the major.minor AFAICT) and the template engine will group the templates by their groupIdentity
for TFM selection.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that depends on whether we want major.minor to be SxS. FWIW, we could leave this .9 today, and if we release a 9.1 which we want to be SxS, make that groupid include the minor version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fair point, can always defer that decision
src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-apphost/.template.config/template.json
Outdated
Show resolved
Hide resolved
src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-apphost/Aspire.AppHost1.csproj
Outdated
Show resolved
Hide resolved
"unsupportedHosts": [ | ||
{ | ||
"id": "vs", | ||
"version": "(,17.9)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this need to be bumped higher? Are we doing any testing of Aspire 9 with VS 17.10 or 17.11?
}, | ||
"precedence": "9000", | ||
"identity": "Aspire.Empty.CSharp.9.net9", | ||
"thirdPartyNotices": "https://aka.ms/dotnet/aspire/8.0-third-party-notices", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"thirdPartyNotices": "https://aka.ms/dotnet/aspire/8.0-third-party-notices", | |
"thirdPartyNotices": "https://aka.ms/dotnet/aspire/9.0-third-party-notices", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, given this just links to the file in the repo, let's just make it:
"thirdPartyNotices": "https://aka.ms/dotnet/aspire/8.0-third-party-notices", | |
"thirdPartyNotices": "https://aka.ms/dotnet/aspire/third-party-notices", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't this become a problem when we get to 10.0, and the default link would point to the 10.0 branch?
...re.ProjectTemplates.9.0.net9/templates/aspire-servicedefaults/Aspire.ServiceDefaults1.csproj
Outdated
Show resolved
Hide resolved
Addresses review feedback.
…. Addresses review feedback
…emplate.config/template.json Co-authored-by: Damian Edwards <damian@damianedwards.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
Template changes
-f net8.0
option is replaced with-f net9.0
in the varioustemplate.json
files.Testing changes
3 separate sdk installations are created for testing in
artifacts
:artifacts/bin/dotnet-tests
-9.0 sdk + 8.0 runtime
(used by default)artifacts/bin/dotnet-9
-9.0
sdk onlyartifacts/bin/dotnet-8
-8.0
sdk only3 separate template installations (called
custom hives
) are created:net9+net8
installednet9
only installednet8
only installedThe existing workload tests are run against
dotnet-tests
. This is the same as previous behavior. These tests use thenet8+net9
template set by default.New tests are added that
dotnet new + dotnet build
the templates with the 3 sdks, and the 3 template installations.The tests also allow running the workload tests against
net8.0
by default, which can be enabled for internal pipeline to get extra testing fornet8.0
.Fixes #5926
Fixes #5447
Microsoft Reviewers: Open in CodeFlow