diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eb2edc8f267..ae10ab52298c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,337 +8,337 @@ See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc. --> - + - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee @@ -357,52 +357,52 @@ https://github.com/dotnet/roslyn afdd413cee50c16318620252e4e64dc326e2d300 - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 5e6dacd4d3debda3266224b2a434811c6fa94987 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 5e6dacd4d3debda3266224b2a434811c6fa94987 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index ed056a7a6f7c..1869f6dca62a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,97 +67,97 @@ --> - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 9.6.0-preview.1.25260.2 9.6.0-preview.1.25260.2 - 10.0.0-preview.4.25260.104 - 10.0.0-preview.4.25260.104 - 10.0.0-preview.4.25260.104 - 10.0.0-preview.4.25260.104 - 10.0.0-preview.4.25260.104 - 10.0.0-preview.4.25260.104 - 10.0.0-preview.4.25260.104 - 10.0.0-preview.4.25260.104 + 10.0.0-preview.4.25265.101 + 10.0.0-preview.4.25265.101 + 10.0.0-preview.4.25265.101 + 10.0.0-preview.4.25265.101 + 10.0.0-preview.4.25265.101 + 10.0.0-preview.4.25265.101 + 10.0.0-preview.4.25265.101 + 10.0.0-preview.4.25265.101 - 10.0.100-preview.5.25258.39 - 10.0.100-preview.5.25258.39 + 10.0.100-preview.5.25265.101 + 10.0.100-preview.5.25265.101 4.13.0-3.24613.7 @@ -170,12 +170,12 @@ 6.2.4 6.2.4 - 10.0.0-beta.25260.104 - 10.0.0-beta.25260.104 - 10.0.0-beta.25260.104 - 10.0.0-beta.25260.104 + 10.0.0-beta.25265.101 + 10.0.0-beta.25265.101 + 10.0.0-beta.25265.101 + 10.0.0-beta.25265.101 - 10.0.0-preview.25260.104 + 10.0.0-preview.25265.101 1.0.0-prerelease.25217.3 1.0.0-prerelease.25217.3 diff --git a/eng/build.ps1 b/eng/build.ps1 index 5ed4fde70a45..96bc05a6cbe0 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -282,7 +282,7 @@ $MSBuildArguments += "/p:Publish=$Publish" $MSBuildArguments += "/p:TargetArchitecture=$Architecture" $MSBuildArguments += "/p:TargetOsName=win" -$MSBuildArguments += "/p:DotNetBuildRepo=$ProductBuild" +if ($ProductBuild) { $MSBuildArguments += "/p:DotNetBuildRepo=$ProductBuild" } if (-not $Configuration) { $Configuration = if ($CI) { 'Release' } else { 'Debug' } @@ -298,6 +298,7 @@ if ($RuntimeSourceFeed -or $RuntimeSourceFeedKey) { $ToolsetBuildArguments += $runtimeFeedArg $ToolsetBuildArguments += $runtimeFeedKeyArg } +if ($ProductBuild) { $ToolsetBuildArguments += "/p:DotNetBuildRepo=$ProductBuild" } # Split build categories between dotnet msbuild and desktop msbuild. Use desktop msbuild as little as possible. [string[]]$dotnetBuildArguments = '' diff --git a/eng/build.sh b/eng/build.sh index 6535c4f25580..fa217f24ec59 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -35,8 +35,8 @@ target_arch='x64' configuration='' runtime_source_feed='' runtime_source_feed_key='' -source_build=false -product_build=false +source_build='' +product_build='' if [ "$(uname)" = "Darwin" ]; then target_os_name='osx' @@ -316,6 +316,8 @@ fi [ ! -z "$build_nodejs" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNodeJSUnlessSourcebuild=$build_nodejs" [ ! -z "$build_managed" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildManaged=$build_managed" [ ! -z "$build_installers" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildInstallers=$build_installers" +[ ! -z "$product_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildRepo=$product_build" +[ ! -z "$source_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildSourceOnly=$source_build" # Run restore by default unless --no-restore or --no-build was specified. [ -z "$run_restore" ] && run_restore=true @@ -333,11 +335,6 @@ msbuild_args[${#msbuild_args[*]}]="-p:Sign=$run_sign" msbuild_args[${#msbuild_args[*]}]="-p:TargetArchitecture=$target_arch" msbuild_args[${#msbuild_args[*]}]="-p:TargetOsName=$target_os_name" -sourceBuildArg="/p:DotNetBuildSourceOnly=$source_build" -productBuildArg="/p:DotNetBuildRepo=$product_build" -msbuild_args[${#msbuild_args[*]}]=$sourceBuildArg -msbuild_args[${#msbuild_args[*]}]=$productBuildArg - if [ -z "$configuration" ]; then if [ "$ci" = true ]; then configuration='Release' @@ -350,13 +347,15 @@ msbuild_args[${#msbuild_args[*]}]="-p:Configuration=$configuration" # Set up additional runtime args toolset_build_args=() if [ ! -z "$runtime_source_feed$runtime_source_feed_key" ]; then - runtimeFeedArg="/p:DotNetRuntimeSourceFeed=$runtime_source_feed" - runtimeFeedKeyArg="/p:DotNetRuntimeSourceFeedKey=$runtime_source_feed_key" + runtimeFeedArg="-p:DotNetRuntimeSourceFeed=$runtime_source_feed" + runtimeFeedKeyArg="-p:DotNetRuntimeSourceFeedKey=$runtime_source_feed_key" msbuild_args[${#msbuild_args[*]}]=$runtimeFeedArg msbuild_args[${#msbuild_args[*]}]=$runtimeFeedKeyArg toolset_build_args[${#toolset_build_args[*]}]=$runtimeFeedArg toolset_build_args[${#toolset_build_args[*]}]=$runtimeFeedKeyArg fi +[ ! -z "$product_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildRepo=$product_build" +[ ! -z "$source_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildSourceOnly=$source_build" # Initialize global variables need to be set before the import of Arcade is imported restore=$run_restore diff --git a/eng/common/build.sh b/eng/common/build.sh index 36fba82a3793..27ae2c85601f 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -136,7 +136,7 @@ while [[ $# > 0 ]]; do restore=true pack=true ;; - -productBuild|-pb) + -productbuild|-pb) build=true product_build=true restore=true diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index f2a0f347fdd6..0dde553c3ebf 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -51,13 +51,12 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack -bl \ + --source-build \ ${{ parameters.platform.buildArguments }} \ $internalRuntimeDownloadArgs \ $targetRidArgs \ $baseRidArgs \ $portableBuildArgs \ - /p:DotNetBuildSourceOnly=true \ - /p:DotNetBuildRepo=true \ displayName: Build - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 36dbd45e1ce8..e889f439b8dc 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -68,7 +68,7 @@ function InstallDarcCli { fi fi - local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" + local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" echo "Installing Darc CLI version $darcVersion..." echo "You may need to restart your command shell if this is the first dotnet tool you have installed." diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7373e5305465..5f40a3f8238a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop' # True if the build is a product build [bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } -[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() } - function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } @@ -853,7 +851,7 @@ function MSBuild-Core() { # When running on Azure Pipelines, override the returned exit code to avoid double logging. # Skip this when the build is a child of the VMR orchestrator build. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) { + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/eng/common/tools.sh b/eng/common/tools.sh index cc007b1f15ad..25f5932eee98 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -507,7 +507,7 @@ function MSBuild-Core { # When running on Azure Pipelines, override the returned exit code to avoid double logging. # Skip this when the build is a child of the VMR orchestrator build. - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index 2445fe6f7b1f..fb35fa5b26ca 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25260.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25260.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25265.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }