diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a96281cad429..4bf9863cd966 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 - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c - + https://github.com/dotnet/dotnet - c0e325f90fb79db0da6be5128dc292f2aabb264f + 87e4c823cc62a13a3e8afbddc78bf718971f376c https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index fc762f1006d3..bb8fa0146f8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,101 +67,101 @@ --> - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 9.8.0-preview.1.25369.1 9.8.0-preview.1.25369.1 9.8.0-preview.1.25369.1 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 - 10.0.0-preview.7.25373.104 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 + 10.0.0-preview.7.25374.102 - 10.0.0-beta.25373.104 - 10.0.0-beta.25373.104 - 10.0.0-beta.25373.104 - 10.0.0-beta.25373.104 + 10.0.0-beta.25374.102 + 10.0.0-beta.25374.102 + 10.0.0-beta.25374.102 + 10.0.0-beta.25374.102 - 3.2.0-preview.25373.104 + 3.2.0-preview.25374.102 1.0.0-prerelease.25364.1 1.0.0-prerelease.25364.1 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 6badecba7bcc..d9013251542c 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -20,6 +20,7 @@ parameters: artifacts: '' enableMicrobuild: false enableMicrobuildForMacAndLinux: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -128,6 +129,7 @@ jobs: parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} + microbuildUseESRP: ${{ parameters.microbuildUseESRP }} continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f3064a7834ed..da30e67bc34c 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -4,8 +4,16 @@ parameters: # Enable install tasks for MicroBuild on Mac and Linux # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false + # Determines whether the ESRP service connection information should be passed to the signing plugin. + # This overlaps with _SignType to some degree. We only need the service connection for real signing. + # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place. + # Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod. + # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The + # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. + microbuildUseESRP: true # Location of the MicroBuild output folder microBuildOutputFolder: '$(Build.SourcesDirectory)' + continueOnError: false steps: @@ -21,19 +29,37 @@ steps: workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + - script: | + REM Check if ESRP is disabled while SignType is real + if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" ( + echo Error: ESRP must be enabled when SignType is real. + exit /b 1 + ) + displayName: 'Validate ESRP usage (Windows)' + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + - script: | + # Check if ESRP is disabled while SignType is real + if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then + echo "Error: ESRP must be enabled when SignType is real." + exit 1 + fi + displayName: 'Validate ESRP usage (Non-Windows)' + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: - azureSubscription: 'MicroBuild Signing Task (DevDiv)' - useEsrpCli: true - ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: + azureSubscription: 'MicroBuild Signing Task (DevDiv)' + useEsrpCli: true + ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} diff --git a/global.json b/global.json index 10a1e748cf1b..b3fbdf60fbfa 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25373.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25373.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25373.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25374.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25374.102", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25374.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }