diff --git a/eng/Version.Details.props b/eng/Version.Details.props index de4614ad9fff..833c546a321d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,137 +6,137 @@ This file should be imported by eng/Versions.props - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-preview.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 17.15.0-preview-25427-104 - 17.15.0-preview-25427-104 - 7.0.0-preview.1.42804 - 10.0.0-beta.25427.104 - 5.0.0-2.25427.104 - 5.0.0-2.25427.104 - 5.0.0-2.25427.104 - 5.0.0-2.25427.104 - 5.0.0-2.25427.104 - 5.0.0-2.25427.104 - 5.0.0-2.25427.104 - 10.0.0-preview.25427.104 - 5.0.0-2.25427.104 - 5.0.0-2.25427.104 - 2.0.0-preview.1.25427.104 - 2.2.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 14.0.100-rc2.25427.104 - 10.0.0-rc.2.25427.104 - 5.0.0-2.25427.104 - 5.0.0-2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-preview.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 17.15.0-preview-25457-103 + 17.15.0-preview-25457-103 + 7.0.0-preview.1.45803 + 10.0.0-beta.25457.103 + 5.0.0-2.25457.103 + 5.0.0-2.25457.103 + 5.0.0-2.25457.103 + 5.0.0-2.25457.103 + 5.0.0-2.25457.103 + 5.0.0-2.25457.103 + 5.0.0-2.25457.103 + 10.0.0-preview.25457.103 + 5.0.0-2.25457.103 + 5.0.0-2.25457.103 + 2.0.0-preview.1.25457.103 + 2.2.0-beta.25457.103 + 11.0.0-beta.25457.103 + 11.0.0-beta.25457.103 + 11.0.0-beta.25457.103 + 11.0.0-beta.25457.103 + 11.0.0-beta.25457.103 + 11.0.0-beta.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 11.0.0-beta.25457.103 + 11.0.0-beta.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 14.0.100-rc2.25457.103 + 10.0.0-rc.1.25457.103 + 5.0.0-2.25457.103 + 5.0.0-2.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 10.0.0-preview.7.25377.103 - 10.0.0-preview.25427.104 - 10.0.0-rc.2.25427.104 - 18.0.0-preview-25427-104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.100-rc.2.25427.104 - 10.0.100-rc.2.25427.104 - 10.0.100-rc.2.25427.104 - 10.0.100-rc.2.25427.104 - 10.0.100-rc.2.25427.104 - 10.0.100-rc.2.25427.104 - 10.0.100-rc.2.25427.104 - 10.0.100-rc.2.25427.104 - 10.0.100-rc.2.25427.104 - 18.0.0-preview-25427-104 - 18.0.0-preview-25427-104 - 3.2.0-preview.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 7.0.0-preview.1.42804 - 10.0.0-rc.2.25427.104 - 2.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 + 10.0.0-preview.25457.103 + 10.0.0-rc.1.25457.103 + 18.0.0-preview-25457-103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-beta.25457.103 + 10.0.0-beta.25457.103 + 10.0.0-beta.25457.103 + 10.0.0-beta.25457.103 + 10.0.0-beta.25457.103 + 10.0.100-rc.1.25457.103 + 10.0.100-rc.1.25457.103 + 10.0.100-rc.1.25457.103 + 10.0.100-rc.1.25457.103 + 10.0.100-rc.1.25457.103 + 10.0.100-rc.1.25457.103 + 10.0.100-rc.1.25457.103 + 10.0.100-rc.1.25457.103 + 10.0.100-rc.1.25457.103 + 18.0.0-preview-25457-103 + 18.0.0-preview-25457-103 + 3.2.0-preview.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 7.0.0-preview.1.45803 + 10.0.0-rc.1.25457.103 + 2.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 + 10.0.0-rc.1.25457.103 2.1.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a6acfcb076b..d62a7a7190af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f https://github.com/microsoft/testfx @@ -561,9 +561,9 @@ https://github.com/microsoft/testfx db43d4e2dedc776e37717853805b0fce30b1ccff - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9d24e131fc9d315b1773a0e080d7b35a0cd8856f diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index c05f65027979..003f7eae0fa5 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 10.0.0 + PackageVersion: 11.0.0 BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 0c92f81d74f7..3270f83fa9a7 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -10,7 +10,7 @@ show_usage() { echo "Advanced settings:" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" - echo " --noWarnAsError Do not warn as error + echo " --noWarnAsError Do not warn as error" echo "" echo "Command line arguments not listed above are passed thru to msbuild." } diff --git a/global.json b/global.json index f7f8a0f6a243..3e61820782a7 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25427.104", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25457.103", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25457.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" diff --git a/src/Layout/pkg/dotnet-sdk.proj b/src/Layout/pkg/dotnet-sdk.proj index c651d2707e71..cee431cdb479 100644 --- a/src/Layout/pkg/dotnet-sdk.proj +++ b/src/Layout/pkg/dotnet-sdk.proj @@ -8,7 +8,6 @@ true true true - true Microsoft .NET $(RepoRoot)LICENSE.TXT dotnet-sdk @@ -111,7 +110,7 @@ diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index 803a0334f542..22d3827eab44 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/Layout/redist/targets/BundledSdks.targets b/src/Layout/redist/targets/BundledSdks.targets index 242c1c0242d6..77fae4e802bd 100644 --- a/src/Layout/redist/targets/BundledSdks.targets +++ b/src/Layout/redist/targets/BundledSdks.targets @@ -2,7 +2,7 @@ - + diff --git a/src/Layout/redist/targets/BundledTemplates.targets b/src/Layout/redist/targets/BundledTemplates.targets index d0681a419c10..d57efe98784d 100644 --- a/src/Layout/redist/targets/BundledTemplates.targets +++ b/src/Layout/redist/targets/BundledTemplates.targets @@ -3,8 +3,8 @@ - - + + @@ -56,11 +56,6 @@ - - - - - diff --git a/src/Layout/redist/targets/GenerateBundledVersions.targets b/src/Layout/redist/targets/GenerateBundledVersions.targets index 42a5791e65b6..e130c7f81d26 100644 --- a/src/Layout/redist/targets/GenerateBundledVersions.targets +++ b/src/Layout/redist/targets/GenerateBundledVersions.targets @@ -276,14 +276,6 @@ Condition="'$(BundleRuntimePacks)' == 'true'" Include="$(ProductMonikerRid)" /> - - - - + + + + + + + + @@ -711,6 +716,7 @@ Copyright (c) .NET Foundation. All rights reserved. ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler" ILCompilerRuntimePackNamePattern="Microsoft.NETCore.App.Runtime.NativeAOT.**RID**" ILCompilerPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" + ILCompilerPortableRuntimeIdentifiers="@(ILCompilerSupportedPortableRids, '%3B')" ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')" /> diff --git a/src/RazorSdk/Tool/Json/JsonDataReader.cs b/src/RazorSdk/Tool/Json/JsonDataReader.cs index 39f7a75f11b2..5528b848ae85 100644 --- a/src/RazorSdk/Tool/Json/JsonDataReader.cs +++ b/src/RazorSdk/Tool/Json/JsonDataReader.cs @@ -368,6 +368,9 @@ public T ReadNonNullObject(string propertyName, ReadProperties readPropert return ReadNonNullObject(readProperties); } + public T ReadNonNullObjectOrDefault(string propertyName, ReadProperties readProperties, T defaultValue) + => TryReadPropertyName(propertyName) ? ReadNonNullObject(readProperties) : defaultValue; + public T[]? ReadArray(ReadValue readElement) { if (TryReadNull()) diff --git a/src/RazorSdk/Tool/Json/ObjectReaders_TagHelpers.cs b/src/RazorSdk/Tool/Json/ObjectReaders_TagHelpers.cs index 62ada0663a93..5fcfe1f919a6 100644 --- a/src/RazorSdk/Tool/Json/ObjectReaders_TagHelpers.cs +++ b/src/RazorSdk/Tool/Json/ObjectReaders_TagHelpers.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; +using Microsoft.AspNetCore.Mvc.Razor.Extensions; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Components; @@ -14,14 +15,16 @@ public static TagHelperDescriptor ReadTagHelper(JsonDataReader reader) public static TagHelperDescriptor ReadTagHelperFromProperties(JsonDataReader reader) { - var kind = reader.ReadNonNullString(nameof(TagHelperDescriptor.Kind)); + var flags = (TagHelperFlags)reader.ReadByte(nameof(TagHelperDescriptor.Flags)); + var kind = (TagHelperKind)reader.ReadByteOrDefault(nameof(TagHelperDescriptor.Kind), defaultValue: (byte)TagHelperKind.Component); + var runtimeKind = (RuntimeKind)reader.ReadByteOrDefault(nameof(TagHelperDescriptor.RuntimeKind), defaultValue: (byte)RuntimeKind.IComponent); var name = reader.ReadNonNullString(nameof(TagHelperDescriptor.Name)); var assemblyName = reader.ReadNonNullString(nameof(TagHelperDescriptor.AssemblyName)); var displayName = reader.ReadStringOrNull(nameof(TagHelperDescriptor.DisplayName)); + var typeNameObject = ReadTypeNameObject(reader, nameof(TagHelperDescriptor.TypeName)); var documentationObject = ReadDocumentationObject(reader, nameof(TagHelperDescriptor.Documentation)); var tagOutputHint = reader.ReadStringOrNull(nameof(TagHelperDescriptor.TagOutputHint)); - var caseSensitive = reader.ReadBooleanOrTrue(nameof(TagHelperDescriptor.CaseSensitive)); var tagMatchingRules = reader.ReadImmutableArrayOrEmpty(nameof(TagHelperDescriptor.TagMatchingRules), ReadTagMatchingRule); var boundAttributes = reader.ReadImmutableArrayOrEmpty(nameof(TagHelperDescriptor.BoundAttributes), ReadBoundAttribute); @@ -31,9 +34,8 @@ public static TagHelperDescriptor ReadTagHelperFromProperties(JsonDataReader rea var diagnostics = reader.ReadImmutableArrayOrEmpty(nameof(TagHelperDescriptor.Diagnostics), ReadDiagnostic); return new TagHelperDescriptor( - kind, name, assemblyName, - displayName!, documentationObject, - tagOutputHint, caseSensitive, + flags, kind, runtimeKind, name, assemblyName, + displayName!, typeNameObject, documentationObject, tagOutputHint, tagMatchingRules, boundAttributes, allowedChildTags, metadata, diagnostics); @@ -93,25 +95,14 @@ static BoundAttributeDescriptor ReadFromProperties(JsonDataReader reader) var containingType = reader.ReadStringOrNull(nameof(BoundAttributeDescriptor.ContainingType)); var documentationObject = ReadDocumentationObject(reader, nameof(BoundAttributeDescriptor.Documentation)); var parameters = reader.ReadImmutableArrayOrEmpty(nameof(BoundAttributeDescriptor.Parameters), ReadBoundAttributeParameter); - - var metadataKind = (MetadataKind)reader.ReadByteOrDefault("MetadataKind", defaultValue: (byte)MetadataKind.None); - - var metadataObject = metadataKind switch - { - MetadataKind.None => MetadataObject.None, - MetadataKind.TypeParameter => reader.ReadNonNullObject(nameof(BoundAttributeDescriptor.Metadata), ReadTypeParameterMetadata), - MetadataKind.Property => reader.ReadNonNullObject(nameof(BoundAttributeDescriptor.Metadata), ReadPropertyMetadata), - MetadataKind.ChildContentParameter => ChildContentParameterMetadata.Default, - _ => Assumed.Unreachable($"Unexpected MetadataKind '{metadataKind}'."), - }; - + var metadata = ReadMetadata(reader, nameof(BoundAttributeDescriptor.Metadata)); var diagnostics = reader.ReadImmutableArrayOrEmpty(nameof(BoundAttributeDescriptor.Diagnostics), ReadDiagnostic); return new BoundAttributeDescriptor( flags, name!, propertyName, typeNameObject, indexerNamePrefix, indexerTypeNameObject, documentationObject, displayName, containingType, - parameters, metadataObject, diagnostics); + parameters, metadata, diagnostics); } } @@ -154,12 +145,29 @@ static TypeNameObject ReadTypeNameObject(JsonDataReader reader, string propertyN return default; } + if (reader.TryReadNull()) + { + return default; + } + if (reader.IsInteger) { var index = reader.ReadByte(); return new(index); } + if (reader.IsObjectStart) + { + return reader.ReadNonNullObject(static reader => + { + var fullName = reader.ReadNonNullString(nameof(TypeNameObject.FullName)); + var namespaceName = reader.ReadStringOrNull(nameof(TypeNameObject.Namespace)); + var name = reader.ReadStringOrNull(nameof(TypeNameObject.Name)); + + return TypeNameObject.From(fullName, namespaceName, name); + }); + } + Debug.Assert(reader.IsString); var fullName = reader.ReadNonNullString(); @@ -210,24 +218,22 @@ static DocumentationObject ReadCore(JsonDataReader reader) } } - static MetadataCollection ReadMetadata(JsonDataReader reader, string propertyName) + static MetadataObject ReadMetadata(JsonDataReader reader, string propertyName) { - return reader.TryReadPropertyName(propertyName) - ? reader.ReadNonNullObject(ReadFromProperties) - : MetadataCollection.Empty; + var metadataKind = (MetadataKind)reader.ReadByteOrDefault(WellKnownPropertyNames.MetadataKind, defaultValue: (byte)MetadataKind.None); - static MetadataCollection ReadFromProperties(JsonDataReader reader) + return metadataKind switch { - using var builder = new MetadataBuilder(); - - while (reader.TryReadNextPropertyName(out var key)) - { - var value = reader.ReadString(); - builder.Add(key, value); - } - - return builder.Build(); - } + MetadataKind.None => MetadataObject.None, + MetadataKind.TypeParameter => reader.ReadNonNullObjectOrDefault(propertyName, ReadTypeParameterMetadata, defaultValue: TypeParameterMetadata.Default), + MetadataKind.Property => reader.ReadNonNullObjectOrDefault(propertyName, ReadPropertyMetadata, defaultValue: PropertyMetadata.Default), + MetadataKind.ChildContentParameter => ChildContentParameterMetadata.Default, + MetadataKind.Bind => reader.ReadNonNullObjectOrDefault(propertyName, ReadBindMetadata, defaultValue: BindMetadata.Default), + MetadataKind.Component => reader.ReadNonNullObjectOrDefault(propertyName, ReadComponentMetadata, defaultValue: ComponentMetadata.Default), + MetadataKind.EventHandler => reader.ReadNonNullObject(propertyName, ReadEventHandlerMetadata), + MetadataKind.ViewComponent => reader.ReadNonNullObject(propertyName, ReadViewComponentMetadata), + _ => Assumed.Unreachable($"Unexpected MetadataKind '{metadataKind}'."), + }; } static TypeParameterMetadata ReadTypeParameterMetadata(JsonDataReader reader) @@ -257,5 +263,52 @@ static PropertyMetadata ReadPropertyMetadata(JsonDataReader reader) return builder.Build(); } + + static BindMetadata ReadBindMetadata(JsonDataReader reader) + { + var builder = new BindMetadata.Builder + { + IsFallback = reader.ReadBooleanOrFalse(nameof(BindMetadata.IsFallback)), + ValueAttribute = reader.ReadStringOrNull(nameof(BindMetadata.ValueAttribute)), + ChangeAttribute = reader.ReadStringOrNull(nameof(BindMetadata.ChangeAttribute)), + ExpressionAttribute = reader.ReadStringOrNull(nameof(BindMetadata.ExpressionAttribute)), + TypeAttribute = reader.ReadStringOrNull(nameof(BindMetadata.TypeAttribute)), + IsInvariantCulture = reader.ReadBooleanOrFalse(nameof(BindMetadata.IsInvariantCulture)), + Format = reader.ReadStringOrNull(nameof(BindMetadata.Format)) + }; + + return builder.Build(); + } + } + + static ComponentMetadata ReadComponentMetadata(JsonDataReader reader) + { + var builder = new ComponentMetadata.Builder + { + IsGeneric = reader.ReadBooleanOrFalse(nameof(ComponentMetadata.IsGeneric)), + HasRenderModeDirective = reader.ReadBooleanOrFalse(nameof(ComponentMetadata.HasRenderModeDirective)) + }; + + return builder.Build(); + } + + static EventHandlerMetadata ReadEventHandlerMetadata(JsonDataReader reader) + { + var builder = new EventHandlerMetadata.Builder + { + EventArgsType = reader.ReadNonNullString(nameof(EventHandlerMetadata.EventArgsType)) + }; + + return builder.Build(); + } + + static ViewComponentMetadata ReadViewComponentMetadata(JsonDataReader reader) + { + var builder = new ViewComponentMetadata.Builder + { + Name = reader.ReadNonNullString(nameof(ViewComponentMetadata.Name)) + }; + + return builder.Build(); } } diff --git a/src/RazorSdk/Tool/Json/ObjectWriters_TagHelpers.cs b/src/RazorSdk/Tool/Json/ObjectWriters_TagHelpers.cs index 4c4b5972c379..cd5e9554a2e1 100644 --- a/src/RazorSdk/Tool/Json/ObjectWriters_TagHelpers.cs +++ b/src/RazorSdk/Tool/Json/ObjectWriters_TagHelpers.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; +using Microsoft.AspNetCore.Mvc.Razor.Extensions; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Components; @@ -14,13 +15,15 @@ public static void Write(JsonDataWriter writer, TagHelperDescriptor? value) public static void WriteProperties(JsonDataWriter writer, TagHelperDescriptor value) { - writer.Write(nameof(value.Kind), value.Kind); + writer.Write(nameof(value.Flags), (byte)value.Flags); + writer.WriteIfNotDefault(nameof(value.Kind), (byte)value.Kind, defaultValue: (byte)TagHelperKind.Component); + writer.WriteIfNotDefault(nameof(value.RuntimeKind), (byte)value.RuntimeKind, defaultValue: (byte)RuntimeKind.IComponent); writer.Write(nameof(value.Name), value.Name); writer.Write(nameof(value.AssemblyName), value.AssemblyName); writer.WriteIfNotNull(nameof(value.DisplayName), value.DisplayName); + WriteTypeNameObject(writer, nameof(value.TypeName), value.TypeNameObject); WriteDocumentationObject(writer, nameof(value.Documentation), value.DocumentationObject); writer.WriteIfNotNull(nameof(value.TagOutputHint), value.TagOutputHint); - writer.Write(nameof(value.CaseSensitive), value.CaseSensitive); writer.WriteArrayIfNotDefaultOrEmpty(nameof(value.TagMatchingRules), value.TagMatchingRules, WriteTagMatchingRule); writer.WriteArrayIfNotDefaultOrEmpty(nameof(value.BoundAttributes), value.BoundAttributes, WriteBoundAttribute); writer.WriteArrayIfNotDefaultOrEmpty(nameof(value.AllowedChildTags), value.AllowedChildTags, WriteAllowedChildTag); @@ -57,15 +60,32 @@ static void WriteDocumentationObject(JsonDataWriter writer, string propertyName, } } - static void WriteTypeNameObject(JsonDataWriter writer, string propertyName, TypeNameObject typeNameObject) + static void WriteTypeNameObject(JsonDataWriter writer, string propertyName, TypeNameObject value) { - if (typeNameObject.Index is byte index) + if (value.IsNull) + { + // Don't write property if the value is null. + } + else if (value.Index is byte index) { writer.Write(propertyName, index); } - else if (typeNameObject.StringValue is string stringValue) + else if (value.Namespace is null && value.Name is null) { - writer.Write(propertyName, stringValue); + // If we only have a full name, write that. + writer.Write(propertyName, value.FullName.AssumeNotNull()); + } + else + { + writer.WriteObject(propertyName, value, static (writer, value) => + { + Debug.Assert(value.Index is null); + + writer.Write(nameof(value.FullName), value.FullName); + writer.WriteIfNotNull(nameof(value.Namespace), value.Namespace); + writer.WriteIfNotNull(nameof(value.Name), value.Name); + }); + } } @@ -110,7 +130,7 @@ static void WriteBoundAttribute(JsonDataWriter writer, BoundAttributeDescriptor WriteDocumentationObject(writer, nameof(value.Documentation), value.DocumentationObject); writer.WriteArrayIfNotDefaultOrEmpty(nameof(value.Parameters), value.Parameters, WriteBoundAttributeParameter); - WriteMetadataObject(writer, nameof(value.Metadata), value.Metadata.AssumeNotNull()); + WriteMetadata(writer, nameof(value.Metadata), value.Metadata); writer.WriteArrayIfNotDefaultOrEmpty(nameof(value.Diagnostics), value.Diagnostics, Write); }); @@ -140,35 +160,18 @@ static void WriteAllowedChildTag(JsonDataWriter writer, AllowedChildTagDescripto }); } - static void WriteMetadata(JsonDataWriter writer, string propertyName, MetadataCollection metadata) - { - // If there isn't any metadata, don't write the property. - if (metadata.Count == 0) - { - return; - } - - writer.WriteObject(propertyName, metadata, static (writer, metadata) => - { - foreach (var (key, value) in metadata) - { - writer.Write(key, value); - } - }); - } - - static void WriteMetadataObject(JsonDataWriter writer, string propertyName, MetadataObject metadata) + static void WriteMetadata(JsonDataWriter writer, string propertyName, MetadataObject metadata) { if (metadata.Kind is MetadataKind.None) { return; } - writer.Write("MetadataKind", (byte)metadata.Kind); + writer.Write(WellKnownPropertyNames.MetadataKind, (byte)metadata.Kind); - if (metadata.Kind is MetadataKind.ChildContentParameter) + if (metadata.HasDefaultValue) { - // No properties to write for ChildContentParameterMetadata. + // No properties to write. return; } @@ -184,6 +187,22 @@ static void WriteMetadataObject(JsonDataWriter writer, string propertyName, Meta WritePropertyMetadata(writer, (PropertyMetadata)value); break; + case MetadataKind.Bind: + WriteBindMetadata(writer, (BindMetadata)value); + break; + + case MetadataKind.Component: + WriteComponentMetadata(writer, (ComponentMetadata)value); + break; + + case MetadataKind.EventHandler: + WriteEventHandlerMetadata(writer, (EventHandlerMetadata)value); + break; + + case MetadataKind.ViewComponent: + WriteViewComponentMetadata(writer, (ViewComponentMetadata)value); + break; + default: Debug.Fail($"Unsupported metadata kind '{value.Kind}'."); break; @@ -207,6 +226,33 @@ static void WritePropertyMetadata(JsonDataWriter writer, PropertyMetadata metada writer.WriteIfNotFalse(nameof(metadata.IsGenericTyped), metadata.IsGenericTyped); writer.WriteIfNotFalse(nameof(metadata.IsInitOnlyProperty), metadata.IsInitOnlyProperty); } + + static void WriteBindMetadata(JsonDataWriter writer, BindMetadata metadata) + { + writer.WriteIfNotFalse(nameof(metadata.IsFallback), metadata.IsFallback); + writer.WriteIfNotNull(nameof(metadata.ValueAttribute), metadata.ValueAttribute); + writer.WriteIfNotNull(nameof(metadata.ChangeAttribute), metadata.ChangeAttribute); + writer.WriteIfNotNull(nameof(metadata.ExpressionAttribute), metadata.ExpressionAttribute); + writer.WriteIfNotNull(nameof(metadata.TypeAttribute), metadata.TypeAttribute); + writer.WriteIfNotFalse(nameof(metadata.IsInvariantCulture), metadata.IsInvariantCulture); + writer.WriteIfNotNull(nameof(metadata.Format), metadata.Format); + } + + static void WriteComponentMetadata(JsonDataWriter writer, ComponentMetadata metadata) + { + writer.WriteIfNotFalse(nameof(metadata.IsGeneric), metadata.IsGeneric); + writer.WriteIfNotFalse(nameof(metadata.HasRenderModeDirective), metadata.HasRenderModeDirective); + } + + static void WriteEventHandlerMetadata(JsonDataWriter writer, EventHandlerMetadata metadata) + { + writer.Write(nameof(metadata.EventArgsType), metadata.EventArgsType); + } + + static void WriteViewComponentMetadata(JsonDataWriter writer, ViewComponentMetadata metadata) + { + writer.Write(nameof(metadata.Name), metadata.Name); + } } } } diff --git a/src/RazorSdk/Tool/Json/WellKnownPropertyNames.cs b/src/RazorSdk/Tool/Json/WellKnownPropertyNames.cs index 8fadc3daa37f..c33c5bfe93c8 100644 --- a/src/RazorSdk/Tool/Json/WellKnownPropertyNames.cs +++ b/src/RazorSdk/Tool/Json/WellKnownPropertyNames.cs @@ -6,4 +6,5 @@ namespace Microsoft.NET.Sdk.Razor.Tool.Json; internal static class WellKnownPropertyNames { public const string Message = "Message"; + public const string MetadataKind = "MetadataKind"; } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs index 5569f32a4cde..2fc262a781ce 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs @@ -802,18 +802,31 @@ private ToolPackSupport AddToolPack( { var packNamePattern = knownPack.GetMetadata(packName + "PackNamePattern"); var packSupportedRuntimeIdentifiers = knownPack.GetMetadata(packName + "RuntimeIdentifiers").Split(';'); + var packSupportedPortableRuntimeIdentifiers = knownPack.GetMetadata(packName + "PortableRuntimeIdentifiers").Split(';'); - // When publishing for the non-portable RID that matches NETCoreSdkRuntimeIdentifier, prefer NETCoreSdkRuntimeIdentifier for the host. + // When publishing for a non-portable RID, prefer NETCoreSdkRuntimeIdentifier for the host. // Otherwise prefer the NETCoreSdkPortableRuntimeIdentifier. - // This makes non-portable SDKs behave the same as portable SDKs except for the specific case of targetting the non-portable RID. - // It also enables the non-portable ILCompiler to be packaged separately from the SDK and - // only required when publishing for the non-portable SDK RID. + // This makes non-portable SDKs behave the same as portable SDKs except for the specific case of targetting a non-portable RID. + // This ensures that targeting portable RIDs doesn't require any non-portable assets that aren't packaged in the SDK. + // Due to size concerns, the non-portable ILCompiler and Crossgen2 aren't included by default in non-portable SDK distributions. string portableSdkRid = !string.IsNullOrEmpty(NETCoreSdkPortableRuntimeIdentifier) ? NETCoreSdkPortableRuntimeIdentifier : NETCoreSdkRuntimeIdentifier; - bool targetsNonPortableSdkRid = RuntimeIdentifier == NETCoreSdkRuntimeIdentifier && NETCoreSdkRuntimeIdentifier != portableSdkRid; - string hostRuntimeIdentifier = targetsNonPortableSdkRid ? NETCoreSdkRuntimeIdentifier : portableSdkRid; - // Get the best RID for the host machine, which will be used to validate that we can run crossgen for the target platform and architecture + var runtimeGraph = new RuntimeGraphCache(this).GetRuntimeGraph(RuntimeGraphPath); - hostRuntimeIdentifier = NuGetUtils.GetBestMatchingRid(runtimeGraph, hostRuntimeIdentifier, packSupportedRuntimeIdentifiers, out bool wasInGraph); + + // Prefer portable when the "supported RID" for the tool pack is the same RID as the "supported portable RID". + // This makes non-portable SDKs behave the same as portable SDKs except for the specific cases added to "supported", such as targeting the non-portable RID. + // This also ensures that targeting common RIDs doesn't require any non-portable assets that aren't packaged in the SDK by default. + // Due to size concerns, the non-portable ILCompiler and Crossgen2 aren't included by default in non-portable SDK distributions. + string supportedTargetRid = NuGetUtils.GetBestMatchingRid(runtimeGraph, RuntimeIdentifier, packSupportedRuntimeIdentifiers, out _); + string supportedPortableTargetRid = NuGetUtils.GetBestMatchingRid(runtimeGraph, RuntimeIdentifier, packSupportedPortableRuntimeIdentifiers, out _); + + bool usePortable = !string.IsNullOrEmpty(NETCoreSdkPortableRuntimeIdentifier) && supportedTargetRid == supportedPortableTargetRid; + + // Get the best RID for the host machine, which will be used to validate that we can run crossgen for the target platform and architecture + string hostRuntimeIdentifier = usePortable + ? NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkPortableRuntimeIdentifier, packSupportedPortableRuntimeIdentifiers, out _) + : NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkRuntimeIdentifier, packSupportedRuntimeIdentifiers, out _); + if (hostRuntimeIdentifier == null) { return ToolPackSupport.UnsupportedForHostRuntimeIdentifier;