diff --git a/NuGet.config b/NuGet.config index f3089b9fa979c7..770749c4dc384b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,4 +1,4 @@ - + @@ -16,6 +16,8 @@ + + diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 5e12f4af83cc37..adf118430f1eef 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -8,6 +8,10 @@ ./build.sh + + + true + $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) @@ -37,6 +41,8 @@ $(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) + + $(InnerBuildArgs) /p:ArcadeBuildFromSource=true $(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId) $(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild) $(InnerBuildArgs) --usemonoruntime diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index c1b6dfbf053817..4a60aa29d0cb20 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,5 +1,18 @@ + - + + + + + + + + + + + + - + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eaae8cab1d824..ac4120c1678b95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,14 @@ https://github.com/dotnet/llvm-project 76f334f354eb653a7b409a5319b591ea09df5a43 - + https://github.com/dotnet/command-line-api - 5618b2d243ccdeb5c7e50a298b33b13036b4351b + 8374d5fca634a93458c84414b1604c12f765d1ab + + + https://github.com/dotnet/command-line-api + 8374d5fca634a93458c84414b1604c12f765d1ab + https://github.com/dotnet/cecil @@ -90,73 +95,94 @@ ab09b0b8d6768d58e09c033beea1570d4ca74c1f + + https://github.com/dotnet/source-build-reference-packages + e2e64d25662c00a35726d3c52f969a50edaa4f48 + + + + https://github.com/dotnet/source-build-externals + de4dda48d0cf31e13182bc24107b2246c61ed483 + + - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 + + + + https://github.com/dotnet/sourcelink + 3f43bf1b2dead2cb51f20dc47f6dfd7981248820 + + + + https://github.com/dotnet/xliff-tasks + b7fb98b199d0b1b6188da4f4bf4f5accddac98d4 + - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 @@ -271,6 +297,7 @@ https://github.com/dotnet/runtime 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + https://github.com/dotnet/runtime @@ -288,7 +315,7 @@ https://github.com/dotnet/xharness aa434d0c7e6eb46df1ec11b3c63add37d835c4d0 - + https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 @@ -323,6 +350,7 @@ https://github.com/dotnet/roslyn 1d3e90428043f6b18f517e89b8e21328dca99e56 + https://github.com/dotnet/roslyn @@ -339,6 +367,7 @@ https://github.com/dotnet/sdk 2fd62c3936f5336b836f6b12df170aa0e90da767 + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 087c2c54ff5ea3..80f7e7edc3233f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 2.5.1-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 - 8.0.0-beta.23265.1 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 2.5.1-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 + 8.0.0-beta.23267.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 246e0185369951..4646dc906e977b 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.3.23178.7" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23265.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23265.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23265.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23267.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23267.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23267.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1"