diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbb13caa0c135d5dc10738caa06c0528b6abf067..877971c299804aba008ddffe92a8aaa201cc0780 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup 4ace84dbf94128b4825c76cdd09b46dba7473478 - + https://github.com/dotnet/arcade - c84720afc91b635e2fbeb5dbd7e2742f18773e0e + 490732cf6dcb77631fee038da1af0df1518c2fb0 - + https://github.com/dotnet/arcade - c84720afc91b635e2fbeb5dbd7e2742f18773e0e + 490732cf6dcb77631fee038da1af0df1518c2fb0 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr b415b57a15b0c6ba77e63df901823bb46b8aafda - + https://github.com/dotnet/arcade - c84720afc91b635e2fbeb5dbd7e2742f18773e0e + 490732cf6dcb77631fee038da1af0df1518c2fb0 - + https://github.com/dotnet/arcade - c84720afc91b635e2fbeb5dbd7e2742f18773e0e + 490732cf6dcb77631fee038da1af0df1518c2fb0 - + https://github.com/dotnet/arcade - c84720afc91b635e2fbeb5dbd7e2742f18773e0e + 490732cf6dcb77631fee038da1af0df1518c2fb0 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index a83a8f44140a43ffcd8f9886ed425d7bd4d3b777..2ecbe4346ad7a1eb52cd1b4abb2ac128678d6547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,9 +41,9 @@ - 5.0.0-beta.20107.14 - 5.0.0-beta.20107.14 - 5.0.0-beta.20107.14 + 5.0.0-beta.20108.2 + 5.0.0-beta.20108.2 + 5.0.0-beta.20108.2 diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index a6916d25f00b0814de6ced8569b7016fee30aefc..e33766992945098bd90f94a88aea53fc90118e9c 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -2,7 +2,7 @@ Param( [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, [string] $CoreRootDirectory, [string] $BaselineCoreRootDirectory, - [string] $Architecture=$env:archType, + [string] $Architecture="x64", [string] $Framework="netcoreapp5.0", [string] $CompilationMode="Tiered", [string] $Repository=$env:BUILD_REPOSITORY_NAME, @@ -50,7 +50,7 @@ if ($Internal) { } # FIX ME: This is a workaround until we get this from the actual pipeline -$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations" +$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture" $SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments" if ($RunFromPerformanceRepo) { diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index ba8bfc13dd768f71590d32053923f88edd222763..94a04e0fe5519e47200e729b418b40ec4cf4c090 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -3,7 +3,7 @@ source_directory=$BUILD_SOURCESDIRECTORY core_root_directory= baseline_core_root_directory= -architecture=$archType +architecture=x64 framework=netcoreapp5.0 compilation_mode=tiered repository=$BUILD_REPOSITORY_NAME @@ -164,7 +164,7 @@ if [[ "$internal" == true ]]; then fi fi -common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations" +common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture" setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments" if [[ "$run_from_perf_repo" = true ]]; then diff --git a/global.json b/global.json index 3c22da41b56f623d0ba13cea1c531ed944a81223..e3a0c139db75bb732954f6223a15b6a3cc8ed955 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20107.14", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20107.14" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20108.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20108.2" }, "native-tools": { "strawberry-perl": "5.28.1.1-1",