diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55a89881b55bdd..e068e5876d1717 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 https://github.com/microsoft/vstest @@ -218,9 +218,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c7d704ae223a21..fbec02609ffe81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 2.5.1-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 2.5.1-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 + 6.0.0-beta.22564.9 6.0.0-preview.1.102 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcda42b8..b5b3e5aeb3b915 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index 974e1d38abf3d4..22aecea4b48292 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22561.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22561.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22564.9", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22564.9", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22564.9", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22564.9", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"