diff --git a/NuGet.config b/NuGet.config index 9da2d8662e4e..41ada00ac331 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3c78c3c9bfd9..70702d8d5407 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.2-servicing.25605.116 - 10.0.2-servicing.25605.116 - 10.0.2-servicing.25605.116 - 10.0.2-servicing.25605.116 + 10.0.2-servicing.25608.105 + 10.0.2-servicing.25608.105 + 10.0.2-servicing.25608.105 + 10.0.2-servicing.25608.105 10.0.2 - 10.0.2-servicing.25605.116 + 10.0.2-servicing.25608.105 10.0.2 10.0.2 10.0.2 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.2 10.0.2 10.0.2 - 10.0.2-servicing.25605.116 + 10.0.2-servicing.25608.105 10.0.2 10.0.2 10.0.2 10.0.2 - 10.0.2-servicing.25605.116 + 10.0.2-servicing.25608.105 10.0.2 - 10.0.2-servicing.25605.116 - 10.0.2-servicing.25605.116 - 10.0.0-preview.25605.116 + 10.0.2-servicing.25608.105 + 10.0.2-servicing.25608.105 + 10.0.0-preview.25608.105 10.0.2 10.0.2 18.0.6 - 18.0.6-servicing-25605-116 - 7.0.0-rc.10616 + 18.0.6-servicing-25608-105 + 7.0.0-rc.10905 10.0.102 - 5.0.0-2.25605.116 - 5.0.0-2.25605.116 - 5.0.0-2.25605.116 - 5.0.0-2.25605.116 - 5.0.0-2.25605.116 - 5.0.0-2.25605.116 - 5.0.0-2.25605.116 - 10.0.0-preview.25605.116 - 5.0.0-2.25605.116 - 5.0.0-2.25605.116 - 2.0.0-preview.1.25605.116 + 5.0.0-2.25608.105 + 5.0.0-2.25608.105 + 5.0.0-2.25608.105 + 5.0.0-2.25608.105 + 5.0.0-2.25608.105 + 5.0.0-2.25608.105 + 5.0.0-2.25608.105 + 10.0.0-preview.25608.105 + 5.0.0-2.25608.105 + 5.0.0-2.25608.105 + 2.0.0-preview.1.25608.105 2.2.2 - 10.0.0-beta.25605.116 - 10.0.0-beta.25605.116 - 10.0.0-beta.25605.116 - 10.0.0-beta.25605.116 - 10.0.0-beta.25605.116 - 10.0.0-beta.25605.116 + 10.0.0-beta.25608.105 + 10.0.0-beta.25608.105 + 10.0.0-beta.25608.105 + 10.0.0-beta.25608.105 + 10.0.0-beta.25608.105 + 10.0.0-beta.25608.105 10.0.2 10.0.2 - 10.0.2-servicing.25605.116 - 10.0.2-servicing.25605.116 - 10.0.0-beta.25605.116 - 10.0.0-beta.25605.116 + 10.0.2-servicing.25608.105 + 10.0.2-servicing.25608.105 + 10.0.0-beta.25608.105 + 10.0.0-beta.25608.105 10.0.2 10.0.2 10.0.2 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.2 10.0.2 10.0.2 - 14.0.102-servicing.25605.116 + 14.0.102-servicing.25608.105 10.0.2 - 5.0.0-2.25605.116 - 5.0.0-2.25605.116 - 10.0.2-servicing.25605.116 + 5.0.0-2.25608.105 + 5.0.0-2.25608.105 + 10.0.2-servicing.25608.105 10.0.2 10.0.2 10.0.0-preview.7.25377.103 - 10.0.0-preview.25605.116 - 10.0.2-servicing.25605.116 - 18.0.1-release-25605-116 + 10.0.0-preview.25608.105 + 10.0.2-servicing.25608.105 + 18.0.1-release-25608-105 10.0.2 - 10.0.2-servicing.25605.116 + 10.0.2-servicing.25608.105 10.0.102 10.0.102 10.0.102 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.102 10.0.102 10.0.102 - 10.0.102-servicing.25605.116 + 10.0.102-servicing.25608.105 10.0.102 - 10.0.102-servicing.25605.116 + 10.0.102-servicing.25608.105 10.0.102 10.0.102 - 10.0.102-servicing.25605.116 - 18.0.1-release-25605-116 - 18.0.1-release-25605-116 + 10.0.102-servicing.25608.105 + 18.0.1-release-25608-105 + 18.0.1-release-25608-105 3.2.2 10.0.2 - 10.0.2-servicing.25605.116 + 10.0.2-servicing.25608.105 10.0.2 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 - 7.0.0-rc.10616 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 + 7.0.0-rc.10905 10.0.2 2.0.2 10.0.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c1c19c2cff9..d468b54e279f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 - + https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - ed2ddf8a7ae00575eadfc737cb828f1c3a632305 + 279bb6e979485785576d9279b6582cf7006c6f91 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 4f45cce0f3f5..d805d5faeb94 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-azurelinux-3 + image: 1es-mariner-2 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 58b7a76814e0..76baf5c27258 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -3,7 +3,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' @@ -41,4 +41,4 @@ jobs: - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml parameters: - binLogPath: ${{ parameters.binLogPath }} \ No newline at end of file + binLogPath: ${{ parameters.binLogPath }} diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 73183deff5f3..b64b66a6275b 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -70,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c36d96bdad88..578705ee4dbd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0 - $defaultXCopyMSBuildVersion = '17.13.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0 + $defaultXCopyMSBuildVersion = '18.0.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { @@ -954,4 +954,4 @@ function Enable-Nuget-EnhancedRetry() { Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 0c497f2758bc..7fa138d99a4f 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.116", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.116", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25608.105", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25608.105", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"