diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 319f1e04c981..6bcd25297f75 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,98 +6,98 @@ This file should be imported by eng/Versions.props - 10.0.0-rtm.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 11.0.0-beta.25508.109 - 11.0.0-beta.25508.109 - 11.0.0-beta.25508.109 - 11.0.0-beta.25508.109 - 11.0.0-beta.25508.109 - 11.0.0-beta.25508.109 - 11.0.0-beta.25508.109 - 10.0.0-rtm.25508.109 - 10.0.0-rtm.25508.109 - 10.0.0-rtm.25508.109 - 10.0.0-rtm.25508.109 - 10.0.0-rtm.25508.109 - 10.0.0-rtm.25508.109 - 10.0.0-rtm.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 3.2.0-preview.25508.109 - 7.0.0-preview.1.909 - 7.0.0-preview.1.909 - 7.0.0-preview.1.909 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 + 10.0.0-rtm.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 11.0.0-beta.25510.104 + 11.0.0-beta.25510.104 + 11.0.0-beta.25510.104 + 11.0.0-beta.25510.104 + 11.0.0-beta.25510.104 + 11.0.0-beta.25510.104 + 11.0.0-beta.25510.104 + 10.0.0-rtm.25510.104 + 10.0.0-rtm.25510.104 + 10.0.0-rtm.25510.104 + 10.0.0-rtm.25510.104 + 10.0.0-rtm.25510.104 + 10.0.0-rtm.25510.104 + 10.0.0-rtm.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 3.2.0-preview.25510.104 + 7.0.0-preview.1.1104 + 7.0.0-preview.1.1104 + 7.0.0-preview.1.1104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 4.13.0-3.24613.7 4.13.0-3.24613.7 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a486ce121b1..e77a012ad674 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,333 +8,333 @@ See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc. --> - + - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 9445c3143258..fc8d618014e0 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -7,7 +7,7 @@ # See example call for this script below. # # - task: PowerShell@2 -# displayName: Setup Private Feeds Credentials +# displayName: Setup internal Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 @@ -34,19 +34,28 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 +# Adds or enables the package source with the given name +function AddOrEnablePackageSource($sources, $disabledPackageSources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { + if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource -DisabledPackageSources $disabledPackageSources -Creds $creds -PackageSourceName $SourceName)) { + AddPackageSource -Sources $sources -SourceName $SourceName -SourceEndPoint $SourceEndPoint -Creds $creds -Username $userName -pwd $Password + } +} + # Add source entry to PackageSources function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) { + Write-Host "Adding package source $SourceName" + $packageSource = $doc.CreateElement("add") $packageSource.SetAttribute("key", $SourceName) $packageSource.SetAttribute("value", $SourceEndPoint) $sources.AppendChild($packageSource) | Out-Null } else { - Write-Host "Package source $SourceName already present." + Write-Host "Package source $SourceName already present and enabled." } AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd @@ -59,6 +68,8 @@ function AddCredential($creds, $source, $username, $pwd) { return; } + Write-Host "Inserting credential for feed: " $source + # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -91,24 +102,27 @@ function AddCredential($creds, $source, $username, $pwd) { $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { - $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") - - Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." - - ForEach ($PackageSource in $maestroPrivateSources) { - Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd +# Enable all darc-int package sources. +function EnableMaestroInternalPackageSources($DisabledPackageSources, $Creds) { + $maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroInternalSources) { + EnableInternalPackageSource -DisabledPackageSources $DisabledPackageSources -Creds $Creds -PackageSourceName $DisabledPackageSource.key } } -function EnablePrivatePackageSources($DisabledPackageSources) { - $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($DisabledPackageSource in $maestroPrivateSources) { - Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" +# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise. +function EnableInternalPackageSource($DisabledPackageSources, $Creds, $PackageSourceName) { + $DisabledPackageSource = $DisabledPackageSources.SelectSingleNode("add[@key='$PackageSourceName']") + if ($DisabledPackageSource) { + Write-Host "Enabling internal source '$($DisabledPackageSource.key)'." + # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries $DisabledPackageSources.RemoveChild($DisabledPackageSource) + + AddCredential -Creds $creds -Source $DisabledPackageSource.Key -Username $userName -pwd $Password + return $true } + return $false } if (!(Test-Path $ConfigFile -PathType Leaf)) { @@ -121,15 +135,17 @@ $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName $doc.Load($filename) -# Get reference to or create one if none exist already +# Get reference to - fail if none exist $sources = $doc.DocumentElement.SelectSingleNode("packageSources") if ($sources -eq $null) { - $sources = $doc.CreateElement("packageSources") - $doc.DocumentElement.AppendChild($sources) | Out-Null + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 } $creds = $null +$feedSuffix = "v3/index.json" if ($Password) { + $feedSuffix = "v2" # Looks for a node. Create it if none is found. $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") if ($creds -eq $null) { @@ -138,33 +154,22 @@ if ($Password) { } } +$userName = "dn-bot" + # Check for disabledPackageSources; we'll enable any darc-int ones we find there $disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") if ($disabledSources -ne $null) { Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnablePrivatePackageSources -DisabledPackageSources $disabledSources -} - -$userName = "dn-bot" - -# Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password - -# 3.1 uses a different feed url format so it's handled differently here -$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") -if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds } - $dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password } } diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index ddf4efc81a4a..dd2564aef012 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -52,78 +52,126 @@ if [[ `uname -s` == "Darwin" ]]; then TB='' fi -# Ensure there is a ... section. -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding ... section." - ConfigNodeHeader="" - PackageSourcesTemplate="${TB}${NL}${TB}" +# Enables an internal package source by name, if found. Returns 0 if found and enabled, 1 if not found. +EnableInternalPackageSource() { + local PackageSourceName="$1" + + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return 1 # No disabled sources section + fi + + # Check if this source name is disabled + grep -i " /dev/null + if [ "$?" == "0" ]; then + echo "Enabling internal source '$PackageSourceName'." + # Remove the disabled entry + local OldDisableValue="" + local NewDisableValue="" + sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + + # Add the source name to PackageSources for credential handling + PackageSources+=("$PackageSourceName") + return 0 # Found and enabled + fi + + return 1 # Not found in disabled sources +} + +# Add source entry to PackageSources +AddPackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Check if source already exists + grep -i " /dev/null + if [ "$?" == "0" ]; then + echo "Package source $SourceName already present and enabled." + PackageSources+=("$SourceName") + return + fi + + echo "Adding package source $SourceName" + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" "$ConfigFile" + PackageSources+=("$SourceName") +} + +# Adds or enables the package source with the given name +AddOrEnablePackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Try to enable if disabled, if not found then add new source + EnableInternalPackageSource "$SourceName" + if [ "$?" != "0" ]; then + AddPackageSource "$SourceName" "$SourceEndPoint" + fi +} - sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile -fi +# Enable all darc-int package sources +EnableMaestroInternalPackageSources() { + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return # No disabled sources section + fi + + # Find all darc-int disabled sources + local DisabledDarcIntSources=() + DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' "$ConfigFile" | tr -d '"') + + for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do + if [[ $DisabledSourceName == darc-int* ]]; then + EnableInternalPackageSource "$DisabledSourceName" + fi + done +} -# Ensure there is a ... section. -grep -i "" $ConfigFile +# Ensure there is a ... section. +grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding ... section." - - PackageSourcesNodeFooter="" - PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 fi PackageSources=() -# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present -grep -i "... section. + grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + echo "Adding ... section." - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3.1-internal') - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal-transport to the packageSources." PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile fi - PackageSources+=('dotnet3.1-internal-transport') +fi + +# Check for disabledPackageSources; we'll enable any darc-int ones we find there +grep -i "" $ConfigFile > /dev/null +if [ "$?" == "0" ]; then + echo "Checking for any darc-int disabled package sources in the disabledPackageSources node" + EnableMaestroInternalPackageSources fi DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; - grep -i " /dev/null if [ "$?" == "0" ]; then - grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal") - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding $FeedPrefix-internal-transport to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal-transport") + AddOrEnablePackageSource "$FeedPrefix-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/$FeedSuffix" + AddOrEnablePackageSource "$FeedPrefix-internal-transport" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/$FeedSuffix" fi done @@ -139,29 +187,12 @@ if [ "$CredToken" ]; then # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding credentials for $FeedName." + echo " Inserting credential for feed: $FeedName" PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + NewCredential="${TB}${TB}<$FeedName>${NL}${TB}${NL}${TB}${TB}${NL}${TB}${TB}" sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi done fi - -# Re-enable any entries in disabledPackageSources where the feed name contains darc-int -grep -i "" $ConfigFile -if [ "$?" == "0" ]; then - DisabledDarcIntSources=() - echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile" - DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"') - for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do - if [[ $DisabledSourceName == darc-int* ]] - then - OldDisableValue="" - NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile - echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" - fi - done -fi diff --git a/global.json b/global.json index 961a6a24083c..37e4c5db08f5 100644 --- a/global.json +++ b/global.json @@ -32,11 +32,11 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25508.109", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25508.109", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25508.109", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25510.104", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25510.104", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25510.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" + "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" } } diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index adb7dd2c416f..2d29fd599a7e 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -110,6 +110,14 @@ + + + + + $(CompilerAdditionalOptions) -bcgg + + + $(IntermediateOutputPath)wixpack @@ -117,6 +125,7 @@