diff --git a/Directory.Build.props b/Directory.Build.props index 7819eff9b3c3..58ea8e590950 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -23,6 +23,7 @@ illumos linux + $(PortableTargetRid.Substring(0, $(PortableTargetRid.LastIndexOf('-')))) $(TargetRid.Substring(0, $(TargetRid.LastIndexOf('-')))) $(HostOSName) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b718117e6d2..549f646b9d60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 @@ -64,61 +64,61 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 https://github.com/nuget/nuget.client @@ -189,357 +189,357 @@ https://github.com/nuget/nuget.client eb38c4a6cccfce5ee9415da1a930fc6534194b2b - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 https://github.com/dotnet/arcade-services @@ -557,9 +557,9 @@ https://github.com/microsoft/testfx 0138b4a65787965df7e592b83d32a237b9e65b26 - + https://github.com/dotnet/dotnet - 20343176cfd35b56036dc4ca9d9ddd2a201a4e92 + 67889d9d2f21a890ac29bcd175c0d1937a401781 diff --git a/eng/Versions.props b/eng/Versions.props index 12aa28b68b92..c9a9866ee258 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,7 +54,7 @@ https://dotnetclimsrc.blob.core.windows.net/dotnet/ - 10.0.0-preview.25316.103 + 10.0.0-preview.25320.118 1.0.0-20230414.1 2.23.0 2.0.1-servicing-26011-01 @@ -63,7 +63,7 @@ 4.8.6 1.2.0-beta.435 4.0.5 - 2.0.0-beta5.25316.103 + 2.0.0-beta6.25320.118 2.0.0-beta5.25279.2 1.1.2-beta1.22216.1 10.3.0 @@ -81,11 +81,11 @@ - 2.0.0-preview.1.25316.103 + 2.0.0-preview.1.25320.118 - 2.2.0-beta.25316.103 + 2.2.0-beta.25320.118 @@ -97,44 +97,44 @@ - 10.0.0-preview.6.25316.103 + 10.0.0-preview.7.25320.118 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 8.0.0-rc.1.23414.4 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 2.1.0 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 8.0.0 @@ -150,8 +150,8 @@ - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 + 10.0.0-preview.6.25320.118 + 10.0.0-preview.6.25320.118 @@ -170,13 +170,13 @@ - 17.15.0-preview-25316-103 - 17.15.0-preview-25316-103 - 17.15.0-preview-25316-103 + 17.15.0-preview-25320-118 + 17.15.0-preview-25320-118 + 17.15.0-preview-25320-118 - 10.0.0-preview.25316.103 + 10.0.0-preview.25320.118 @@ -197,84 +197,84 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.15.0-preview-25316-103 - 17.15.0-preview-25316-103 + 17.15.0-preview-25320-118 + 17.15.0-preview-25320-118 17.11.4 17.13 - 10.0.100-preview.6.25316.103 - 10.0.100-preview.6.25316.103 - 10.0.100-preview.6.25316.103 - 10.0.100-preview.6.25316.103 - 10.0.100-preview.6.25316.103 + 10.0.100-preview.6.25320.118 + 10.0.100-preview.6.25320.118 + 10.0.100-preview.6.25320.118 + 10.0.100-preview.6.25320.118 + 10.0.100-preview.6.25320.118 - 10.0.100-preview.6.25316.103 - 10.0.100-preview.6.25316.103 - 10.0.100-preview.6.25316.103 - 10.0.100-preview.6.25316.103 + 10.0.100-preview.6.25320.118 + 10.0.100-preview.6.25320.118 + 10.0.100-preview.6.25320.118 + 10.0.100-preview.6.25320.118 - 14.0.100-beta.25316.103 + 14.0.100-beta.25320.118 - 5.0.0-1.25316.103 - 5.0.0-1.25316.103 - 5.0.0-1.25316.103 - 5.0.0-1.25316.103 - 5.0.0-1.25316.103 - 5.0.0-1.25316.103 - 5.0.0-1.25316.103 - 5.0.0-1.25316.103 - 5.0.0-1.25316.103 - 5.0.0-1.25316.103 + 5.0.0-1.25320.118 + 5.0.0-1.25320.118 + 5.0.0-1.25320.118 + 5.0.0-1.25320.118 + 5.0.0-1.25320.118 + 5.0.0-1.25320.118 + 5.0.0-1.25320.118 + 5.0.0-1.25320.118 + 5.0.0-1.25320.118 + 5.0.0-1.25320.118 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 10.0.0-preview.5.25265.101 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 10.0.0-preview.5.25265.101 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 - 10.0.0-preview.25316.103 - 10.0.0-preview.25316.103 - 10.0.0-preview.25316.103 + 10.0.0-preview.25320.118 + 10.0.0-preview.25320.118 + 10.0.0-preview.25320.118 - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 + 10.0.0-preview.7.25320.118 + 10.0.0-preview.7.25320.118 3.1.56 3.1.56 @@ -284,8 +284,8 @@ - 10.0.0-preview.6.25316.103 - 10.0.0-preview.6.25316.103 + 10.0.0-preview.6.25320.118 + 10.0.0-preview.6.25320.118 2.2.0-beta.19072.10 @@ -298,21 +298,21 @@ - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 - 10.0.0-beta.25316.103 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 + 10.0.0-beta.25320.118 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 0dde553c3ebf..acf16ed34963 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -38,11 +38,6 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi - baseRidArgs= - if [ '${{ parameters.platform.baseRID }}' != '' ]; then - baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}' - fi - portableBuildArgs= if [ '${{ parameters.platform.portableBuild }}' != '' ]; then portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}' @@ -55,7 +50,6 @@ steps: ${{ parameters.platform.buildArguments }} \ $internalRuntimeDownloadArgs \ $targetRidArgs \ - $baseRidArgs \ $portableBuildArgs \ displayName: Build diff --git a/global.json b/global.json index 3e561e32dcc9..9ed2db5f5d93 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-preview.6.25302.104", + "dotnet": "10.0.100-preview.6.25315.102", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -14,8 +14,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25316.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25316.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25320.118", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25320.118", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } diff --git a/src/Layout/Directory.Build.props b/src/Layout/Directory.Build.props index 3841204999bb..b70a789b187d 100644 --- a/src/Layout/Directory.Build.props +++ b/src/Layout/Directory.Build.props @@ -33,9 +33,8 @@ $(OSName)-$(TargetArchitecture) $(TargetRid) - $(OSName) - $(PortableOSName)-$(TargetArchitecture) - $(PortableRid) + $(OSName)-$(TargetArchitecture) + $(PortableTargetRid) diff --git a/src/Layout/redist/targets/GenerateBundledVersions.targets b/src/Layout/redist/targets/GenerateBundledVersions.targets index 67d2f40a55c6..2395474c38b8 100644 --- a/src/Layout/redist/targets/GenerateBundledVersions.targets +++ b/src/Layout/redist/targets/GenerateBundledVersions.targets @@ -398,7 +398,7 @@ win-x86; " /> -