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

Initial changes for .NET 9 RPMs #345

Merged
merged 1 commit into from
Mar 12, 2024
Merged

Initial changes for .NET 9 RPMs #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions distribution-packages/test-standard-packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,11 +325,8 @@ def main() -> int:

def to_package_version(version: str) -> str:
if '-preview.' or '-rc.' in version:
# Convert upstream version 11.2.3-preview.999.1234 to RPM-style 11.2.3~preview.999
parts = version.split('-')
if len(parts) == 2:
release_prefix = '.'.join(parts[1].split('.')[0:2])
return parts[0] + '~' + release_prefix
# Convert upstream version 11.2.3-preview.999.1234 to RPM-style 11.2.3~preview.999.1234
return version.replace('-', '~')
Copy link
Member Author

Choose a reason for hiding this comment

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

RPMs previously used preview.1 instead of preview.1.24080.9 mostly because it was difficult to get accurate information before building things. With release.json, this is easy to fix, so I fixed it.

return version


Expand Down
2 changes: 1 addition & 1 deletion distribution-packages/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ IFS=$'\n\t'
set -x

sdk_version="$(dotnet --version)"
runtime_version="$(dotnet --list-runtimes | head -1 | awk '{ print $2 }')"
runtime_version="$(dotnet --list-runtimes | grep Microsoft.NETCore.App | awk '{ print $2 }')"
Copy link
Member Author

Choose a reason for hiding this comment

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

dotnet --list-runtimes lists all the runtimes, including ASP.NET Core. This filter was relying on a certain ordering that doesn't work with .NET 9 Preview 1.

runtime_id=$(../runtime-id)
# This might be the final/only netstandard version from now on
netstandard_version=2.1
Expand Down
56 changes: 47 additions & 9 deletions template-test/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,49 @@ set -x
# If additional templates are found via `dotnet new --list`, this test
# will fail unless they are added here.

dotnet9Templates=(
apicontroller
blazor
blazorwasm
buildprops
buildtargets
classlib
console
editorconfig
.editorconfig
gitignore
.gitignore
global.json
globaljson
grpc
mstest
mvc
mvccontroller
nuget.config
nugetconfig
nunit
nunit-test
packagesprops
page
proto
razor
razorclasslib
razorcomponent
sln
solution
tool-manifest
view
viewimports
viewstart
web
webapi
webapiaot
webapp
webconfig
worker
xunit
)

dotnet8Templates=(
apicontroller
blazor
Expand Down Expand Up @@ -258,15 +301,10 @@ done

IFS='.-' read -ra VERSION_SPLIT <<< "$1"
declare -a allTemplates
if [[ ${VERSION_SPLIT[0]} == "8" ]]; then
allTemplates=( "${dotnet8Templates[@]}" )
elif [[ ${VERSION_SPLIT[0]} == "7" ]]; then
allTemplates=( "${dotnet7Templates[@]}" )
elif [[ ${VERSION_SPLIT[0]} == "6" ]]; then
allTemplates=( "${dotnet6Templates[@]}" )
elif [[ ${VERSION_SPLIT[0]} == "3" ]]; then
allTemplates=( "${dotnet3Templates[@]}" )
else
major_version="${VERSION_SPLIT[0]}"
template_names="dotnet${major_version}Templates[@]"
allTemplates=( "${!template_names}" )
if [[ -z "$allTemplates" ]] ; then
echo "error: unknown dotnet version " "${VERSION_SPLIT[@]}"
echo "Need a new template list for this. Here's a starting point:"
echo "${filteredAutoTemplates[@]}"
Expand Down
2 changes: 1 addition & 1 deletion tools-in-path/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ else
fi

framework_dir=$(../dotnet-directory --framework "$1")
dotnet tool update -g dotnet-ef --version "${framework_dir#*App/}.*-*"
dotnet tool update -g dotnet-ef --version "${framework_dir#*App/}.*"
Copy link
Member Author

Choose a reason for hiding this comment

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

I am not sure why we previously used *-*. Will this change have a negative impact? Thoughts, @tmds ?

Copy link
Member Author

Choose a reason for hiding this comment

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

With a preview version, this was evaluated as 9.0.0-preview.1.24080.9*-*, which doesn't match anything. But 9.0.0-preview.1.24080.9* does.

Copy link
Member

Choose a reason for hiding this comment

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

@nicrowe00 updated this test since it was failing for .NET 8.0.1 here: #333.

This test is skipped in our CI, so we haven't noticed it doesn't work against preview versions.

With the March release (8.0.3), we should be able to go back to how this was before #333 because dotnet-ef should then run on any 8.0 runtime version.

Copy link
Member Author

Choose a reason for hiding this comment

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

Should I merge this change, then, or defer it to a separate PR (or never)?

Copy link
Member Author

Choose a reason for hiding this comment

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

@nicrowe00 can you remind us why we had to use *-* here?

Copy link
Member

@tmds tmds Mar 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

can you remind us why we had to use - here?

He didn't add it. It was already there.

Before #333 we prefixed this only with the major version number. So the --version argument was for example 7.*-*. This means the SDK it is allowed to install a version higher than 7. It will prefer to install a stable version (e.g. 7.0.0) but if there is no stable version, it can install a preview (e.g. 7.0.0-preview1).

With #333, if you run against a released version of .NET, you get something like 8.0.1.*-*. For the SDK this is an acceptable version pattern.

When #333 runs against a .NET 9 preview, the --version becomes something like 9.0.0-preview.1.24080.9*-* and this pattern doesn't make sense to the SDK.

This PR is now changing that version into 9.0.0-preview.1.24080.9.*. And if this is working, it seems the SDK treats this as 9.0.0-* (and a suffix of at least preview.1.24080.9?) since the published dotnet-ef version is actually 9.0.0-preview.1.24081.2.

Should I merge this change, then, or defer it to a separate PR (or never)?

I'm fine with either what you have here, or the pattern we had before #333 (which will work for .NET 9 previews, and should start working for .NET 8 on the next patch release).

Copy link
Member Author

Choose a reason for hiding this comment

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

He didn't add it. It was already there.

I was thinking of #319.

Copy link
Member

Choose a reason for hiding this comment

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

Because I suggested it in that PR for the reasons mentioned above.

Copy link
Member

Choose a reason for hiding this comment

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

This is the documentation for the wildcard pattern: https://github.com/NuGet/Home/wiki/Support-pre-release-packages-with-floating-versions.


dotnet ef --version
Loading