diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3199d701c9bd4b..d4619c2d96200d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,67 +4,67 @@ https://github.com/dotnet/standard cfe95a23647c7de1fe1a349343115bd7720d6949 - + https://github.com/dotnet/icu - ba48e6f5e60aa200a567f9dadef1046f7bf374ec + a39deb47c8f20ed5adb57cddbc83ac587413c4e4 - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be - + https://github.com/dotnet/arcade - 19e7e769f7ca2ece42221f7ff951e7ec705498ec + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -126,37 +126,37 @@ https://github.com/dotnet/runtime-assets edc9df4021be1dff54b8d8be88b4bee7626cb6a5 - + https://github.com/dotnet/llvm-project - 69cf173ab66c68e4282c1da56628b36d4ae2acc2 + d6c16bf3ec8315049ad0412a7d41e8858b5d0d13 - + https://github.com/dotnet/llvm-project - 69cf173ab66c68e4282c1da56628b36d4ae2acc2 + d6c16bf3ec8315049ad0412a7d41e8858b5d0d13 - + https://github.com/dotnet/llvm-project - 69cf173ab66c68e4282c1da56628b36d4ae2acc2 + d6c16bf3ec8315049ad0412a7d41e8858b5d0d13 - + https://github.com/dotnet/llvm-project - 69cf173ab66c68e4282c1da56628b36d4ae2acc2 + d6c16bf3ec8315049ad0412a7d41e8858b5d0d13 - + https://github.com/dotnet/llvm-project - 69cf173ab66c68e4282c1da56628b36d4ae2acc2 + d6c16bf3ec8315049ad0412a7d41e8858b5d0d13 - + https://github.com/dotnet/llvm-project - 69cf173ab66c68e4282c1da56628b36d4ae2acc2 + d6c16bf3ec8315049ad0412a7d41e8858b5d0d13 - + https://github.com/dotnet/llvm-project - 69cf173ab66c68e4282c1da56628b36d4ae2acc2 + d6c16bf3ec8315049ad0412a7d41e8858b5d0d13 - + https://github.com/dotnet/llvm-project - 69cf173ab66c68e4282c1da56628b36d4ae2acc2 + d6c16bf3ec8315049ad0412a7d41e8858b5d0d13 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 54546638de19a9..2aa03f5e56a47d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,16 +53,16 @@ 6.0.0-preview1.20513.4 3.8.0-4.20503.2 - 6.0.0-beta.20529.1 - 6.0.0-beta.20529.1 - 6.0.0-beta.20529.1 - 6.0.0-beta.20529.1 - 6.0.0-beta.20529.1 - 6.0.0-beta.20529.1 - 2.5.1-beta.20529.1 - 6.0.0-beta.20529.1 - 6.0.0-beta.20529.1 - 6.0.0-beta.20529.1 + 6.0.0-beta.20552.5 + 6.0.0-beta.20552.5 + 6.0.0-beta.20552.5 + 6.0.0-beta.20552.5 + 6.0.0-beta.20552.5 + 6.0.0-beta.20552.5 + 2.5.1-beta.20552.5 + 6.0.0-beta.20552.5 + 6.0.0-beta.20552.5 + 6.0.0-beta.20552.5 5.0.0-rc.1.20451.14 6.0.0-alpha.1.20501.4 @@ -151,16 +151,16 @@ 6.0.0-alpha.1.20527.2 - 6.0.0-alpha.1.20526.1 + 6.0.0-alpha.1.20552.1 - 9.0.1-alpha.1.20530.2 - 9.0.1-alpha.1.20530.2 - 9.0.1-alpha.1.20530.2 - 9.0.1-alpha.1.20530.2 - 9.0.1-alpha.1.20530.2 - 9.0.1-alpha.1.20530.2 - 9.0.1-alpha.1.20530.2 - 9.0.1-alpha.1.20530.2 + 9.0.1-alpha.1.20552.1 + 9.0.1-alpha.1.20552.1 + 9.0.1-alpha.1.20552.1 + 9.0.1-alpha.1.20552.1 + 9.0.1-alpha.1.20552.1 + 9.0.1-alpha.1.20552.1 + 9.0.1-alpha.1.20552.1 + 9.0.1-alpha.1.20552.1 diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj index cf09e40578a5b8..79a5486546ea22 100644 --- a/eng/common/performance/crossgen_perf.proj +++ b/eng/common/performance/crossgen_perf.proj @@ -68,9 +68,9 @@ $(WorkItemDirectory) - $(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) - $(Python) $(CrossgenDirectory)test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen/ - $(Python) $(CrossgenDirectory)post.py + $(Python) pre.py crossgen --core-root $(CoreRoot) --single %(Identity) + $(Python) test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen/ + $(Python) post.py @@ -78,8 +78,8 @@ $(WorkItemDirectory) $(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) - $(Python) $(Crossgen2Directory)test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen/ - $(Python) $(Crossgen2Directory)post.py + $(Python) test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen/ + $(Python) post.py diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 0edb2ae276ed8e..656c0bd9022cb2 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -82,9 +82,7 @@ $SetupArguments = "--repository https://github.com/$Repository --branch $Branch #This grabs the LKG version number of dotnet and passes it to our scripts $VersionJSON = Get-Content global.json | ConvertFrom-Json $DotNetVersion = $VersionJSON.tools.dotnet -# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0 -# $SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments" -$SetupArguments = "--dotnet-versions 6.0.100-alpha.1.20553.6 $SetupArguments" +$SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments" if ($RunFromPerformanceRepo) { diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 315815a9677743..9c0f6c90914528 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -223,9 +223,7 @@ if [[ "$use_latest_dotnet" = false ]]; then # Get the tools section from the global.json. # This grabs the LKG version number of dotnet and passes it to our scripts dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'` - # TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0 - # setup_arguments="--dotnet-versions $dotnet_version $setup_arguments" - setup_arguments="--dotnet-versions 6.0.100-alpha.1.20553.6 $setup_arguments" + setup_arguments="--dotnet-versions $dotnet_version $setup_arguments" fi if [[ "$run_from_perf_repo" = true ]]; then diff --git a/global.json b/global.json index e74fc180a0a415..d969cf5dbfc3d7 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.20554.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20529.1", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20529.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20529.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20552.5", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20552.5", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20552.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20552.5", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "2.0.1",