diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2e17ef92af78d8..eb8405e753e812 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
- 0f6722e8dad76f88e284f660c4634fe2e38a7654
+ 1e583e53b0d7964d578e6fa2785a51d8d017a0ff
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
https://github.com/dotnet/arcade
baebe30c7969b4148a6a3b90cf5f4e3a96d4a11e
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
https://github.com/dotnet/arcade
b6d0e8c2a27c94adc20bd97cf248d6522d20bf08
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
-
+
https://github.com/dotnet/arcade
- 61cde6e8fb9d5c9790867b279deb41783a780cd8
+ c8a7611e15656f45b039d46ec4e09f9f2a7edf99
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -90,73 +90,73 @@
https://github.com/microsoft/vstest
2418d9ec492e93245e1ce8699d6ae9cd7b86649b
-
+
https://github.com/dotnet/runtime-assets
- 429d8a77e5cde49ee94c0a7b16751ce4f40c913c
+ ed9af8227ff01d9ab010cab1f32f0f362b81cb1f
-
+
https://github.com/dotnet/runtime-assets
- 429d8a77e5cde49ee94c0a7b16751ce4f40c913c
+ ed9af8227ff01d9ab010cab1f32f0f362b81cb1f
-
+
https://github.com/dotnet/runtime-assets
- 429d8a77e5cde49ee94c0a7b16751ce4f40c913c
+ ed9af8227ff01d9ab010cab1f32f0f362b81cb1f
-
+
https://github.com/dotnet/runtime-assets
- 429d8a77e5cde49ee94c0a7b16751ce4f40c913c
+ ed9af8227ff01d9ab010cab1f32f0f362b81cb1f
-
+
https://github.com/dotnet/runtime-assets
- 429d8a77e5cde49ee94c0a7b16751ce4f40c913c
+ ed9af8227ff01d9ab010cab1f32f0f362b81cb1f
-
+
https://github.com/dotnet/runtime-assets
- 429d8a77e5cde49ee94c0a7b16751ce4f40c913c
+ ed9af8227ff01d9ab010cab1f32f0f362b81cb1f
-
+
https://github.com/dotnet/runtime-assets
- 429d8a77e5cde49ee94c0a7b16751ce4f40c913c
+ ed9af8227ff01d9ab010cab1f32f0f362b81cb1f
-
+
https://github.com/dotnet/runtime-assets
- 429d8a77e5cde49ee94c0a7b16751ce4f40c913c
+ ed9af8227ff01d9ab010cab1f32f0f362b81cb1f
-
+
https://github.com/dotnet/runtime-assets
- 429d8a77e5cde49ee94c0a7b16751ce4f40c913c
+ ed9af8227ff01d9ab010cab1f32f0f362b81cb1f
-
+
https://github.com/dotnet/llvm-project
- 67ada402f1f9e16199e876a1cab1649debe28eab
+ 2b4237fbb686b0a287e0b2693deb5567a58e452b
-
+
https://github.com/dotnet/llvm-project
- 67ada402f1f9e16199e876a1cab1649debe28eab
+ 2b4237fbb686b0a287e0b2693deb5567a58e452b
-
+
https://github.com/dotnet/llvm-project
- 67ada402f1f9e16199e876a1cab1649debe28eab
+ 2b4237fbb686b0a287e0b2693deb5567a58e452b
-
+
https://github.com/dotnet/llvm-project
- 67ada402f1f9e16199e876a1cab1649debe28eab
+ 2b4237fbb686b0a287e0b2693deb5567a58e452b
-
+
https://github.com/dotnet/llvm-project
- 67ada402f1f9e16199e876a1cab1649debe28eab
+ 2b4237fbb686b0a287e0b2693deb5567a58e452b
-
+
https://github.com/dotnet/llvm-project
- 67ada402f1f9e16199e876a1cab1649debe28eab
+ 2b4237fbb686b0a287e0b2693deb5567a58e452b
-
+
https://github.com/dotnet/llvm-project
- 67ada402f1f9e16199e876a1cab1649debe28eab
+ 2b4237fbb686b0a287e0b2693deb5567a58e452b
-
+
https://github.com/dotnet/llvm-project
- 67ada402f1f9e16199e876a1cab1649debe28eab
+ 2b4237fbb686b0a287e0b2693deb5567a58e452b
https://github.com/dotnet/runtime
@@ -190,13 +190,13 @@
https://github.com/mono/linker
337f0c5c704c52fcd570fab3c69d7fc83c82e6e0
-
+
https://github.com/dotnet/xharness
- 68d8514065c4de0ae90ad0c30a4ceec08e46faa5
+ 66955fe68fa15cddf6def2a93239d01a5d90b514
-
+
https://github.com/dotnet/xharness
- 68d8514065c4de0ae90ad0c30a4ceec08e46faa5
+ 66955fe68fa15cddf6def2a93239d01a5d90b514
diff --git a/eng/Versions.props b/eng/Versions.props
index f659ce991d6b40..9f5ee103ac4594 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -52,16 +52,16 @@
- 5.0.0-beta.20474.4
- 5.0.0-beta.20474.4
- 5.0.0-beta.20474.4
- 5.0.0-beta.20474.4
- 5.0.0-beta.20474.4
- 5.0.0-beta.20474.4
- 2.5.1-beta.20474.4
+ 5.0.0-beta.20478.3
+ 5.0.0-beta.20478.3
+ 5.0.0-beta.20478.3
+ 5.0.0-beta.20478.3
+ 5.0.0-beta.20478.3
+ 5.0.0-beta.20478.3
+ 2.5.1-beta.20478.3
5.0.0-beta.20501.10
- 5.0.0-beta.20474.4
- 5.0.0-beta.20474.4
+ 5.0.0-beta.20478.3
+ 5.0.0-beta.20478.3
5.0.0-rc.1.20451.14
6.0.0-alpha.1.20501.4
@@ -102,15 +102,15 @@
4.3.0
5.0.0-alpha.1.19563.3
- 5.0.0-beta.20476.1
- 5.0.0-beta.20476.1
- 5.0.0-beta.20476.1
- 5.0.0-beta.20476.1
- 5.0.0-beta.20476.1
- 5.0.0-beta.20476.1
- 5.0.0-beta.20476.1
- 5.0.0-beta.20476.1
- 5.0.0-beta.20476.1
+ 5.0.0-beta.20505.2
+ 5.0.0-beta.20505.2
+ 5.0.0-beta.20505.2
+ 5.0.0-beta.20505.2
+ 5.0.0-beta.20505.2
+ 5.0.0-beta.20505.2
+ 5.0.0-beta.20505.2
+ 5.0.0-beta.20505.2
+ 5.0.0-beta.20505.2
2.2.0-prerelease.19564.1
2.0.3
@@ -135,8 +135,8 @@
4.9.4
16.8.0-release-20200924-01
- 1.0.0-prerelease.20502.4
- 1.0.0-prerelease.20502.4
+ 1.0.0-prerelease.20505.1
+ 1.0.0-prerelease.20505.1
2.4.1
2.4.2
1.3.0
@@ -149,16 +149,16 @@
6.0.0-alpha.1.20478.2
- 6.0.0-alpha.1.20475.1
+ 6.0.0-alpha.1.20505.1
- 9.0.1-alpha.1.20475.1
- 9.0.1-alpha.1.20475.1
- 9.0.1-alpha.1.20475.1
- 9.0.1-alpha.1.20475.1
- 9.0.1-alpha.1.20475.1
- 9.0.1-alpha.1.20475.1
- 9.0.1-alpha.1.20475.1
- 9.0.1-alpha.1.20475.1
+ 9.0.1-alpha.1.20505.1
+ 9.0.1-alpha.1.20505.1
+ 9.0.1-alpha.1.20505.1
+ 9.0.1-alpha.1.20505.1
+ 9.0.1-alpha.1.20505.1
+ 9.0.1-alpha.1.20505.1
+ 9.0.1-alpha.1.20505.1
+ 9.0.1-alpha.1.20505.1
diff --git a/eng/common/superpmi/superpmi.proj b/eng/common/superpmi/superpmi.proj
deleted file mode 100644
index 75797de16e86fc..00000000000000
--- a/eng/common/superpmi/superpmi.proj
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
- \
-
-
- /
-
-
-
-
- %HELIX_PYTHONPATH%
- $(WorkItemDirectory)\pmiAssembliesDirectory
- %HELIX_WORKITEM_PAYLOAD%\binaries
- %HELIX_CORRELATION_PAYLOAD%\superpmi
- %HELIX_WORKITEM_UPLOAD_ROOT%
-
- $(BUILD_SOURCESDIRECTORY)\artifacts\helixresults
- $(SuperPMIDirectory)\superpmi.py collect --pmi -pmi_location $(SuperPMIDirectory)\pmi.dll
-
-
- $HELIX_PYTHONPATH
- $(WorkItemDirectory)/pmiAssembliesDirectory
- $HELIX_WORKITEM_PAYLOAD/binaries
- $HELIX_CORRELATION_PAYLOAD/superpmi
- $HELIX_WORKITEM_UPLOAD_ROOT
-
- $(BUILD_SOURCESDIRECTORY)/artifacts/helixresults
- $(SuperPMIDirectory)/superpmi.py collect --pmi -pmi_location $(SuperPMIDirectory)/pmi.dll
-
-
-
- $(Python) $(WorkItemCommand) -pmi_assemblies $(PmiAssembliesDirectory) -arch $(Architecture) -build_type $(BuildConfig) -core_root $(SuperPMIDirectory)
-
-
-
- false
- false
- 5:00
-
-
-
-
- %(Identity)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- %(HelixWorkItem.OutputMchName).$(MchFileTag).%(HelixWorkItem.PartitionId)
- $(PmiAssembliesPayload)$(FileSeparatorChar)%(HelixWorkItem.PmiAssemblies)
- $(WorkItemCommand) -output_mch_path $(OutputMchPath)$(FileSeparatorChar)%(OutputFileName).mch -log_file $(OutputMchPath)$(FileSeparatorChar)%(OutputFileName).log
- $(WorkItemTimeout)
- %(OutputFileName).mch;%(OutputFileName).mch.mct;%(OutputFileName).log
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/eng/common/templates/steps/superpmi-send-to-helix.yml b/eng/common/templates/steps/superpmi-send-to-helix.yml
deleted file mode 100644
index 7f31bfbdb022ad..00000000000000
--- a/eng/common/templates/steps/superpmi-send-to-helix.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Please remember to update the documentation if you make changes to these parameters!
-parameters:
- HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/
- HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
- HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
- HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
- HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
- HelixPreCommands: '' # optional -- commands to run before Helix work item execution
- HelixPostCommands: '' # optional -- commands to run after Helix work item execution
- WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
- CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload
- IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
- DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
- DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
- EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
- WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
- Creator: '' # optional -- if the build is external, use this to specify who is sending the job
- DisplayNamePrefix: 'Send job to Helix' # optional -- rename the beginning of the displayName of the steps in AzDO
- condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
- continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
- BuildConfig: 'checked' # optional -- Mostly, superpmi will be run on checked builds
- LibrariesArtifacts: ''
- TestsArtifacts: ''
-
-steps:
-- template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml
- parameters:
- osGroup: ${{ parameters.osGroup }}
- sendParams: $(Build.SourcesDirectory)/eng/common/superpmi/superpmi.proj /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(BuildConfig)/SendToHelix.binlog
- displayName: ${{ parameters.DisplayNamePrefix }}
- condition: ${{ parameters.condition }}
- continueOnError: ${{ parameters.continueOnError }}
- environment:
- MchFileTag: $(MchFileTag)
- BuildConfig: ${{ parameters.BuildConfig }}
- LibrariesArtifacts: ${{ parameters.LibrariesArtifacts }}
- TestsArtifacts: ${{ parameters.TestsArtifacts }}
- HelixSource: ${{ parameters.HelixSource }}
- HelixType: ${{ parameters.HelixType }}
- HelixBuild: ${{ parameters.HelixBuild }}
- HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
- HelixAccessToken: ${{ parameters.HelixAccessToken }}
- HelixPreCommands: ${{ parameters.HelixPreCommands }}
- HelixPostCommands: ${{ parameters.HelixPostCommands }}
- WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
- CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
- IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
- DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
- DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
- EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
- WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
- Creator: ${{ parameters.Creator }}
- SYSTEM_ACCESSTOKEN: $(System.AccessToken)
\ No newline at end of file
diff --git a/global.json b/global.json
index 3890a2925cf5b9..38add5133fb6f4 100644
--- a/global.json
+++ b/global.json
@@ -12,9 +12,9 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20474.4",
- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20474.4",
- "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20474.4",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20478.3",
+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20478.3",
+ "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20478.3",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20502.7",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",