diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97c9067b4c99..536b4f54304d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 @@ -64,58 +64,58 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 https://github.com/nuget/nuget.client @@ -186,357 +186,357 @@ https://github.com/nuget/nuget.client 1a0b6d016d825bf435eb081bbff91a0cec4ade77 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 https://github.com/dotnet/arcade-services @@ -554,9 +554,9 @@ https://github.com/microsoft/testfx 7121ce9543814b0868b7bfdd4bd3dd63c7dd9b81 - + https://github.com/dotnet/dotnet - 04b9001ab9ace9980b9b862278eaafedfe599432 + be8cb623e031f933b5b62e82d37094b4981dce30 diff --git a/eng/Versions.props b/eng/Versions.props index f9dc9e09a3df..7edafcebb495 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,7 +54,7 @@ https://dotnetclimsrc.blob.core.windows.net/dotnet/ - 10.0.0-preview.25313.102 + 10.0.0-preview.25315.102 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.25313.102 + 2.0.0-beta5.25315.102 2.0.0-beta5.25279.2 1.1.2-beta1.22216.1 10.3.0 @@ -81,11 +81,11 @@ - 2.0.0-preview.1.25313.102 + 2.0.0-preview.1.25315.102 - 2.2.0-beta.25313.102 + 2.2.0-beta.25315.102 @@ -97,44 +97,44 @@ - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 8.0.0-rc.1.23414.4 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 2.1.0 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 8.0.0 @@ -150,8 +150,8 @@ - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 @@ -170,13 +170,13 @@ - 17.15.0-preview-25313-102 - 17.15.0-preview-25313-102 - 17.15.0-preview-25313-102 + 17.15.0-preview-25315-102 + 17.15.0-preview-25315-102 + 17.15.0-preview-25315-102 - 10.0.0-preview.25313.102 + 10.0.0-preview.25315.102 @@ -197,83 +197,83 @@ 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-25313-102 - 17.15.0-preview-25313-102 + 17.15.0-preview-25315-102 + 17.15.0-preview-25315-102 17.11.4 17.13 - 10.0.100-preview.6.25313.102 - 10.0.100-preview.6.25313.102 - 10.0.100-preview.6.25313.102 - 10.0.100-preview.6.25313.102 - 10.0.100-preview.6.25313.102 + 10.0.100-preview.6.25315.102 + 10.0.100-preview.6.25315.102 + 10.0.100-preview.6.25315.102 + 10.0.100-preview.6.25315.102 + 10.0.100-preview.6.25315.102 - 10.0.100-preview.6.25313.102 - 10.0.100-preview.6.25313.102 - 10.0.100-preview.6.25313.102 - 10.0.100-preview.6.25313.102 + 10.0.100-preview.6.25315.102 + 10.0.100-preview.6.25315.102 + 10.0.100-preview.6.25315.102 + 10.0.100-preview.6.25315.102 - 14.0.100-beta.25313.102 + 14.0.100-beta.25315.102 - 5.0.0-1.25313.102 - 5.0.0-1.25313.102 - 5.0.0-1.25313.102 - 5.0.0-1.25313.102 - 5.0.0-1.25313.102 - 5.0.0-1.25313.102 - 5.0.0-1.25313.102 - 5.0.0-1.25313.102 - 5.0.0-1.25313.102 - 5.0.0-1.25313.102 + 5.0.0-1.25315.102 + 5.0.0-1.25315.102 + 5.0.0-1.25315.102 + 5.0.0-1.25315.102 + 5.0.0-1.25315.102 + 5.0.0-1.25315.102 + 5.0.0-1.25315.102 + 5.0.0-1.25315.102 + 5.0.0-1.25315.102 + 5.0.0-1.25315.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 10.0.0-preview.5.25265.101 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 10.0.0-preview.5.25265.101 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 - 10.0.0-preview.25313.102 - 10.0.0-preview.25313.102 - 10.0.0-preview.25313.102 + 10.0.0-preview.25315.102 + 10.0.0-preview.25315.102 + 10.0.0-preview.25315.102 - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 3.1.56 3.1.56 @@ -283,8 +283,8 @@ - 10.0.0-preview.6.25313.102 - 10.0.0-preview.6.25313.102 + 10.0.0-preview.6.25315.102 + 10.0.0-preview.6.25315.102 2.2.0-beta.19072.10 @@ -297,21 +297,21 @@ - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 - 10.0.0-beta.25313.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 + 10.0.0-beta.25315.102 diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index 99c2326fc190..c2917c1efc1c 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,15 +1,15 @@ parameters: sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog steps: - task: UseDotNet@2 - displayName: "Source Index: Use .NET 8 SDK" + displayName: "Source Index: Use .NET 9 SDK" inputs: packageType: sdk - version: 8.0.x + version: 9.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index d6f005b5dabe..8abfb71f7275 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -295,8 +295,8 @@ while :; do ;; noble) # Ubuntu 24.04 __CodeName=noble - if [[ -n "$__LLDB_Package" ]]; then - __LLDB_Package="liblldb-18-dev" + if [[ -z "$__LLDB_Package" ]]; then + __LLDB_Package="liblldb-19-dev" fi ;; stretch) # Debian 9 diff --git a/eng/common/dotnet.cmd b/eng/common/dotnet.cmd new file mode 100644 index 000000000000..527fa4bb38fb --- /dev/null +++ b/eng/common/dotnet.cmd @@ -0,0 +1,7 @@ +@echo off + +:: This script is used to install the .NET SDK. +:: It will also invoke the SDK with any provided arguments. + +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*" +exit /b %ErrorLevel% diff --git a/eng/common/dotnet.ps1 b/eng/common/dotnet.ps1 new file mode 100644 index 000000000000..45e5676c9ebd --- /dev/null +++ b/eng/common/dotnet.ps1 @@ -0,0 +1,11 @@ +# This script is used to install the .NET SDK. +# It will also invoke the SDK with any provided arguments. + +. $PSScriptRoot\tools.ps1 +$dotnetRoot = InitializeDotNetCli -install:$true + +# Invoke acquired SDK with args if they are provided +if ($args.count -gt 0) { + $env:DOTNET_NOLOGO=1 + & "$dotnetRoot\dotnet.exe" $args +} diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh new file mode 100755 index 000000000000..2ef68235675f --- /dev/null +++ b/eng/common/dotnet.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +# This script is used to install the .NET SDK. +# It will also invoke the SDK with any provided arguments. + +source="${BASH_SOURCE[0]}" +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +source $scriptroot/tools.sh +InitializeDotNetCli true # install + +# Invoke acquired SDK with args if they are provided +if [[ $# > 0 ]]; then + __dotnetDir=${_InitializeDotNetCli} + dotnetPath=${__dotnetDir}/dotnet + ${dotnetPath} "$@" +fi diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml index 670cf32c3bd1..c1b6fec45841 100644 --- a/eng/common/templates/vmr-build-pr.yml +++ b/eng/common/templates/vmr-build-pr.yml @@ -1,14 +1,5 @@ trigger: none -pr: - branches: - include: - - main - - release/* - paths: - exclude: - - documentation/* - - README.md - - CODEOWNERS +pr: none variables: - template: /eng/common/templates/variables/pool-providers.yml@self diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c9e39595b586..40f0aa86128e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -765,28 +765,13 @@ function MSBuild() { $toolsetBuildProject = InitializeToolset $basePath = Split-Path -parent $toolsetBuildProject - $possiblePaths = @( - # new scripts need to work with old packages, so we need to look for the old names/versions - (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')), - - # This list doesn't need to be updated anymore and can eventually be removed. - (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')), - (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll')) - ) - $selectedPath = $null - foreach ($path in $possiblePaths) { - if (Test-Path $path -PathType Leaf) { - $selectedPath = $path - break - } - } + $selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll') + if (-not $selectedPath) { - Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.' + Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath" ExitWithExitCode 1 } + $args += "/logger:$selectedPath" } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a7e849315106..3def02a638d2 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -447,27 +447,13 @@ function MSBuild { fi local toolset_dir="${_InitializeToolset%/*}" - # new scripts need to work with old packages, so we need to look for the old names/versions - local selectedPath= - local possiblePaths=() - possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.Arcade.Sdk.dll" ) - - # This list doesn't need to be updated anymore and can eventually be removed. - possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" ) - for path in "${possiblePaths[@]}"; do - if [[ -f $path ]]; then - selectedPath=$path - break - fi - done + local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" + if [[ -z "$selectedPath" ]]; then - Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly." + Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly: $selectedPath" ExitWithExitCode 1 fi + args+=( "-logger:$selectedPath" ) fi diff --git a/global.json b/global.json index 13a96a49d2f5..51e605f2fec5 100644 --- a/global.json +++ b/global.json @@ -14,8 +14,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25313.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25313.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25315.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25315.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf index 01342503c75c..a7e38e941524 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf @@ -3888,4 +3888,4 @@ To display a value, specify the corresponding command-line option without provid - \ No newline at end of file + diff --git a/src/Layout/redist/targets/Crossgen.targets b/src/Layout/redist/targets/Crossgen.targets index 3817ea7656d8..30fc39599edc 100644 --- a/src/Layout/redist/targets/Crossgen.targets +++ b/src/Layout/redist/targets/Crossgen.targets @@ -21,8 +21,7 @@ true - $(RedistInstallerLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion) - $(RedistInstallerLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCorePlatformsPackageVersion) + $(RedistInstallerLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion)