diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index dec8cb2c5379..f611370ed192 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -7,95 +7,98 @@ This file should be imported by eng/Versions.props
- 10.0.0-rc.1.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-beta.25377.103
- 10.0.0-beta.25377.103
- 10.0.0-beta.25377.103
- 10.0.0-beta.25377.103
- 10.0.0-beta.25377.103
- 10.0.0-beta.25377.103
- 10.0.0-beta.25377.103
- 10.0.0-rc.1.25377.103
- 10.0.0-rc.1.25377.103
- 10.0.0-rc.1.25377.103
- 10.0.0-rc.1.25377.103
- 10.0.0-rc.1.25377.103
- 10.0.0-rc.1.25377.103
- 10.0.0-rc.1.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 3.2.0-preview.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
- 10.0.0-preview.7.25377.103
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-beta.25413.101
+ 10.0.0-beta.25413.101
+ 10.0.0-beta.25413.101
+ 10.0.0-beta.25413.101
+ 10.0.0-beta.25413.101
+ 10.0.0-beta.25413.101
+ 10.0.0-beta.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 3.2.0-preview.25413.101
+ 7.0.0-preview.1.41901
+ 7.0.0-preview.1.41901
+ 7.0.0-preview.1.41901
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
+ 10.0.0-rc.1.25413.101
4.13.0-3.24613.7
4.13.0-3.24613.7
@@ -116,10 +119,6 @@ This file should be imported by eng/Versions.props
17.12.36
17.12.36
17.12.36
-
- 6.2.4
- 6.2.4
- 6.2.4
@@ -185,6 +184,9 @@ This file should be imported by eng/Versions.props
$(MicrosoftNETCoreBrowserDebugHostTransportPackageVersion)
$(MicrosoftNETCorePlatformsPackageVersion)
$(MicrosoftWebXdtPackageVersion)
+ $(NuGetFrameworksPackageVersion)
+ $(NuGetPackagingPackageVersion)
+ $(NuGetVersioningPackageVersion)
$(SystemCollectionsImmutablePackageVersion)
$(SystemCompositionPackageVersion)
$(SystemConfigurationConfigurationManagerPackageVersion)
@@ -233,9 +235,5 @@ This file should be imported by eng/Versions.props
$(MicrosoftBuildFrameworkPackageVersion)
$(MicrosoftBuildTasksCorePackageVersion)
$(MicrosoftBuildUtilitiesCorePackageVersion)
-
- $(NuGetFrameworksPackageVersion)
- $(NuGetPackagingPackageVersion)
- $(NuGetVersioningPackageVersion)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9b432d69f2ed..e592c986b5bf 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,333 +8,333 @@
See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc.
-->
-
+
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
@@ -358,37 +358,37 @@
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
+
https://github.com/dotnet/dotnet
- 6a953e76162f3f079405f80e28664fa51b136740
+ adfea8e331724cfd46007dfefec405b5e5faad1d
https://github.com/dotnet/extensions
@@ -440,17 +440,17 @@
https://github.com/dotnet/msbuild
d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3
-
- https://github.com/nuget/nuget.client
- 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8
+
+ https://github.com/dotnet/dotnet
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
- https://github.com/nuget/nuget.client
- 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8
+
+ https://github.com/dotnet/dotnet
+ adfea8e331724cfd46007dfefec405b5e5faad1d
-
- https://github.com/nuget/nuget.client
- 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8
+
+ https://github.com/dotnet/dotnet
+ adfea8e331724cfd46007dfefec405b5e5faad1d
diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml
index 8034815f4213..8bf7d23355bc 100644
--- a/eng/common/core-templates/job/onelocbuild.yml
+++ b/eng/common/core-templates/job/onelocbuild.yml
@@ -4,7 +4,7 @@ parameters:
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
pool: ''
-
+
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
@@ -27,7 +27,7 @@ parameters:
is1ESPipeline: ''
jobs:
- job: OneLocBuild${{ parameters.JobNameSuffix }}
-
+
dependsOn: ${{ parameters.dependsOn }}
displayName: OneLocBuild${{ parameters.JobNameSuffix }}
@@ -99,22 +99,20 @@ jobs:
mirrorBranch: ${{ parameters.MirrorBranch }}
condition: ${{ parameters.condition }}
- - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
- parameters:
- is1ESPipeline: ${{ parameters.is1ESPipeline }}
- args:
- displayName: Publish Localization Files
- pathToPublish: '$(Build.ArtifactStagingDirectory)/loc'
- publishLocation: Container
- artifactName: Loc
- condition: ${{ parameters.condition }}
+ # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
+ - task: CopyFiles@2
+ displayName: Copy LocProject.json
+ inputs:
+ SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/'
+ Contents: 'LocProject.json'
+ TargetFolder: '$(Build.ArtifactStagingDirectory)/loc'
+ condition: ${{ parameters.condition }}
- - 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 LocProject.json
- pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
- publishLocation: Container
- artifactName: Loc
+ targetPath: '$(Build.ArtifactStagingDirectory)/loc'
+ artifactName: 'Loc'
+ displayName: 'Publish Localization Files'
condition: ${{ parameters.condition }}
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 996a5f9c8725..d4cfd9ccd806 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -257,7 +257,20 @@ function Retry($downloadBlock, $maxRetries = 5) {
function GetDotNetInstallScript([string] $dotnetRoot) {
$installScript = Join-Path $dotnetRoot 'dotnet-install.ps1'
+ $shouldDownload = $false
+
if (!(Test-Path $installScript)) {
+ $shouldDownload = $true
+ } else {
+ # Check if the script is older than 30 days
+ $fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime
+ if ($fileAge.Days -gt 30) {
+ Write-Host "Existing install script is too old, re-downloading..."
+ $shouldDownload = $true
+ }
+ }
+
+ if ($shouldDownload) {
Create-Directory $dotnetRoot
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 3def02a638d2..c1841c9dfd0f 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -300,8 +300,29 @@ function GetDotNetInstallScript {
local root=$1
local install_script="$root/dotnet-install.sh"
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+ local timestamp_file="$root/.dotnet-install.timestamp"
+ local should_download=false
if [[ ! -a "$install_script" ]]; then
+ should_download=true
+ elif [[ -f "$timestamp_file" ]]; then
+ # Check if the script is older than 30 days using timestamp file
+ local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0")
+ local current_time=$(date +%s)
+ local age_seconds=$((current_time - download_time))
+
+ # 30 days = 30 * 24 * 60 * 60 = 2592000 seconds
+ if [[ $age_seconds -gt 2592000 ]]; then
+ echo "Existing install script is too old, re-downloading..."
+ should_download=true
+ fi
+ else
+ # No timestamp file exists, assume script is old and re-download
+ echo "No timestamp found for existing install script, re-downloading..."
+ should_download=true
+ fi
+
+ if [[ "$should_download" == true ]]; then
mkdir -p "$root"
echo "Downloading '$install_script_url'"
@@ -328,6 +349,9 @@ function GetDotNetInstallScript {
ExitWithExitCode $exit_code
}
fi
+
+ # Create timestamp file to track download time in seconds from epoch
+ date +%s > "$timestamp_file"
fi
# return value
_GetDotNetInstallScript="$install_script"
diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets
index 6b6a41ca4a64..471a470911ee 100644
--- a/eng/targets/CSharp.Common.targets
+++ b/eng/targets/CSharp.Common.targets
@@ -94,7 +94,12 @@
<_Parameter2>$(RepositoryUrl)/tree/$(SourceRevisionId)
-
+
+ <_Parameter1>OriginalRepoCommitHash
+ <_Parameter2>$(RepoOriginalSourceRevisionId)
+
+
+
<_Parameter1>Serviceable
<_Parameter2>True
diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets
index 72cec114582b..e159100ea531 100644
--- a/eng/targets/Wix.Common.targets
+++ b/eng/targets/Wix.Common.targets
@@ -22,7 +22,7 @@
<_GeneratedPackageVersion>$(PackageVersion)
<_GeneratedPackageVersion
- Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)
+ Condition="! $(PackageVersion.Contains('$(_BuildNumberLabels)'))">$(VersionPrefix)-$(_PreReleaseLabel)$(_BuildNumberLabels)
$(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)
diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets
index b05e614c036f..26dae763a703 100644
--- a/eng/testing/linker/SupportFiles/Directory.Build.targets
+++ b/eng/testing/linker/SupportFiles/Directory.Build.targets
@@ -1,18 +1,8 @@
-
-
-
- true
-
-
-
-
-
$(TargetRuntimeIdentifier)
+
+ $(MicrosoftNETCoreAppRefVersion)
+
+
+
+ $(MicrosoftNETCoreAppRefVersion)
+
- true
diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in
index 60823e68259d..6f763355eb28 100644
--- a/eng/tools/GenerateFiles/Directory.Build.targets.in
+++ b/eng/tools/GenerateFiles/Directory.Build.targets.in
@@ -56,10 +56,6 @@
Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
RuntimeFrameworkVersion="${MicrosoftNETCoreAppRefVersion}"
TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" />
-
-
@@ -118,6 +114,11 @@
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}
+
+ ${MicrosoftNETCoreAppRefVersion}
+
+
$(DefaultNetCoreTargetFramework)
+ false
/app
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
index c43a347a6150..382d39138d8c 100644
--- a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
+++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
@@ -2,6 +2,7 @@
$(DefaultNetCoreTargetFramework)
+ false
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj b/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj
index deabcd7fccae..5cd17cfac619 100644
--- a/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj
+++ b/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj
@@ -6,6 +6,7 @@
enable
WasmMinimal
true
+ false
diff --git a/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html b/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html
index a9345d1495c5..7201ad0e358b 100644
--- a/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html
+++ b/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html
@@ -1,5 +1,6 @@
+
diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
index 33d1bcd4d9c9..8829d5788ee9 100644
--- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
+++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
@@ -38,7 +38,6 @@
true
true
true
- true
true
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
index 9b6b8325b7e9..6e335490fbc4 100644
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
@@ -46,7 +46,6 @@
true
true
true
- true
true