diff --git a/src/sdk/NuGet.config b/src/sdk/NuGet.config index e226baf9b0b6..c05664ac0302 100644 --- a/src/sdk/NuGet.config +++ b/src/sdk/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/src/sdk/eng/Version.Details.props b/src/sdk/eng/Version.Details.props index 866781fea35d..3ff07cce2b30 100644 --- a/src/sdk/eng/Version.Details.props +++ b/src/sdk/eng/Version.Details.props @@ -8,139 +8,139 @@ This file should be imported by eng/Versions.props 2.1.0 - 10.0.6-servicing.26203.109 - 10.0.6-servicing.26203.109 - 10.0.6-servicing.26203.109 - 10.0.6-servicing.26203.109 - 10.0.6 - 10.0.6-servicing.26203.109 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6-servicing.26203.109 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6-servicing.26203.109 - 10.0.6 - 10.0.6-servicing.26203.109 - 10.0.6-servicing.26203.109 - 10.0.0-preview.26203.109 - 10.0.6 - 10.0.6 + 10.0.7-servicing.26210.105 + 10.0.7-servicing.26210.105 + 10.0.7-servicing.26210.105 + 10.0.7-servicing.26210.105 + 10.0.7 + 10.0.7-servicing.26210.105 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7-servicing.26210.105 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7-servicing.26210.105 + 10.0.7 + 10.0.7-servicing.26210.105 + 10.0.7-servicing.26210.105 + 10.0.0-preview.26210.105 + 10.0.7 + 10.0.7 18.0.11 - 18.0.11-servicing-26203-109 - 7.0.2-rc.20409 - 10.0.106 - 5.0.0-2.26203.109 - 5.0.0-2.26203.109 - 5.0.0-2.26203.109 - 5.0.0-2.26203.109 - 5.0.0-2.26203.109 - 5.0.0-2.26203.109 - 5.0.0-2.26203.109 - 10.0.0-preview.26203.109 - 5.0.0-2.26203.109 - 5.0.0-2.26203.109 - 2.0.0-preview.1.26203.109 - 2.2.6 - 10.0.0-beta.26203.109 - 10.0.0-beta.26203.109 - 10.0.0-beta.26203.109 - 10.0.0-beta.26203.109 - 10.0.0-beta.26203.109 - 10.0.0-beta.26203.109 - 10.0.6 - 10.0.6 - 10.0.6-servicing.26203.109 - 10.0.6-servicing.26203.109 - 10.0.0-beta.26203.109 - 10.0.0-beta.26203.109 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 14.0.106-servicing.26203.109 - 10.0.6 - 5.0.0-2.26203.109 - 5.0.0-2.26203.109 - 10.0.6-servicing.26203.109 - 10.0.6 - 10.0.6 + 18.0.11-servicing-26210-105 + 7.0.2-rc.21105 + 10.0.107 + 5.0.0-2.26210.105 + 5.0.0-2.26210.105 + 5.0.0-2.26210.105 + 5.0.0-2.26210.105 + 5.0.0-2.26210.105 + 5.0.0-2.26210.105 + 5.0.0-2.26210.105 + 10.0.0-preview.26210.105 + 5.0.0-2.26210.105 + 5.0.0-2.26210.105 + 2.0.0-preview.1.26210.105 + 2.2.7 + 10.0.0-beta.26210.105 + 10.0.0-beta.26210.105 + 10.0.0-beta.26210.105 + 10.0.0-beta.26210.105 + 10.0.0-beta.26210.105 + 10.0.0-beta.26210.105 + 10.0.7 + 10.0.7 + 10.0.7-servicing.26210.105 + 10.0.7-servicing.26210.105 + 10.0.0-beta.26210.105 + 10.0.0-beta.26210.105 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 14.0.107-servicing.26210.105 + 10.0.7 + 5.0.0-2.26210.105 + 5.0.0-2.26210.105 + 10.0.7-servicing.26210.105 + 10.0.7 + 10.0.7 10.0.0-preview.7.25377.103 - 10.0.0-preview.26203.109 - 10.0.6-servicing.26203.109 - 18.0.2-release-26203-109 - 10.0.6 - 10.0.6-servicing.26203.109 - 10.0.106 - 10.0.106 - 10.0.106 - 10.0.106 - 10.0.106 - 10.0.106 - 10.0.106 - 10.0.106 - 10.0.106-servicing.26203.109 - 10.0.106 - 10.0.106-servicing.26203.109 - 10.0.106 - 10.0.106 - 10.0.106-servicing.26203.109 - 18.0.2-release-26203-109 - 18.0.2-release-26203-109 - 3.2.6 - 10.0.6 - 10.0.6-servicing.26203.109 - 10.0.6 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 7.0.2-rc.20409 - 10.0.6 - 2.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 - 10.0.6 + 10.0.0-preview.26210.105 + 10.0.7-servicing.26210.105 + 18.0.2-release-26210-105 + 10.0.7 + 10.0.7-servicing.26210.105 + 10.0.107 + 10.0.107 + 10.0.107 + 10.0.107 + 10.0.107 + 10.0.107 + 10.0.107 + 10.0.107 + 10.0.107-servicing.26210.105 + 10.0.107 + 10.0.107-servicing.26210.105 + 10.0.107 + 10.0.107 + 10.0.107-servicing.26210.105 + 18.0.2-release-26210-105 + 18.0.2-release-26210-105 + 3.2.7 + 10.0.7 + 10.0.7-servicing.26210.105 + 10.0.7 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 7.0.2-rc.21105 + 10.0.7 + 2.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 + 10.0.7 2.3.0-preview.26203.3 4.3.0-preview.26203.3 diff --git a/src/sdk/eng/Version.Details.xml b/src/sdk/eng/Version.Details.xml index 2e6121565fa8..2a450394eb65 100644 --- a/src/sdk/eng/Version.Details.xml +++ b/src/sdk/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 @@ -68,485 +68,485 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 https://github.com/microsoft/testfx @@ -556,9 +556,9 @@ https://github.com/microsoft/testfx 1ddd2f1a558e9c79b5327c5ccc0e9e89df39d4da - + https://github.com/dotnet/dotnet - 6165bd7ac3499cb712ca489f2ce44bb665174a1a + d14d02dd9f70268be43db2ae722433f7d4461fb8 - + \ No newline at end of file diff --git a/src/sdk/eng/common/core-templates/job/job.yml b/src/sdk/eng/common/core-templates/job/job.yml index 5ce518406198..eaed6d87e653 100644 --- a/src/sdk/eng/common/core-templates/job/job.yml +++ b/src/sdk/eng/common/core-templates/job/job.yml @@ -24,12 +24,12 @@ parameters: enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false + enablePublishing: false enableBuildRetry: false mergeTestResults: false testRunTitle: '' testResultsFormat: '' name: '' - componentGovernanceSteps: [] preSteps: [] artifactPublishSteps: [] runAsPublic: false @@ -146,9 +146,6 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} - - ${{ each step in parameters.componentGovernanceSteps }}: - - ${{ step }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/core-templates/steps/cleanup-microbuild.yml parameters: diff --git a/src/sdk/eng/common/core-templates/job/publish-build-assets.yml b/src/sdk/eng/common/core-templates/job/publish-build-assets.yml index 9afcb8ae1590..06f2eed0323d 100644 --- a/src/sdk/eng/common/core-templates/job/publish-build-assets.yml +++ b/src/sdk/eng/common/core-templates/job/publish-build-assets.yml @@ -172,17 +172,18 @@ jobs: targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml' artifactName: AssetManifests displayName: 'Publish Merged Manifest' - retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + retryCountOnTaskFailure: 10 # for any files being locked + isProduction: false # just metadata for publishing - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish ReleaseConfigs Artifact - pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs' - publishLocation: Container + targetPath: '$(Build.StagingDirectory)/ReleaseConfigs' artifactName: ReleaseConfigs + retryCountOnTaskFailure: 10 # for any files being locked + isProduction: false # just metadata for publishing - ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -218,4 +219,5 @@ jobs: - template: /eng/common/core-templates/steps/publish-logs.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - JobLabel: 'Publish_Artifacts_Logs' + StageLabel: 'BuildAssetRegistry' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/src/sdk/eng/common/core-templates/jobs/jobs.yml b/src/sdk/eng/common/core-templates/jobs/jobs.yml index 01ada7476651..cc8cce452786 100644 --- a/src/sdk/eng/common/core-templates/jobs/jobs.yml +++ b/src/sdk/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,10 @@ parameters: artifacts: {} is1ESPipeline: '' + + # Publishing version w/default. + publishingVersion: 3 + repositoryAlias: self officialBuildId: '' @@ -102,6 +106,7 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} continueOnError: ${{ parameters.continueOnError }} + publishingVersion: ${{ parameters.publishingVersion }} dependsOn: - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: - ${{ each job in parameters.publishBuildAssetsDependsOn }}: diff --git a/src/sdk/eng/common/core-templates/post-build/post-build.yml b/src/sdk/eng/common/core-templates/post-build/post-build.yml index 2df4acb76859..905a6315e2d5 100644 --- a/src/sdk/eng/common/core-templates/post-build/post-build.yml +++ b/src/sdk/eng/common/core-templates/post-build/post-build.yml @@ -9,6 +9,7 @@ parameters: default: 3 values: - 3 + - 4 - name: BARBuildId displayName: BAR Build Id @@ -140,16 +141,30 @@ stages: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true + - ${{ if ne(parameters.publishingInfraVersion, 4) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + - ${{ if eq(parameters.publishingInfraVersion, 4) }}: + - task: DownloadPipelineArtifact@2 + displayName: Download Pipeline Artifacts (V4) + inputs: + itemPattern: '*/packages/**/*.nupkg' + targetPath: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload' + - task: CopyFiles@2 + displayName: Flatten packages to PackageArtifacts + inputs: + SourceFolder: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload' + Contents: '**/*.nupkg' + TargetFolder: '$(Build.ArtifactStagingDirectory)/PackageArtifacts' + flattenFolders: true - task: PowerShell@2 displayName: Validate @@ -183,16 +198,30 @@ stages: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true + - ${{ if ne(parameters.publishingInfraVersion, 4) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + - ${{ if eq(parameters.publishingInfraVersion, 4) }}: + - task: DownloadPipelineArtifact@2 + displayName: Download Pipeline Artifacts (V4) + inputs: + itemPattern: '*/packages/**/*.nupkg' + targetPath: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload' + - task: CopyFiles@2 + displayName: Flatten packages to PackageArtifacts + inputs: + SourceFolder: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload' + Contents: '**/*.nupkg' + TargetFolder: '$(Build.ArtifactStagingDirectory)/PackageArtifacts' + flattenFolders: true # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here @@ -244,16 +273,30 @@ stages: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true + - ${{ if ne(parameters.publishingInfraVersion, 4) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + - ${{ if eq(parameters.publishingInfraVersion, 4) }}: + - task: DownloadPipelineArtifact@2 + displayName: Download Pipeline Artifacts (V4) + inputs: + itemPattern: '*/assets/**' + targetPath: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload' + - task: CopyFiles@2 + displayName: Flatten assets to BlobArtifacts + inputs: + SourceFolder: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload' + Contents: '**/*' + TargetFolder: '$(Build.ArtifactStagingDirectory)/BlobArtifacts' + flattenFolders: true - task: PowerShell@2 displayName: Validate @@ -328,7 +371,7 @@ stages: scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -PublishingInfraVersion 3 -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -RequireDefaultChannels ${{ parameters.requireDefaultChannels }} diff --git a/src/sdk/eng/common/core-templates/post-build/setup-maestro-vars.yml b/src/sdk/eng/common/core-templates/post-build/setup-maestro-vars.yml index a7abd58c4bb6..6dfa99ec5e37 100644 --- a/src/sdk/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/src/sdk/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -8,12 +8,11 @@ steps: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: - - task: DownloadBuildArtifacts@0 + - task: DownloadPipelineArtifact@2 displayName: Download Release Configs inputs: - buildType: current artifactName: ReleaseConfigs - checkDownloadedFiles: true + targetPath: '$(Build.StagingDirectory)/ReleaseConfigs' - task: AzureCLI@2 name: setReleaseVars diff --git a/src/sdk/eng/common/core-templates/steps/component-governance.yml b/src/sdk/eng/common/core-templates/steps/component-governance.yml deleted file mode 100644 index cf0649aa9565..000000000000 --- a/src/sdk/eng/common/core-templates/steps/component-governance.yml +++ /dev/null @@ -1,16 +0,0 @@ -parameters: - disableComponentGovernance: false - componentGovernanceIgnoreDirectories: '' - is1ESPipeline: false - displayName: 'Component Detection' - -steps: -- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" - displayName: Set skipComponentGovernanceDetection variable -- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true - displayName: ${{ parameters.displayName }} - inputs: - ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/src/sdk/eng/common/core-templates/steps/generate-sbom.yml b/src/sdk/eng/common/core-templates/steps/generate-sbom.yml index c05f65027979..aad0a8aeda33 100644 --- a/src/sdk/eng/common/core-templates/steps/generate-sbom.yml +++ b/src/sdk/eng/common/core-templates/steps/generate-sbom.yml @@ -1,54 +1,14 @@ -# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. -# PackageName - The name of the package this SBOM represents. -# PackageVersion - The version of the package this SBOM represents. -# ManifestDirPath - The path of the directory where the generated manifest files will be placed -# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. - parameters: - PackageVersion: 10.0.0 - BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' - PackageName: '.NET' - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom - IgnoreDirectories: '' - sbomContinueOnError: true - is1ESPipeline: false - # disable publishArtifacts if some other step is publishing the artifacts (like job.yml). - publishArtifacts: true + PackageVersion: unused + BuildDropPath: unused + PackageName: unused + ManifestDirPath: unused + IgnoreDirectories: unused + sbomContinueOnError: unused + is1ESPipeline: unused + publishArtifacts: unused steps: -- task: PowerShell@2 - displayName: Prep for SBOM generation in (Non-linux) - condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) - inputs: - filePath: ./eng/common/generate-sbom-prep.ps1 - arguments: ${{parameters.manifestDirPath}} - -# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 - script: | - chmod +x ./eng/common/generate-sbom-prep.sh - ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} - displayName: Prep for SBOM generation in (Linux) - condition: eq(variables['Agent.Os'], 'Linux') - continueOnError: ${{ parameters.sbomContinueOnError }} - -- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 'Generate SBOM manifest' - continueOnError: ${{ parameters.sbomContinueOnError }} - inputs: - PackageName: ${{ parameters.packageName }} - BuildDropPath: ${{ parameters.buildDropPath }} - PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) - ${{ if ne(parameters.IgnoreDirectories, '') }}: - AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' - -- ${{ if eq(parameters.publishArtifacts, 'true')}}: - - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - args: - displayName: Publish SBOM manifest - continueOnError: ${{parameters.sbomContinueOnError}} - targetPath: '${{ parameters.manifestDirPath }}' - artifactName: $(ARTIFACT_NAME) - + echo "##vso[task.logissue type=warning]Including generate-sbom.yml is deprecated, SBOM generation is handled 1ES PT now. Remove this include." + displayName: Issue generate-sbom.yml deprecation warning diff --git a/src/sdk/eng/common/core-templates/steps/publish-logs.yml b/src/sdk/eng/common/core-templates/steps/publish-logs.yml index a9ea99ba6aaa..4eed0312b807 100644 --- a/src/sdk/eng/common/core-templates/steps/publish-logs.yml +++ b/src/sdk/eng/common/core-templates/steps/publish-logs.yml @@ -50,13 +50,14 @@ steps: TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' condition: always() -- template: /eng/common/core-templates/steps/publish-build-artifacts.yml +- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish Logs - pathToPublish: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' - publishLocation: Container - artifactName: PostBuildLogs + targetPath: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' + artifactName: PostBuildLogs_${{ parameters.StageLabel }}_${{ parameters.JobLabel }}_Attempt$(System.JobAttempt) continueOnError: true condition: always() + retryCountOnTaskFailure: 10 # for any files being locked + isProduction: false # logs are non-production artifacts diff --git a/src/sdk/eng/common/core-templates/steps/source-build.yml b/src/sdk/eng/common/core-templates/steps/source-build.yml index b9c86c18ae42..09ae5cd73ae3 100644 --- a/src/sdk/eng/common/core-templates/steps/source-build.yml +++ b/src/sdk/eng/common/core-templates/steps/source-build.yml @@ -62,4 +62,4 @@ steps: artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() - sbomEnabled: false # we don't need SBOM for logs + isProduction: false # logs are non-production artifacts diff --git a/src/sdk/eng/common/generate-sbom-prep.ps1 b/src/sdk/eng/common/generate-sbom-prep.ps1 deleted file mode 100644 index a0c7d792a76f..000000000000 --- a/src/sdk/eng/common/generate-sbom-prep.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed -) - -. $PSScriptRoot\pipeline-logging-functions.ps1 - -# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly -# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. -$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' -$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName - -Write-Host "Artifact name before : $ArtifactName" -Write-Host "Artifact name after : $SafeArtifactName" - -Write-Host "Creating dir $ManifestDirPath" - -# create directory for sbom manifest to be placed -if (!(Test-Path -path $SbomGenerationDir)) -{ - New-Item -ItemType Directory -path $SbomGenerationDir - Write-Host "Successfully created directory $SbomGenerationDir" -} -else{ - Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." -} - -Write-Host "Updating artifact name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/src/sdk/eng/common/generate-sbom-prep.sh b/src/sdk/eng/common/generate-sbom-prep.sh deleted file mode 100755 index b8ecca72bbf5..000000000000 --- a/src/sdk/eng/common/generate-sbom-prep.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" - -# resolve $SOURCE until the file is no longer a symlink -while [[ -h $source ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -. $scriptroot/pipeline-logging-functions.sh - - -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" -manifest_dir=$1 - -# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly -# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. -sbom_generation_dir="$manifest_dir/$safe_artifact_name" - -if [ ! -d "$sbom_generation_dir" ] ; then - mkdir -p "$sbom_generation_dir" - echo "Sbom directory created." $sbom_generation_dir -else - Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." -fi - -echo "Artifact name before : "$artifact_name -echo "Artifact name after : "$safe_artifact_name -export ARTIFACT_NAME=$safe_artifact_name -echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" - -exit 0 diff --git a/src/sdk/eng/common/template-guidance.md b/src/sdk/eng/common/template-guidance.md index 4bf4cf41bd7c..e2b07a865f10 100644 --- a/src/sdk/eng/common/template-guidance.md +++ b/src/sdk/eng/common/template-guidance.md @@ -82,7 +82,6 @@ eng\common\ publish-build-artifacts.yml (logic) publish-pipeline-artifacts.yml (logic) component-governance.yml (shim) - generate-sbom.yml (shim) publish-logs.yml (shim) retain-build.yml (shim) send-to-helix.yml (shim) @@ -107,7 +106,6 @@ eng\common\ setup-maestro-vars.yml (logic) steps\ component-governance.yml (logic) - generate-sbom.yml (logic) publish-build-artifacts.yml (redirect) publish-logs.yml (logic) publish-pipeline-artifacts.yml (redirect) diff --git a/src/sdk/eng/common/templates-official/job/job.yml b/src/sdk/eng/common/templates-official/job/job.yml index 92a0664f5647..d68e9fbc2656 100644 --- a/src/sdk/eng/common/templates-official/job/job.yml +++ b/src/sdk/eng/common/templates-official/job/job.yml @@ -1,24 +1,15 @@ parameters: -# Sbom related params - enableSbom: true runAsPublic: false - PackageVersion: 9.0.0 - BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' +# Sbom related params, unused now and can eventually be removed + enableSbom: unused + PackageVersion: unused + BuildDropPath: unused jobs: - template: /eng/common/core-templates/job/job.yml parameters: is1ESPipeline: true - componentGovernanceSteps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/templates/steps/generate-sbom.yml - parameters: - PackageVersion: ${{ parameters.packageVersion }} - BuildDropPath: ${{ parameters.buildDropPath }} - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom - publishArtifacts: false - # publish artifacts # for 1ES managed templates, use the templateContext.output to handle multiple outputs. templateContext: @@ -26,12 +17,19 @@ jobs: outputs: - ${{ if ne(parameters.artifacts.publish, '') }}: - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - - output: buildArtifacts + - output: pipelineArtifact displayName: Publish pipeline artifacts - PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' - ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} - condition: always() - retryCountOnTaskFailure: 10 # for any logs being locked + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts' + artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + condition: succeeded() + retryCountOnTaskFailure: 10 # for any files being locked + continueOnError: true + - output: pipelineArtifact + displayName: Publish pipeline artifacts + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts' + artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}_Attempt$(System.JobAttempt) + condition: not(succeeded()) + retryCountOnTaskFailure: 10 # for any files being locked continueOnError: true - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - output: pipelineArtifact @@ -40,18 +38,18 @@ jobs: displayName: 'Publish logs' continueOnError: true condition: always() - retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + retryCountOnTaskFailure: 10 # for any files being locked + isProduction: false # logs are non-production artifacts - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}: - - output: buildArtifacts + - output: pipelineArtifact displayName: Publish Logs - PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' - publishLocation: Container - ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} continueOnError: true condition: always() - sbomEnabled: false # we don't need SBOM for logs + retryCountOnTaskFailure: 10 # for any files being locked + isProduction: false # logs are non-production artifacts - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - output: pipelineArtifact @@ -59,14 +57,20 @@ jobs: artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true - sbomEnabled: false # we don't need SBOM for BuildConfiguration + retryCountOnTaskFailure: 10 # for any files being locked + isProduction: false # BuildConfiguration is a non-production artifact - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + # V4 publishing: automatically publish staged artifacts as a pipeline artifact. + # The artifact name matches the SDK's FutureArtifactName ($(System.PhaseName)_Artifacts), + # which is encoded in the asset manifest for downstream publishing to discover. + # Jobs can opt in by setting enablePublishing: true. + - ${{ if and(eq(parameters.publishingVersion, 4), eq(parameters.enablePublishing, 'true')) }}: - output: pipelineArtifact - displayName: Publish SBOM manifest + displayName: 'Publish V4 pipeline artifacts' + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts' + artifactName: '$(System.PhaseName)_Artifacts' continueOnError: true - targetPath: $(Build.ArtifactStagingDirectory)/sbom - artifactName: $(ARTIFACT_NAME) + retryCountOnTaskFailure: 10 # for any files being locked # add any outputs provided via root yaml - ${{ if ne(parameters.templateContext.outputs, '') }}: diff --git a/src/sdk/eng/common/templates-official/steps/component-governance.yml b/src/sdk/eng/common/templates-official/steps/component-governance.yml deleted file mode 100644 index 30bb3985ca2b..000000000000 --- a/src/sdk/eng/common/templates-official/steps/component-governance.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/component-governance.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/sdk/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/src/sdk/eng/common/templates-official/steps/publish-pipeline-artifacts.yml index 172f9f0fdc97..9e5981365e56 100644 --- a/src/sdk/eng/common/templates-official/steps/publish-pipeline-artifacts.yml +++ b/src/sdk/eng/common/templates-official/steps/publish-pipeline-artifacts.yml @@ -24,5 +24,7 @@ steps: artifactName: ${{ parameters.args.artifactName }} ${{ if parameters.args.properties }}: properties: ${{ parameters.args.properties }} - ${{ if parameters.args.sbomEnabled }}: + ${{ if ne(parameters.args.sbomEnabled, '') }}: sbomEnabled: ${{ parameters.args.sbomEnabled }} + ${{ if ne(parameters.args.isProduction, '') }}: + isProduction: ${{ parameters.args.isProduction }} diff --git a/src/sdk/eng/common/templates/job/job.yml b/src/sdk/eng/common/templates/job/job.yml index 238fa0818f7b..5e261f34db42 100644 --- a/src/sdk/eng/common/templates/job/job.yml +++ b/src/sdk/eng/common/templates/job/job.yml @@ -1,12 +1,12 @@ parameters: enablePublishBuildArtifacts: false - disableComponentGovernance: '' - componentGovernanceIgnoreDirectories: '' -# Sbom related params - enableSbom: true runAsPublic: false - PackageVersion: 9.0.0 - BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' +# CG related params, unused now and can eventually be removed + disableComponentGovernance: unused +# Sbom related params, unused now and can eventually be removed + enableSbom: unused + PackageVersion: unused + BuildDropPath: unused jobs: - template: /eng/common/core-templates/job/job.yml @@ -21,32 +21,34 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} - componentGovernanceSteps: - - template: /eng/common/templates/steps/component-governance.yml - parameters: - ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false - ${{ else }}: - disableComponentGovernance: true - ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + # we don't run CG in public + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable artifactPublishSteps: - ${{ if ne(parameters.artifacts.publish, '') }}: - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: false args: displayName: Publish pipeline artifacts - pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts' - publishLocation: Container + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts' artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true - condition: always() - retryCountOnTaskFailure: 10 # for any logs being locked + condition: succeeded() + retryCountOnTaskFailure: 10 # for any files being locked + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: false + args: + displayName: Publish pipeline artifacts + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts' + artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: not(succeeded()) + retryCountOnTaskFailure: 10 # for any files being locked - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: @@ -57,20 +59,19 @@ jobs: displayName: 'Publish logs' continueOnError: true condition: always() - retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + retryCountOnTaskFailure: 10 # for any files being locked - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: false args: displayName: Publish Logs - pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' - publishLocation: Container + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} continueOnError: true condition: always() + retryCountOnTaskFailure: 10 # for any files being locked - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml @@ -81,4 +82,4 @@ jobs: artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true - sbomEnabled: false # we don't need SBOM for BuildConfiguration + retryCountOnTaskFailure: 10 # for any files being locked diff --git a/src/sdk/eng/common/templates/steps/component-governance.yml b/src/sdk/eng/common/templates/steps/component-governance.yml deleted file mode 100644 index c12a5f8d21d7..000000000000 --- a/src/sdk/eng/common/templates/steps/component-governance.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/component-governance.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/sdk/global.json b/src/sdk/global.json index 6f9207378ac4..db89a0caef6e 100644 --- a/src/sdk/global.json +++ b/src/sdk/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26203.109", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26203.109", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26210.105", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26210.105", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" diff --git a/src/source-manifest.json b/src/source-manifest.json index d0b3975e7533..bcb4f5d1cc15 100644 --- a/src/source-manifest.json +++ b/src/source-manifest.json @@ -91,10 +91,10 @@ "commitSha": "52decd1eeea01ce6e2da5790adc6dbe57a76c92c" }, { - "barId": 310486, + "barId": 310660, "path": "sdk", "remoteUri": "https://github.com/dotnet/sdk", - "commitSha": "ab087c16909fbd3f213ece779b8be689439518f2" + "commitSha": "ae2f7ca86b4b1a7d9ebb9b09c0ef49f90e8646d9" }, { "barId": 310097,