diff --git a/NuGet.config b/NuGet.config
index 938d459f5562..9da2d8662e4e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,7 +4,7 @@
-
+
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 75a339897b33..3c78c3c9bfd9 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.25603.103
- 10.0.2-servicing.25603.103
- 10.0.2-servicing.25603.103
- 10.0.2-servicing.25603.103
+ 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
- 10.0.2-servicing.25603.103
+ 10.0.2-servicing.25605.116
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.25603.103
+ 10.0.2-servicing.25605.116
10.0.2
10.0.2
10.0.2
10.0.2
- 10.0.2-servicing.25603.103
+ 10.0.2-servicing.25605.116
10.0.2
- 10.0.2-servicing.25603.103
- 10.0.2-servicing.25603.103
- 10.0.0-preview.25603.103
+ 10.0.2-servicing.25605.116
+ 10.0.2-servicing.25605.116
+ 10.0.0-preview.25605.116
10.0.2
10.0.2
18.0.6
- 18.0.6-servicing-25603-103
- 7.0.0-rc.10403
+ 18.0.6-servicing-25605-116
+ 7.0.0-rc.10616
10.0.102
- 5.0.0-2.25603.103
- 5.0.0-2.25603.103
- 5.0.0-2.25603.103
- 5.0.0-2.25603.103
- 5.0.0-2.25603.103
- 5.0.0-2.25603.103
- 5.0.0-2.25603.103
- 10.0.0-preview.25603.103
- 5.0.0-2.25603.103
- 5.0.0-2.25603.103
- 2.0.0-preview.1.25603.103
+ 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
2.2.2
- 10.0.0-beta.25603.103
- 10.0.0-beta.25603.103
- 10.0.0-beta.25603.103
- 10.0.0-beta.25603.103
- 10.0.0-beta.25603.103
- 10.0.0-beta.25603.103
+ 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.2
10.0.2
- 10.0.2-servicing.25603.103
- 10.0.2-servicing.25603.103
- 10.0.0-beta.25603.103
- 10.0.0-beta.25603.103
+ 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
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.25603.103
+ 14.0.102-servicing.25605.116
10.0.2
- 5.0.0-2.25603.103
- 5.0.0-2.25603.103
- 10.0.2-servicing.25603.103
+ 5.0.0-2.25605.116
+ 5.0.0-2.25605.116
+ 10.0.2-servicing.25605.116
10.0.2
10.0.2
10.0.0-preview.7.25377.103
- 10.0.0-preview.25603.103
- 10.0.2-servicing.25603.103
- 18.0.1-release-25603-103
+ 10.0.0-preview.25605.116
+ 10.0.2-servicing.25605.116
+ 18.0.1-release-25605-116
10.0.2
- 10.0.2-servicing.25603.103
+ 10.0.2-servicing.25605.116
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.25603.103
+ 10.0.102-servicing.25605.116
10.0.102
- 10.0.102-servicing.25603.103
+ 10.0.102-servicing.25605.116
10.0.102
10.0.102
- 10.0.102-servicing.25603.103
- 18.0.1-release-25603-103
- 18.0.1-release-25603-103
+ 10.0.102-servicing.25605.116
+ 18.0.1-release-25605-116
+ 18.0.1-release-25605-116
3.2.2
10.0.2
- 10.0.2-servicing.25603.103
+ 10.0.2-servicing.25605.116
10.0.2
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
- 7.0.0-rc.10403
+ 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
10.0.2
2.0.2
10.0.2
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 583779cb2120..1c1c19c2cff9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,62 +1,62 @@
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
@@ -70,168 +70,168 @@
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
-
+
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
https://github.com/microsoft/testfx
@@ -571,7 +571,7 @@
https://github.com/dotnet/dotnet
- 5ddd0ddc0ebadca21645a05c419ed5a034454605
+ ed2ddf8a7ae00575eadfc737cb828f1c3a632305
diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml
index e7daa6d2fafe..3437087c80fc 100644
--- a/eng/common/core-templates/job/publish-build-assets.yml
+++ b/eng/common/core-templates/job/publish-build-assets.yml
@@ -120,6 +120,14 @@ jobs:
- task: NuGetAuthenticate@1
+ # Populate internal runtime variables.
+ - template: /eng/common/templates/steps/enable-internal-sources.yml
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ parameters:
+ legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
+
+ - template: /eng/common/templates/steps/enable-internal-runtimes.yml
+
- task: AzureCLI@2
displayName: Publish Build Assets
inputs:
@@ -132,6 +140,9 @@ jobs:
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:OfficialBuildId=$(OfficialBuildId)
+ -runtimeSourceFeed https://ci.dot.net/internal
+ -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
+
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
@@ -200,6 +211,8 @@ jobs:
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
+ -runtimeSourceFeed https://ci.dot.net/internal
+ -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
- template: /eng/common/core-templates/steps/publish-logs.yml
diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml
index 30530359a5d6..58b7a76814e0 100644
--- a/eng/common/core-templates/job/source-index-stage1.yml
+++ b/eng/common/core-templates/job/source-index-stage1.yml
@@ -25,10 +25,10 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool)
- image: windows.vs2022.amd64.open
+ image: windows.vs2026preview.scout.amd64.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool)
- image: windows.vs2022.amd64
+ image: windows.vs2026preview.scout.amd64
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml
index 55361908c2e9..9423d71ca3a2 100644
--- a/eng/common/core-templates/post-build/post-build.yml
+++ b/eng/common/core-templates/post-build/post-build.yml
@@ -127,11 +127,11 @@ stages:
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: $(DncEngInternalBuildPool)
- image: windows.vs2022.amd64
+ image: windows.vs2026preview.scout.amd64
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
- demands: ImageOverride -equals windows.vs2022.amd64
+ demands: ImageOverride -equals windows.vs2026preview.scout.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -175,7 +175,7 @@ stages:
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
- demands: ImageOverride -equals windows.vs2022.amd64
+ demands: ImageOverride -equals windows.vs2026preview.scout.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
@@ -236,7 +236,7 @@ stages:
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
- demands: ImageOverride -equals windows.vs2022.amd64
+ demands: ImageOverride -equals windows.vs2026preview.scout.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
@@ -307,6 +307,13 @@ stages:
- task: NuGetAuthenticate@1
+ # Populate internal runtime variables.
+ - template: /eng/common/templates/steps/enable-internal-sources.yml
+ parameters:
+ legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
+
+ - template: /eng/common/templates/steps/enable-internal-runtimes.yml
+
# Darc is targeting 8.0, so make sure it's installed
- task: UseDotNet@2
inputs:
@@ -328,3 +335,5 @@ stages:
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
+ -runtimeSourceFeed https://ci.dot.net/internal
+ -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
index f2248ebfd730..553fce66b940 100644
--- a/eng/common/core-templates/steps/install-microbuild.yml
+++ b/eng/common/core-templates/steps/install-microbuild.yml
@@ -11,22 +11,41 @@ parameters:
# 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
+ # Microbuild installation directory
+ microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild
continueOnError: false
steps:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
- # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
+ # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
- task: UseDotNet@2
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
inputs:
packageType: sdk
version: 8.0.x
- # Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
- # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
- # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
- installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
+ installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild
+ condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
+
+ - script: |
+ set -euo pipefail
+
+ # UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly
+ version=$(dotnet --version)
+ cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json
+ {
+ "sdk": {
+ "version": "$version",
+ "paths": [
+ "${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild"
+ ],
+ "errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin."
+ }
+ }
+ EOF
+ displayName: 'Add global.json to MicroBuild Installation path'
+ workingDirectory: ${{ parameters.microBuildOutputFolder }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
- script: |
@@ -64,7 +83,7 @@ steps:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
- MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
+ MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -76,6 +95,7 @@ steps:
signType: $(_SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+ workingDirectory: ${{ parameters.microBuildOutputFolder }}
${{ if eq(parameters.microbuildUseESRP, true) }}:
ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -84,7 +104,7 @@ steps:
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
env:
TeamName: $(_TeamName)
- MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
+ MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))
diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml
index 10f825e270a0..5a927b4c7bcb 100644
--- a/eng/common/core-templates/steps/publish-logs.yml
+++ b/eng/common/core-templates/steps/publish-logs.yml
@@ -26,8 +26,10 @@ steps:
# If the file exists - sensitive data for redaction will be sourced from it
# (single entry per line, lines starting with '# ' are considered comments and skipped)
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
- -BinlogToolVersion ${{parameters.BinlogToolVersion}}
+ -BinlogToolVersion '${{parameters.BinlogToolVersion}}'
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
+ -runtimeSourceFeed https://ci.dot.net/internal
+ -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
'$(publishing-dnceng-devdiv-code-r-build-re)'
'$(MaestroAccessToken)'
'$(dn-bot-all-orgs-artifact-feeds-rw)'
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
index acf16ed34963..b9c86c18ae42 100644
--- a/eng/common/core-templates/steps/source-build.yml
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -24,7 +24,7 @@ steps:
# in the default public locations.
internalRuntimeDownloadArgs=
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
- internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
+ internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey '$(dotnetbuilds-internal-container-read-token-base64)''
fi
buildConfig=Release
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 1eda208a3bbf..48e55598bdd2 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -7,7 +7,9 @@ param(
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
- [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
+ [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing,
+ [Parameter(Mandatory=$false)][string] $runtimeSourceFeed,
+ [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey
)
try {
diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1
index b7fc19591507..472d5bb562c9 100644
--- a/eng/common/post-build/redact-logs.ps1
+++ b/eng/common/post-build/redact-logs.ps1
@@ -7,8 +7,9 @@ param(
# File with strings to redact - separated by newlines.
# For comments start the line with '# ' - such lines are ignored
[Parameter(Mandatory=$false)][string] $TokensFilePath,
- [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
-)
+ [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact,
+ [Parameter(Mandatory=$false)][string] $runtimeSourceFeed,
+ [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey)
try {
$ErrorActionPreference = 'Stop'
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index b62e132d32a4..73183deff5f3 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -9,6 +9,8 @@ Param(
[switch][Alias('nobl')]$excludeCIBinaryLog,
[switch]$noWarnAsError,
[switch] $help,
+ [string] $runtimeSourceFeed = '',
+ [string] $runtimeSourceFeedKey = '',
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)
diff --git a/global.json b/global.json
index 74806919f52a..0c497f2758bc 100644
--- a/global.json
+++ b/global.json
@@ -21,8 +21,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25603.103",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25603.103",
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.116",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.116",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"