diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 28a90bad92d382..8c48a20e744d12 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.21180.1",
+ "version": "1.0.0-prerelease.21201.1",
"commands": [
"xharness"
]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 34bcbbe46e0e33..43a28051727276 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,69 +6,69 @@
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -198,17 +198,17 @@
https://github.com/mono/linker
dd7d70118b7146125781c830bbff47a8cb953f39
-
+
https://github.com/dotnet/xharness
- 5c3ac06a6a3192222857d3a3683e838f91a9751d
+ c2c34bf7fdeb5a89e83817ced9a1a2c3c4cfc15c
-
+
https://github.com/dotnet/xharness
- 5c3ac06a6a3192222857d3a3683e838f91a9751d
+ c2c34bf7fdeb5a89e83817ced9a1a2c3c4cfc15c
-
+
https://github.com/dotnet/arcade
- fd5f55c64d48b7894516cc841fba1253b2e79ffd
+ 8efbcc6582eec1d064bbb44af1f1107ca7736c7f
diff --git a/eng/Versions.props b/eng/Versions.props
index cb62f56ddcf878..f03f83af96e1c7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,19 +49,19 @@
3.9.0-5.final
3.9.0-5.final
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
- 2.5.1-beta.21179.7
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
- 6.0.0-beta.21179.7
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
+ 2.5.1-beta.21201.6
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
+ 6.0.0-beta.21201.6
5.9.0-preview.2
@@ -148,8 +148,8 @@
1.0.1-prerelease-00006
16.9.0-preview-20201201-01
- 1.0.0-prerelease.21180.1
- 1.0.0-prerelease.21180.1
+ 1.0.0-prerelease.21201.1
+ 1.0.0-prerelease.21201.1
2.4.1
2.4.2
1.3.0
diff --git a/eng/common/performance/android_scenarios.proj b/eng/common/performance/android_scenarios.proj
index d0850eab1bc03a..a9d4ce9eb1a928 100644
--- a/eng/common/performance/android_scenarios.proj
+++ b/eng/common/performance/android_scenarios.proj
@@ -19,14 +19,14 @@
- $(ScenarioDirectory)helloandroid
- copy $HELIX_CORRELATION_PAYLOAD%\HelloAndroid.apk .;$(Python) pre.py
+ $(WorkItemDirectory)
+ cd $(ScenarioDirectory)helloandroid;copy %HELIX_CORRELATION_PAYLOAD%\HelloAndroid.apk .;$(Python) pre.py
$(Python) test.py sod --scenario-name "%(Identity)"
$(Python) post.py
- $(ScenarioDirectory)helloandroid
- copy $HELIX_CORRELATION_PAYLOAD%\HelloAndroid.apk .;$(Python) pre.py --unzip
+ $(WorkItemDirectory)
+ cd $(ScenarioDirectory)helloandroid;copy %HELIX_CORRELATION_PAYLOAD%\HelloAndroid.apk .;$(Python) pre.py --unzip
$(Python) test.py sod --scenario-name "%(Identity)"
$(Python) post.py
diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1
index 174ceeb1b9d70b..b18599edabf1ba 100644
--- a/eng/common/performance/performance-setup.ps1
+++ b/eng/common/performance/performance-setup.ps1
@@ -42,6 +42,7 @@ if ($Internal) {
"perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
"perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" }
"perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" }
+ "perfpixel4a" { $Queue = "Windows.10.Amd64.Pixel.Perf" }
Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
}
$PerfLabArguments = "--upload-to-perflab-container"
diff --git a/global.json b/global.json
index 28dd3bb990da24..3cf3ecc936c9dd 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.21179.7",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21179.7",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21179.7",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21179.7",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21201.6",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21201.6",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21201.6",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21201.6",
"Microsoft.Build.NoTargets": "2.0.17",
"Microsoft.Build.Traversal": "2.1.1",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.4.21178.6"