From 735d20b8c1d51d080bcb6474e4f4ac72905ce4b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 May 2025 02:09:10 +0000 Subject: [PATCH 01/36] Update dependencies from https://github.com/dotnet/dotnet build 266496 --- eng/Version.Details.xml | 30 +++++++++---------- eng/Versions.props | 12 ++++---- .../core-templates/steps/source-build.yml | 11 ------- global.json | 2 +- 4 files changed, 22 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cef3f20b5..effbefb99f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 78c5fa9a48d469a19ab5a61c16c955c1f370b5be + 35ccf19f39389d127ab037709b8e9c5a1b111a20 - + https://github.com/dotnet/dotnet - 78c5fa9a48d469a19ab5a61c16c955c1f370b5be + 35ccf19f39389d127ab037709b8e9c5a1b111a20 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 78c5fa9a48d469a19ab5a61c16c955c1f370b5be + 35ccf19f39389d127ab037709b8e9c5a1b111a20 - + https://github.com/dotnet/dotnet - 78c5fa9a48d469a19ab5a61c16c955c1f370b5be + 35ccf19f39389d127ab037709b8e9c5a1b111a20 - + https://github.com/dotnet/dotnet - 78c5fa9a48d469a19ab5a61c16c955c1f370b5be + 35ccf19f39389d127ab037709b8e9c5a1b111a20 - + https://github.com/dotnet/dotnet - 78c5fa9a48d469a19ab5a61c16c955c1f370b5be + 35ccf19f39389d127ab037709b8e9c5a1b111a20 - + https://github.com/dotnet/dotnet - 78c5fa9a48d469a19ab5a61c16c955c1f370b5be + 35ccf19f39389d127ab037709b8e9c5a1b111a20 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 818f812333..a76626c1a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25229.109 - 10.0.0-preview.5.25229.109 + 10.0.0-preview.5.25230.108 + 10.0.0-preview.5.25230.108 - 10.0.0-preview.5.25229.109 - 10.0.0-preview.5.25229.109 + 10.0.0-preview.5.25230.108 + 10.0.0-preview.5.25230.108 - 10.0.100-preview.5.25229.109 + 10.0.100-preview.5.25230.108 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25229.109 + 10.0.0-beta.25230.108 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 8c88ccd7b0..c6b9ef51ac 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -121,14 +121,3 @@ steps: continueOnError: true condition: succeededOrFailed() sbomEnabled: false # we don't need SBOM for logs - -# Manually inject component detection so that we can ignore the source build upstream cache, which contains -# a nupkg cache of input packages (a local feed). -# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' -# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets -- template: /eng/common/core-templates/steps/component-governance.yml - parameters: - displayName: Component Detection (Exclude upstream cache) - is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' - disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/global.json b/global.json index 7665087403..df3032c2a0 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25229.109" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25230.108" } } From 2d7944d6f8563f3794e725030b02531a906c1287 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 May 2025 02:08:27 +0000 Subject: [PATCH 02/36] [VMR] Codeflow c174aba-c174aba [[ commit created by automation ]] --- eng/DotNetBuild.props | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 eng/DotNetBuild.props diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props deleted file mode 100644 index 2577f81660..0000000000 --- a/eng/DotNetBuild.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diagnostics - true - - - From a068691b2f6fff3c5ba846780c2bf2390fc426e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 May 2025 02:08:27 +0000 Subject: [PATCH 03/36] Update dependencies from https://github.com/dotnet/dotnet build 266608 --- eng/Version.Details.xml | 30 +++++++++---------- eng/Versions.props | 12 ++++---- .../core-templates/jobs/source-build.yml | 2 +- global.json | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index effbefb99f..d28aa3fcf1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 35ccf19f39389d127ab037709b8e9c5a1b111a20 + dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 - + https://github.com/dotnet/dotnet - 35ccf19f39389d127ab037709b8e9c5a1b111a20 + dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 35ccf19f39389d127ab037709b8e9c5a1b111a20 + dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 - + https://github.com/dotnet/dotnet - 35ccf19f39389d127ab037709b8e9c5a1b111a20 + dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 - + https://github.com/dotnet/dotnet - 35ccf19f39389d127ab037709b8e9c5a1b111a20 + dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 - + https://github.com/dotnet/dotnet - 35ccf19f39389d127ab037709b8e9c5a1b111a20 + dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 - + https://github.com/dotnet/dotnet - 35ccf19f39389d127ab037709b8e9c5a1b111a20 + dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a76626c1a3..a03a60a5a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25230.108 - 10.0.0-preview.5.25230.108 + 10.0.0-preview.5.25251.102 + 10.0.0-preview.5.25251.102 - 10.0.0-preview.5.25230.108 - 10.0.0-preview.5.25230.108 + 10.0.0-preview.5.25251.102 + 10.0.0-preview.5.25251.102 - 10.0.100-preview.5.25230.108 + 10.0.100-preview.5.25251.102 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25230.108 + 10.0.0-beta.25251.102 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index a10ccfbee6..df24c948ba 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index df3032c2a0..d623caa310 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25230.108" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.102" } } From e6084e5bec39595d2b2d57cbefb7103d01e9ad34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 3 May 2025 02:03:34 +0000 Subject: [PATCH 04/36] Update dependencies from https://github.com/dotnet/dotnet build 266652 --- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d28aa3fcf1..cd3f2ea256 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 + 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 - + https://github.com/dotnet/dotnet - dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 + 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 + 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 - + https://github.com/dotnet/dotnet - dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 + 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 - + https://github.com/dotnet/dotnet - dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 + 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 - + https://github.com/dotnet/dotnet - dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 + 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 - + https://github.com/dotnet/dotnet - dab45dead83a6cf3e5fa9df1396c51e6a6b61c07 + 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a03a60a5a5..2b569b9827 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25251.102 - 10.0.0-preview.5.25251.102 + 10.0.0-preview.5.25251.105 + 10.0.0-preview.5.25251.105 - 10.0.0-preview.5.25251.102 - 10.0.0-preview.5.25251.102 + 10.0.0-preview.5.25251.105 + 10.0.0-preview.5.25251.105 - 10.0.100-preview.5.25251.102 + 10.0.100-preview.5.25251.105 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25251.102 + 10.0.0-beta.25251.105 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/global.json b/global.json index d623caa310..0309aaa4af 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.105" } } From 4d10af5988dfb784a35a90d12f43b2a61029d914 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 May 2025 02:04:42 +0000 Subject: [PATCH 05/36] Update dependencies from https://github.com/dotnet/dotnet build 266849 --- eng/Version.Details.xml | 30 +++++++++---------- eng/Versions.props | 12 ++++---- .../core-templates/steps/source-build.yml | 19 +----------- global.json | 2 +- 4 files changed, 23 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd3f2ea256..90acca3e01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 + 86c2177121ebf8d49b372dd7232588ceaae6c7cb - + https://github.com/dotnet/dotnet - 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 + 86c2177121ebf8d49b372dd7232588ceaae6c7cb https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 + 86c2177121ebf8d49b372dd7232588ceaae6c7cb - + https://github.com/dotnet/dotnet - 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 + 86c2177121ebf8d49b372dd7232588ceaae6c7cb - + https://github.com/dotnet/dotnet - 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 + 86c2177121ebf8d49b372dd7232588ceaae6c7cb - + https://github.com/dotnet/dotnet - 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 + 86c2177121ebf8d49b372dd7232588ceaae6c7cb - + https://github.com/dotnet/dotnet - 3b83017bbef1dd0918f7c2f894cfd07f56bcd689 + 86c2177121ebf8d49b372dd7232588ceaae6c7cb https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index cea7157ec1..73e0fa7674 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25251.105 - 10.0.0-preview.5.25251.105 + 10.0.0-preview.5.25252.107 + 10.0.0-preview.5.25252.107 - 10.0.0-preview.5.25251.105 - 10.0.0-preview.5.25251.105 + 10.0.0-preview.5.25252.107 + 10.0.0-preview.5.25252.107 - 10.0.100-preview.5.25251.105 + 10.0.100-preview.5.25252.107 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25251.105 + 10.0.0-beta.25252.107 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index c6b9ef51ac..9292c9b67a 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -46,11 +46,6 @@ steps: buildConfig='$(_BuildConfig)' fi - officialBuildArgs= - if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then - officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' - fi - targetRidArgs= if [ '${{ parameters.platform.targetRID }}' != '' ]; then targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' @@ -66,16 +61,6 @@ steps: baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' fi - publishArgs= - if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then - publishArgs='--publish' - fi - - assetManifestFileName=SourceBuild_RidSpecific.xml - if [ '${{ parameters.platform.name }}' != '' ]; then - assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml - fi - portableBuildArgs= if [ '${{ parameters.platform.portableBuild }}' != '' ]; then portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}' @@ -83,9 +68,8 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ - --restore --build --pack $publishArgs -bl \ + --restore --build --pack -bl \ ${{ parameters.platform.buildArguments }} \ - $officialBuildArgs \ $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ @@ -94,7 +78,6 @@ steps: $portableBuildArgs \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ - /p:AssetManifestFileName=$assetManifestFileName displayName: Build # Upload build logs for diagnosis. diff --git a/global.json b/global.json index 0309aaa4af..cae0993d86 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.105" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25252.107" } } From f854cfbf85ed10466bcd387d46d9934e065523fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 May 2025 02:04:34 +0000 Subject: [PATCH 06/36] [VMR] Codeflow 8a951ad-8a951ad [[ commit created by automation ]] From 8310f18f6698f719fdec3b3a7779fe3460b4fd40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 May 2025 02:04:35 +0000 Subject: [PATCH 07/36] Update dependencies from https://github.com/dotnet/dotnet build 267041 --- eng/Version.Details.xml | 30 +++++++++---------- eng/Versions.props | 12 ++++---- .../core-templates/steps/source-build.yml | 30 +------------------ global.json | 2 +- 4 files changed, 23 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 347fcd71bf..9131d7f02c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 86c2177121ebf8d49b372dd7232588ceaae6c7cb + 025e4e597746eafc5a736195b66aeb321455d64c - + https://github.com/dotnet/dotnet - 86c2177121ebf8d49b372dd7232588ceaae6c7cb + 025e4e597746eafc5a736195b66aeb321455d64c https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 86c2177121ebf8d49b372dd7232588ceaae6c7cb + 025e4e597746eafc5a736195b66aeb321455d64c - + https://github.com/dotnet/dotnet - 86c2177121ebf8d49b372dd7232588ceaae6c7cb + 025e4e597746eafc5a736195b66aeb321455d64c - + https://github.com/dotnet/dotnet - 86c2177121ebf8d49b372dd7232588ceaae6c7cb + 025e4e597746eafc5a736195b66aeb321455d64c - + https://github.com/dotnet/dotnet - 86c2177121ebf8d49b372dd7232588ceaae6c7cb + 025e4e597746eafc5a736195b66aeb321455d64c - + https://github.com/dotnet/dotnet - 86c2177121ebf8d49b372dd7232588ceaae6c7cb + 025e4e597746eafc5a736195b66aeb321455d64c https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ae282710bf..18f3a8f024 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25252.107 - 10.0.0-preview.5.25252.107 + 10.0.0-preview.5.25256.101 + 10.0.0-preview.5.25256.101 - 10.0.0-preview.5.25252.107 - 10.0.0-preview.5.25252.107 + 10.0.0-preview.5.25256.101 + 10.0.0-preview.5.25256.101 - 10.0.100-preview.5.25252.107 + 10.0.100-preview.5.25256.101 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25252.107 + 10.0.0-beta.25256.101 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 9292c9b67a..325231215d 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -19,19 +19,6 @@ steps: set -x df -h - # If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo. - internalRestoreArgs= - if ! git diff --quiet; then - internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' - # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. - # This only works if there is a username/email configured, which won't be the case in most CI runs. - git config --get user.email - if [ $? -ne 0 ]; then - git config user.email dn-bot@microsoft.com - git config user.name dn-bot - fi - fi - # If building on the internal project, the internal storage variable may be available (usually only if needed) # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. @@ -71,7 +58,6 @@ steps: --restore --build --pack -bl \ ${{ parameters.platform.buildArguments }} \ $internalRuntimeDownloadArgs \ - $internalRestoreArgs \ $targetRidArgs \ $runtimeOsArgs \ $baseOsArgs \ @@ -80,26 +66,12 @@ steps: /p:DotNetBuildRepo=true \ displayName: Build -# Upload build logs for diagnosis. -- task: CopyFiles@2 - displayName: Prepare BuildLogs staging directory - inputs: - SourceFolder: '$(Build.SourcesDirectory)' - Contents: | - **/*.log - **/*.binlog - artifacts/sb/prebuilt-report/** - TargetFolder: '$(Build.StagingDirectory)/BuildLogs' - CleanTargetFolder: true - continueOnError: true - condition: succeededOrFailed() - - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish BuildLogs - targetPath: '$(Build.StagingDirectory)/BuildLogs' + targetPath: artifacts/log/$[ coalesce(variables._BuildConfig, 'Release') ]/ artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/global.json b/global.json index cae0993d86..0036327a08 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25252.107" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25256.101" } } From b998406bc384017681a24e70ab06dafc839d880d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 May 2025 02:06:25 +0000 Subject: [PATCH 08/36] Update dependencies from https://github.com/dotnet/dotnet build 267208 --- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9131d7f02c..690b783d61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 025e4e597746eafc5a736195b66aeb321455d64c + 5e6dacd4d3debda3266224b2a434811c6fa94987 - + https://github.com/dotnet/dotnet - 025e4e597746eafc5a736195b66aeb321455d64c + 5e6dacd4d3debda3266224b2a434811c6fa94987 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 025e4e597746eafc5a736195b66aeb321455d64c + 5e6dacd4d3debda3266224b2a434811c6fa94987 - + https://github.com/dotnet/dotnet - 025e4e597746eafc5a736195b66aeb321455d64c + 5e6dacd4d3debda3266224b2a434811c6fa94987 - + https://github.com/dotnet/dotnet - 025e4e597746eafc5a736195b66aeb321455d64c + 5e6dacd4d3debda3266224b2a434811c6fa94987 - + https://github.com/dotnet/dotnet - 025e4e597746eafc5a736195b66aeb321455d64c + 5e6dacd4d3debda3266224b2a434811c6fa94987 - + https://github.com/dotnet/dotnet - 025e4e597746eafc5a736195b66aeb321455d64c + 5e6dacd4d3debda3266224b2a434811c6fa94987 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 18f3a8f024..2bcfe17de4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25256.101 - 10.0.0-preview.5.25256.101 + 10.0.0-preview.5.25257.101 + 10.0.0-preview.5.25257.101 - 10.0.0-preview.5.25256.101 - 10.0.0-preview.5.25256.101 + 10.0.0-preview.5.25257.101 + 10.0.0-preview.5.25257.101 - 10.0.100-preview.5.25256.101 + 10.0.100-preview.5.25257.101 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25256.101 + 10.0.0-beta.25257.101 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/global.json b/global.json index 0036327a08..c2a3a90b62 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25256.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.101" } } From 368ea40e71ce5215cfa6f225c2ac0103cd2284a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 May 2025 19:44:23 +0000 Subject: [PATCH 09/36] [VMR] Codeflow aebf15d-aebf15d [[ commit created by automation ]] From e9e3f5859c3f3f880db80a98404425fae2e33c6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 May 2025 19:44:24 +0000 Subject: [PATCH 10/36] Update dependencies from https://github.com/dotnet/dotnet build 267468 --- eng/Version.Details.xml | 30 +++++++++---------- eng/Versions.props | 12 ++++---- .../core-templates/steps/source-build.yml | 16 ++++------ eng/common/tools.sh | 6 +++- global.json | 2 +- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 690b783d61..0fbef7804d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 5e6dacd4d3debda3266224b2a434811c6fa94987 + 954d6157c9c22c8d8b4faddef70b2b703c65e77e - + https://github.com/dotnet/dotnet - 5e6dacd4d3debda3266224b2a434811c6fa94987 + 954d6157c9c22c8d8b4faddef70b2b703c65e77e https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 5e6dacd4d3debda3266224b2a434811c6fa94987 + 954d6157c9c22c8d8b4faddef70b2b703c65e77e - + https://github.com/dotnet/dotnet - 5e6dacd4d3debda3266224b2a434811c6fa94987 + 954d6157c9c22c8d8b4faddef70b2b703c65e77e - + https://github.com/dotnet/dotnet - 5e6dacd4d3debda3266224b2a434811c6fa94987 + 954d6157c9c22c8d8b4faddef70b2b703c65e77e - + https://github.com/dotnet/dotnet - 5e6dacd4d3debda3266224b2a434811c6fa94987 + 954d6157c9c22c8d8b4faddef70b2b703c65e77e - + https://github.com/dotnet/dotnet - 5e6dacd4d3debda3266224b2a434811c6fa94987 + 954d6157c9c22c8d8b4faddef70b2b703c65e77e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2bcfe17de4..efcdb0aa74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25257.101 - 10.0.0-preview.5.25257.101 + 10.0.0-preview.5.25257.112 + 10.0.0-preview.5.25257.112 - 10.0.0-preview.5.25257.101 - 10.0.0-preview.5.25257.101 + 10.0.0-preview.5.25257.112 + 10.0.0-preview.5.25257.112 - 10.0.100-preview.5.25257.101 + 10.0.100-preview.5.25257.112 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25257.101 + 10.0.0-beta.25257.112 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 325231215d..f2a0f347fd 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -38,14 +38,9 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - - baseOsArgs= - if [ '${{ parameters.platform.baseOS }}' != '' ]; then - baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' + baseRidArgs= + if [ '${{ parameters.platform.baseRID }}' != '' ]; then + baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}' fi portableBuildArgs= @@ -59,8 +54,7 @@ steps: ${{ parameters.platform.buildArguments }} \ $internalRuntimeDownloadArgs \ $targetRidArgs \ - $runtimeOsArgs \ - $baseOsArgs \ + $baseRidArgs \ $portableBuildArgs \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ @@ -71,7 +65,7 @@ steps: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish BuildLogs - targetPath: artifacts/log/$[ coalesce(variables._BuildConfig, 'Release') ]/ + targetPath: artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }} artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/eng/common/tools.sh b/eng/common/tools.sh index d51f300c77..cc007b1f15 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -5,6 +5,9 @@ # CI mode - set to true on CI server for PR validation build or official build. ci=${ci:-false} +# Build mode +source_build=${source_build:-false} + # Set to true to use the pipelines logger which will enable Azure logging output. # https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md # This flag is meant as a temporary opt-opt for the feature while validate it across @@ -58,7 +61,8 @@ use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. -if [[ "$ci" == true ]]; then +# Keep in sync with NuGetPackageroot in Arcade SDK's RepositoryLayout.props. +if [[ "$ci" == true || "$source_build" == true ]]; then use_global_nuget_cache=${use_global_nuget_cache:-false} else use_global_nuget_cache=${use_global_nuget_cache:-true} diff --git a/global.json b/global.json index c2a3a90b62..431155a023 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.112" } } From b6587bd9496262ace9bf89b7ee430cd70013c7da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 May 2025 21:19:04 +0000 Subject: [PATCH 11/36] Update dependencies from https://github.com/dotnet/dotnet build 267684 --- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fbef7804d..f696e89338 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + b39b4061393697c537adbc3e0423dbc1b2cb90d9 - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + b39b4061393697c537adbc3e0423dbc1b2cb90d9 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + b39b4061393697c537adbc3e0423dbc1b2cb90d9 - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + b39b4061393697c537adbc3e0423dbc1b2cb90d9 - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + b39b4061393697c537adbc3e0423dbc1b2cb90d9 - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + b39b4061393697c537adbc3e0423dbc1b2cb90d9 - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + b39b4061393697c537adbc3e0423dbc1b2cb90d9 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index efcdb0aa74..c177cd6c4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25257.112 - 10.0.0-preview.5.25257.112 + 10.0.0-preview.5.25259.101 + 10.0.0-preview.5.25259.101 - 10.0.0-preview.5.25257.112 - 10.0.0-preview.5.25257.112 + 10.0.0-preview.5.25259.101 + 10.0.0-preview.5.25259.101 - 10.0.100-preview.5.25257.112 + 10.0.100-preview.5.25259.101 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25257.112 + 10.0.0-beta.25259.101 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/global.json b/global.json index 431155a023..c0d1fc1b5b 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.112" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25259.101" } } From a4d1de688422fdad6afebf70225d18b1330754bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 May 2025 02:07:21 +0000 Subject: [PATCH 12/36] Update dependencies from https://github.com/dotnet/dotnet build 267725 --- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f696e89338..9a6aa1b55e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - b39b4061393697c537adbc3e0423dbc1b2cb90d9 + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - b39b4061393697c537adbc3e0423dbc1b2cb90d9 + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - b39b4061393697c537adbc3e0423dbc1b2cb90d9 + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - b39b4061393697c537adbc3e0423dbc1b2cb90d9 + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - b39b4061393697c537adbc3e0423dbc1b2cb90d9 + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - b39b4061393697c537adbc3e0423dbc1b2cb90d9 + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - b39b4061393697c537adbc3e0423dbc1b2cb90d9 + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index c177cd6c4c..ff304da8a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25259.101 - 10.0.0-preview.5.25259.101 + 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25259.104 - 10.0.0-preview.5.25259.101 - 10.0.0-preview.5.25259.101 + 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25259.104 - 10.0.100-preview.5.25259.101 + 10.0.100-preview.5.25259.104 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25259.101 + 10.0.0-beta.25259.104 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/global.json b/global.json index c0d1fc1b5b..583fd856fe 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25259.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25259.104" } } From 2c17dffe310bdb3047aa645660c9fc673bc322d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 May 2025 08:37:34 +0000 Subject: [PATCH 13/36] Update dependencies from https://github.com/dotnet/dotnet build 267756 --- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a6aa1b55e..81ace6e5fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 7b07f76d1607d421e390bc61529a77e652ea63eb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 7b07f76d1607d421e390bc61529a77e652ea63eb https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 7b07f76d1607d421e390bc61529a77e652ea63eb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 7b07f76d1607d421e390bc61529a77e652ea63eb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 7b07f76d1607d421e390bc61529a77e652ea63eb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 7b07f76d1607d421e390bc61529a77e652ea63eb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 7b07f76d1607d421e390bc61529a77e652ea63eb https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ff304da8a2..fa061806d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25259.104 - 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25259.106 + 10.0.0-preview.5.25259.106 - 10.0.0-preview.5.25259.104 - 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25259.106 + 10.0.0-preview.5.25259.106 - 10.0.100-preview.5.25259.104 + 10.0.100-preview.5.25259.106 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25259.104 + 10.0.0-beta.25259.106 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/global.json b/global.json index 583fd856fe..8d683f3db7 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25259.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25259.106" } } From f18d547243a510ea5bb04b9c1eebcdfb5cfa08ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 11 May 2025 02:06:52 +0000 Subject: [PATCH 14/36] Update dependencies from https://github.com/dotnet/dotnet build 267776 --- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81ace6e5fb..91c7db454b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 7b07f76d1607d421e390bc61529a77e652ea63eb + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 7b07f76d1607d421e390bc61529a77e652ea63eb + 85778473549347b3e4bad3ea009e9438df7b11bb https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 7b07f76d1607d421e390bc61529a77e652ea63eb + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 7b07f76d1607d421e390bc61529a77e652ea63eb + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 7b07f76d1607d421e390bc61529a77e652ea63eb + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 7b07f76d1607d421e390bc61529a77e652ea63eb + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 7b07f76d1607d421e390bc61529a77e652ea63eb + 85778473549347b3e4bad3ea009e9438df7b11bb https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index fa061806d1..fcb4432f2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25259.106 - 10.0.0-preview.5.25259.106 + 10.0.0-preview.5.25260.104 + 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25259.106 - 10.0.0-preview.5.25259.106 + 10.0.0-preview.5.25260.104 + 10.0.0-preview.5.25260.104 - 10.0.100-preview.5.25259.106 + 10.0.100-preview.5.25260.104 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25259.106 + 10.0.0-beta.25260.104 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/global.json b/global.json index 8d683f3db7..cb635f7786 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25259.106" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104" } } From e9c61d0d3ae290b9a26a9d6a14313279d3efc0cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 May 2025 02:03:57 +0000 Subject: [PATCH 15/36] [VMR] Codeflow 3a08702-3a08702 [[ commit created by automation ]] --- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- src/SOS/Strike/metadata.cpp | 352 +++++++++++++++++++++--------------- src/SOS/Strike/strike.cpp | 38 ++-- 4 files changed, 230 insertions(+), 170 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91c7db454b..5e825bc30f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/microsoft/clrmd - cccf496872323338afe872dd102720f9606945d4 + fd6ccca33b888a5077a477218cac2461b81e8586 - + https://github.com/microsoft/clrmd - cccf496872323338afe872dd102720f9606945d4 + fd6ccca33b888a5077a477218cac2461b81e8586 diff --git a/eng/Versions.props b/eng/Versions.props index fcb4432f2f..4eff23d8c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 8.0.0 6.0.0 - 4.0.0-beta.25255.1 + 4.0.0-beta.25261.1 17.10.0-beta1.24272.1 3.1.21 6.0.0 diff --git a/src/SOS/Strike/metadata.cpp b/src/SOS/Strike/metadata.cpp index 95d12f9aa0..f5a2b80789 100644 --- a/src/SOS/Strike/metadata.cpp +++ b/src/SOS/Strike/metadata.cpp @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // ==++== -// - -// +// + +// // ==--== #include "strike.h" #include "util.h" @@ -12,7 +12,7 @@ /**********************************************************************\ * Routine Description: * * * -* This function is called to find the name of a TypeDef using * +* This function is called to find the name of a TypeDef using * * metadata API. * * * \**********************************************************************/ @@ -20,9 +20,14 @@ static HRESULT NameForTypeDef_s(mdTypeDef tkTypeDef, IMetaDataImport *pImport, __out_ecount (capacity_mdName) WCHAR *mdName, size_t capacity_mdName) { + if (pImport == NULL) + { + int res = swprintf_s(mdName, capacity_mdName, W("0x%08x"), tkTypeDef); + return res != -1 ? S_OK : E_FAIL; + } + DWORD flags; ULONG nameLen; - HRESULT hr = pImport->GetTypeDefProps(tkTypeDef, mdName, (ULONG)capacity_mdName, &nameLen, &flags, NULL); @@ -68,13 +73,13 @@ IMetaDataImport* MDImportForModule(DacpModuleData* pModule) IMetaDataImport *pRet = NULL; ToRelease module; HRESULT hr = g_sos->GetModule(pModule->Address, &module); - + if (SUCCEEDED(hr)) hr = module->QueryInterface(IID_IMetaDataImport, (LPVOID *) &pRet); if (SUCCEEDED(hr)) return pRet; - + return NULL; } @@ -104,9 +109,9 @@ HRESULT NameForToken_s(mdTypeDef mb, IMetaDataImport *pImport, __out_ecount (cap //ExtOut("unsupported\n"); return E_FAIL; } - + HRESULT hr = E_FAIL; - + PAL_CPP_TRY { static WCHAR name[MAX_CLASSNAME_LENGTH]; @@ -168,7 +173,7 @@ HRESULT NameForToken_s(mdTypeDef mb, IMetaDataImport *pImport, __out_ecount (cap /**********************************************************************\ * Routine Description: * * * -* This function is called to find the name of a metadata token * +* This function is called to find the name of a metadata token * * using metadata API. * * * \**********************************************************************/ @@ -206,7 +211,7 @@ void NameForToken_s(DacpModuleData *pModule, mdTypeDef mb, __out_ecount (capacit { hr = NameForToken_s (mb, pImport, mdName, capacity_mdName, bClassName); } - + if (!pImport || !SUCCEEDED (hr)) { const SIZE_T capacity_moduleName = mdNameLen+19; @@ -218,7 +223,7 @@ void NameForToken_s(DacpModuleData *pModule, mdTypeDef mb, __out_ecount (capacit if (assembly.isDynamic) { wcscpy_s(moduleName, capacity_moduleName, W("Dynamic ")); } - wcscat_s (moduleName, capacity_moduleName, W("Module in ")); + wcscat_s (moduleName, capacity_moduleName, W("Module in ")); if(g_sos->GetAssemblyName(pModule->Assembly, mdNameLen, g_mdName, NULL)==S_OK) { wcscat_s(moduleName, capacity_moduleName, g_mdName); @@ -238,9 +243,16 @@ class MDInfo public: MDInfo (DWORD_PTR ModuleAddr) { - m_pImport = MDImportForModule(ModuleAddr); - if (!m_pImport) - ExtOut("Unable to get IMetaDataImport for module %p\n", ModuleAddr); + if (ModuleAddr == 0) + { + m_pImport = NULL; + } + else + { + m_pImport = MDImportForModule(ModuleAddr); + if (!m_pImport) + ExtOut("Unable to get IMetaDataImport for module %p\n", ModuleAddr); + } m_pSigBuf = NULL; } @@ -251,7 +263,7 @@ class MDInfo m_pSigBuf = NULL; } - void GetMethodName(mdTypeDef token, CQuickBytes *fullName); + void GetMethodName(mdMethodDef token, CQuickBytes *fullName); GetSignatureStringResults GetMethodSignature(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, CQuickBytes *fullName); GetSignatureStringResults GetSignature(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, CQuickBytes *fullName); @@ -308,46 +320,47 @@ void GetMethodName(mdMethodDef methodDef, IMetaDataImport * pImport, CQuickBytes // Tables for mapping element type to text -const WCHAR *g_wszMapElementType[] = +const WCHAR *g_wszMapElementType[] = { W("End"), // 0x0 W("Void"), // 0x1 W("Boolean"), - W("Char"), + W("Char"), W("I1"), - W("UI1"), + W("U1"), W("I2"), // 0x6 - W("UI2"), + W("U2"), W("I4"), - W("UI4"), + W("U4"), W("I8"), - W("UI8"), + W("U8"), W("R4"), W("R8"), W("String"), W("Ptr"), // 0xf W("ByRef"), // 0x10 - W("ValueClass"), + W("ValueType"), W("Class"), - W("CopyCtor"), + W("Var"), W("MDArray"), // 0x14 - W("GENArray"), + W("GenericInst"), W("TypedByRef"), - W("VALUEARRAY"), - W("I"), - W("U"), - W("R"), // 0x1a - W("FNPTR"), + W("UNUSED"), + W("IntPtr"), + W("UIntPtr"), + W("UNUSED"), // 0x1a + W("FnPtr"), W("Object"), W("SZArray"), - W("GENERICArray"), + W("MVar"), W("CMOD_REQD"), W("CMOD_OPT"), W("INTERNAL"), + W("CMOD_INTERNAL"), }; - -const WCHAR *g_wszCalling[] = -{ + +const WCHAR *g_wszCalling[] = +{ W("[DEFAULT]"), W("[C]"), W("[STDCALL]"), @@ -358,36 +371,44 @@ const WCHAR *g_wszCalling[] = W("[LOCALSIG]"), W("[PROPERTY]"), W("[UNMANAGED]"), + W("[GENERICINST]"), + W("[NATIVEVARARG]"), + W("[UNKNOWN]"), + W("[UNKNOWN]"), + W("[UNKNOWN]"), + W("[UNKNOWN]"), }; -void MDInfo::GetMethodName(mdTypeDef token, CQuickBytes *fullName) +void MDInfo::GetMethodName(mdMethodDef token, CQuickBytes *fullName) { - if (m_pImport == NULL) { - return; - } - - HRESULT hr; - mdTypeDef memTypeDef; - ULONG nameLen; - DWORD flags; - PCCOR_SIGNATURE pbSigBlob; - ULONG ulSigBlob; - ULONG ulCodeRVA; - ULONG ulImplFlags; + HRESULT hr = E_FAIL; + mdTypeDef memTypeDef = mdTypeDefNil; + ULONG nameLen = 0; + DWORD flags = 0; + PCCOR_SIGNATURE pbSigBlob = NULL; + ULONG ulSigBlob = 0; + ULONG ulCodeRVA = 0; + ULONG ulImplFlags = 0; m_pSigBuf = fullName; InitSigBuffer(); WCHAR szFunctionName[1024]; - hr = m_pImport->GetMethodProps(token, &memTypeDef, - szFunctionName, ARRAY_SIZE(szFunctionName), &nameLen, - &flags, &pbSigBlob, &ulSigBlob, &ulCodeRVA, &ulImplFlags); - if (FAILED (hr)) + if (m_pImport != NULL) { + hr = m_pImport->GetMethodProps(token, &memTypeDef, + szFunctionName, ARRAY_SIZE(szFunctionName), &nameLen, + &flags, &pbSigBlob, &ulSigBlob, &ulCodeRVA, &ulImplFlags); + } + + if (FAILED(hr)) + { + swprintf_s(szFunctionName, ARRAY_SIZE(szFunctionName), W("0x%08x"), token); + AddToSigBuffer(szFunctionName); return; } - + szFunctionName[nameLen] = L'\0'; m_szName[0] = L'\0'; if (memTypeDef != mdTypeDefNil) @@ -420,9 +441,6 @@ void MDInfo::GetMethodName(mdTypeDef token, CQuickBytes *fullName) GetSignatureStringResults MDInfo::GetMethodSignature(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, CQuickBytes *fullName) { - if (!m_pImport) - return GSS_ERROR; - m_pSigBuf = fullName; InitSigBuffer(); @@ -431,7 +449,7 @@ GetSignatureStringResults MDInfo::GetMethodSignature(PCCOR_SIGNATURE pbSigBlob, LONG lSigBlobRemaining; if (FAILED(GetFullNameForMD(pbSigBlob, ulSigBlob, &lSigBlobRemaining))) return GSS_ERROR; - + if (lSigBlobRemaining < 0) return GSS_INSUFFICIENT_DATA; @@ -441,9 +459,6 @@ GetSignatureStringResults MDInfo::GetMethodSignature(PCCOR_SIGNATURE pbSigBlob, GetSignatureStringResults MDInfo::GetSignature(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, CQuickBytes *fullName) { - if (!m_pImport) - return GSS_ERROR; - m_pSigBuf = fullName; InitSigBuffer(); @@ -461,10 +476,9 @@ GetSignatureStringResults MDInfo::GetSignature(PCCOR_SIGNATURE pbSigBlob, ULONG return GSS_SUCCESS; } - inline bool isCallConv(unsigned sigByte, CorCallingConvention conv) { - return ((sigByte & IMAGE_CEE_CS_CALLCONV_MASK) == (unsigned) conv); + return ((sigByte & IMAGE_CEE_CS_CALLCONV_MASK) == (unsigned) conv); } #undef IfFailGoto @@ -492,16 +506,11 @@ HRESULT MDInfo::GetFullNameForMD(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, LON // goto ErrExit; AddToSigBuffer (g_wszCalling[ulData & IMAGE_CEE_CS_CALLCONV_MASK]); - if (cb>ulSigBlob) + if (cb>ulSigBlob) goto ErrExit; cbCur += cb; ulSigBlob -= cb; - if (ulData & IMAGE_CEE_CS_CALLCONV_HASTHIS) - AddToSigBuffer ( W(" [hasThis]")); - if (ulData & IMAGE_CEE_CS_CALLCONV_EXPLICITTHIS) - AddToSigBuffer ( W(" [explicit]")); - AddToSigBuffer (W(" ")); if ( isCallConv(ulData,IMAGE_CEE_CS_CALLCONV_FIELD) ) { @@ -510,15 +519,36 @@ HRESULT MDInfo::GetFullNameForMD(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, LON goto ErrExit; AddToSigBuffer ( W(" ")); AddToSigBuffer ( m_szName); - if (cb>ulSigBlob) + if (cb>ulSigBlob) goto ErrExit; cbCur += cb; ulSigBlob -= cb; } - else + else { + if (ulData & IMAGE_CEE_CS_CALLCONV_HASTHIS) + AddToSigBuffer ( W("[hasThis] ")); + if (ulData & IMAGE_CEE_CS_CALLCONV_EXPLICITTHIS) + AddToSigBuffer ( W("[explicit] ")); + + if (ulData & IMAGE_CEE_CS_CALLCONV_GENERIC) + { + ULONG ulGenericCount; + cb = CorSigUncompressData(&pbSigBlob[cbCur], &ulGenericCount); + if (cb>ulSigBlob) + goto ErrExit; + AddToSigBuffer (W("[generic:")); + + WCHAR buffer[16]; + _itow_s(ulGenericCount, buffer, ARRAY_SIZE(buffer), 10); + AddToSigBuffer (buffer); + AddToSigBuffer (W("] ")); + cbCur += cb; + ulSigBlob -= cb; + } + cb = CorSigUncompressData(&pbSigBlob[cbCur], &ulArgs); - if (cb>ulSigBlob) + if (cb>ulSigBlob) goto ErrExit; cbCur += cb; ulSigBlob -= cb; @@ -531,7 +561,7 @@ HRESULT MDInfo::GetFullNameForMD(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, LON AddToSigBuffer (W(" ")); AddToSigBuffer (m_szName); AddToSigBuffer ( W("(")); - if (cb>ulSigBlob) + if (cb>ulSigBlob) goto ErrExit; cbCur += cb; ulSigBlob -= cb; @@ -551,7 +581,7 @@ HRESULT MDInfo::GetFullNameForMD(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, LON if (i != ulArgs) { AddToSigBuffer ( W(",")); } - if (cb>ulSigBlob) + if (cb>ulSigBlob) goto ErrExit; cbCur += cb; @@ -573,39 +603,42 @@ HRESULT MDInfo::GetFullNameForMD(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, LON LPCWSTR MDInfo::TypeDefName(mdTypeDef inTypeDef) { - if (m_pImport == NULL) { - return W(""); + HRESULT hr = E_FAIL; + if (m_pImport != NULL) + { + hr = m_pImport->GetTypeDefProps( + // [IN] The import scope. + inTypeDef, // [IN] TypeDef token for inquiry. + m_szTempBuf, // [OUT] Put name here. + MAX_CLASSNAME_LENGTH , // [IN] size of name buffer in wide chars. + NULL, // [OUT] put size of name (wide chars) here. + NULL, // [OUT] Put flags here. + NULL); // [OUT] Put base class TypeDef/TypeRef here. + } + if (FAILED(hr)) + { + swprintf_s(m_szTempBuf, MAX_CLASSNAME_LENGTH, W("0x%08x"), inTypeDef); } - HRESULT hr; - - hr = m_pImport->GetTypeDefProps( - // [IN] The import scope. - inTypeDef, // [IN] TypeDef token for inquiry. - m_szTempBuf, // [OUT] Put name here. - MAX_CLASSNAME_LENGTH , // [IN] size of name buffer in wide chars. - NULL, // [OUT] put size of name (wide chars) here. - NULL, // [OUT] Put flags here. - NULL); // [OUT] Put base class TypeDef/TypeRef here. - - if (FAILED(hr)) return (W("NoName")); return (m_szTempBuf); } // LPCWSTR MDInfo::TypeDefName() + LPCWSTR MDInfo::TypeRefName(mdTypeRef tr) { - if (m_pImport == NULL) { - return W(""); + HRESULT hr = E_FAIL; + if (m_pImport != NULL) + { + hr = m_pImport->GetTypeRefProps( + tr, // The class ref token. + NULL, // Resolution scope. + m_szTempBuf, // Put the name here. + MAX_CLASSNAME_LENGTH, // Size of the name buffer, wide chars. + NULL); // Put actual size of name here. + } + if (FAILED(hr)) + { + swprintf_s(m_szTempBuf, MAX_CLASSNAME_LENGTH, W("0x%08x"), tr); } - - HRESULT hr; - - hr = m_pImport->GetTypeRefProps( - tr, // The class ref token. - NULL, // Resolution scope. - m_szTempBuf, // Put the name here. - MAX_CLASSNAME_LENGTH, // Size of the name buffer, wide chars. - NULL); // Put actual size of name here. - if (FAILED(hr)) return (W("NoName")); return (m_szTempBuf); } // LPCWSTR MDInfo::TypeRefName() @@ -643,7 +676,6 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL ULONG ulTemp; int iTemp = 0; mdToken tk; - const size_t capacity_buffer = 9; cb = CorSigUncompressData(pbSigBlob, &ulData); @@ -673,11 +705,12 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL } // Handle the underlying element types. - if (ulData >= ELEMENT_TYPE_MAX) + if (ulData >= ELEMENT_TYPE_MAX) { hr = E_FAIL; goto ErrExit; } + while (ulData == ELEMENT_TYPE_PTR || ulData == ELEMENT_TYPE_BYREF) { IfFailGo(AddToSigBuffer(g_wszMapElementType[ulData])); @@ -687,14 +720,24 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL } // Generics - if (ulData == ELEMENT_TYPE_VAR) + if (ulData == ELEMENT_TYPE_VAR || ulData == ELEMENT_TYPE_MVAR) { - IfFailGo(AddToSigBuffer(W("__Canon"))); + if (ulData == ELEMENT_TYPE_VAR) + { + IfFailGo(AddToSigBuffer(W("!"))); + } + else + { + IfFailGo(AddToSigBuffer(W("!!"))); + } + + ULONG varIndex = 0; + IfFailGo(CorSigUncompressData(&pbSigBlob[cbCur], ulSigBlob-cbCur, &varIndex, &cb)); + cbCur += cb; - // The next byte represents which generic parameter is referred to. We - // do not currently use this information, so just bypass this byte. - cbCur++; - + WCHAR buffer[16]; + _itow_s(varIndex, buffer, ARRAY_SIZE(buffer), 10); + AddToSigBuffer(buffer); goto ErrExit; } @@ -707,26 +750,32 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL // Get the number of generic arguments. ULONG numParams = 0; - IfFailGo(CorSigUncompressData(&pbSigBlob[cbCur], 1, &numParams, &cb)); + IfFailGo(CorSigUncompressData(&pbSigBlob[cbCur], ulSigBlob-cbCur, &numParams, &cb)); cbCur += cb; // Print out the list of arguments IfFailGo(AddToSigBuffer(W("<"))); for (ULONG i = 0; i < numParams; i++) { - if (i > 0) + if (i > 0) IfFailGo(AddToSigBuffer(W(","))); - + IfFailGo(GetOneElementType(&pbSigBlob[cbCur], ulSigBlob-cbCur, &cb)); cbCur += cb; } IfFailGo(AddToSigBuffer(W(">"))); goto ErrExit; } - + // Past this point we must have something which directly maps to a value in g_wszMapElementType. + if (ulData >= ARRAY_SIZE(g_wszMapElementType)) + { + IfFailGo(AddToSigBuffer(W("INVALID_ELEMENT_TYPE"))); + return E_FAIL; + } + IfFailGo(AddToSigBuffer(g_wszMapElementType[ulData])); - if (CorIsPrimitiveType((CorElementType)ulData) || + if (CorIsPrimitiveType((CorElementType)ulData) || ulData == ELEMENT_TYPE_TYPEDBYREF || ulData == ELEMENT_TYPE_OBJECT || ulData == ELEMENT_TYPE_I || @@ -737,8 +786,8 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL } AddToSigBuffer(W(" ")); - if (ulData == ELEMENT_TYPE_VALUETYPE || - ulData == ELEMENT_TYPE_CLASS || + if (ulData == ELEMENT_TYPE_VALUETYPE || + ulData == ELEMENT_TYPE_CLASS || ulData == ELEMENT_TYPE_CMOD_REQD || ulData == ELEMENT_TYPE_CMOD_OPT) { @@ -753,8 +802,8 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL else { _ASSERTE(TypeFromToken(tk) == mdtTypeSpec); - WCHAR buffer[capacity_buffer]; - _itow_s (tk, buffer, capacity_buffer, 16); + WCHAR buffer[16]; + _itow_s (tk, buffer, ARRAY_SIZE(buffer), 16); IfFailGo(AddToSigBuffer(buffer)); } if (ulData == ELEMENT_TYPE_CMOD_REQD || @@ -770,13 +819,13 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL } if (ulData == ELEMENT_TYPE_SZARRAY) { - // display the base type of SZARRAY or GENERICARRAY + // display the base type of SZARRAY if (FAILED(GetOneElementType(&pbSigBlob[cbCur], ulSigBlob-cbCur, &cb))) goto ErrExit; cbCur += cb; goto ErrExit; } - if (ulData == ELEMENT_TYPE_FNPTR) + if (ulData == ELEMENT_TYPE_FNPTR) { cb = CorSigUncompressData(&pbSigBlob[cbCur], &ulData); cbCur += cb; @@ -798,7 +847,7 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL cbCur += cb; IfFailGo(AddToSigBuffer(W("("))); - while (numArgs > 0) + while (numArgs > 0) { if (cbCur > ulSigBlob) goto ErrExit; @@ -806,7 +855,7 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL goto ErrExit; cbCur += cb; --numArgs; - if (numArgs > 0) + if (numArgs > 0) IfFailGo(AddToSigBuffer(W(","))); } IfFailGo(AddToSigBuffer(W(")"))); @@ -821,9 +870,8 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL cb = CorSigUncompressPointer(&pbSigBlob[cbCur], (void**)&pvMethodTable); cbCur += cb; - const size_t capacity_szMethodTableValue = 10; - WCHAR szMethodTableValue[10]; - itow_s_ptr((INT_PTR)pvMethodTable, szMethodTableValue, capacity_szMethodTableValue, 16); + WCHAR szMethodTableValue[32]; + itow_s_ptr((INT_PTR)pvMethodTable, szMethodTableValue, ARRAY_SIZE(szMethodTableValue), 16); IfFailGo(AddToSigBuffer(szMethodTableValue)); IfFailGo(AddToSigBuffer(W(" "))); @@ -834,60 +882,68 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL goto ErrExit; } - - if(ulData != ELEMENT_TYPE_ARRAY) return E_FAIL; + if(ulData != ELEMENT_TYPE_ARRAY) + return E_FAIL; + + // Since MDARRAY has extra data, we will use a visual indication + // to group the base type and the ArrayShape. + IfFailGo(AddToSigBuffer(W("{"))); - // display the base type of SDARRAY + // Display the base type of MDARRAY if (FAILED(GetOneElementType(&pbSigBlob[cbCur], ulSigBlob-cbCur, &cb))) goto ErrExit; cbCur += cb; - IfFailGo(AddToSigBuffer(W(" "))); - // display the rank of MDARRAY + // Print the ArrayShape - ECMA-335 II.23.2.13 + AddToSigBuffer(W(", ")); + + // Display the rank cb = CorSigUncompressData(&pbSigBlob[cbCur], &ulData); cbCur += cb; - WCHAR buffer[capacity_buffer]; - _itow_s (ulData, buffer, capacity_buffer, 10); + WCHAR buffer[16]; + _itow_s (ulData, buffer, ARRAY_SIZE(buffer), 10); IfFailGo(AddToSigBuffer(buffer)); + + // we are done if no rank specified if (ulData == 0) - // we are done if no rank specified goto ErrExit; IfFailGo(AddToSigBuffer(W(" "))); + // how many dimensions have size specified? cb = CorSigUncompressData(&pbSigBlob[cbCur], &ulData); cbCur += cb; - _itow_s (ulData, buffer, capacity_buffer, 10); + _itow_s (ulData, buffer, ARRAY_SIZE(buffer), 10); IfFailGo(AddToSigBuffer(buffer)); - if (ulData == 0) { + if (ulData == 0) IfFailGo(AddToSigBuffer(W(" "))); - } - while (ulData) - { + for (;ulData != 0; ulData--) + { cb = CorSigUncompressData(&pbSigBlob[cbCur], &ulTemp); - _itow_s (ulTemp, buffer, capacity_buffer, 10); + _itow_s (ulTemp, buffer, ARRAY_SIZE(buffer), 10); IfFailGo(AddToSigBuffer(buffer)); IfFailGo(AddToSigBuffer(W(" "))); cbCur += cb; - ulData--; } + // how many dimensions have lower bounds specified? cb = CorSigUncompressData(&pbSigBlob[cbCur], &ulData); cbCur += cb; - _itow_s (ulData, buffer, capacity_buffer, 10); + _itow_s (ulData, buffer, ARRAY_SIZE(buffer), 10); IfFailGo(AddToSigBuffer(buffer)); - while (ulData) - { + IfFailGo(AddToSigBuffer(W(" "))); + for (;ulData != 0; ulData--) + { cb = CorSigUncompressSignedInt(&pbSigBlob[cbCur], &iTemp); - _itow_s (iTemp, buffer, capacity_buffer, 10); + _itow_s (iTemp, buffer, ARRAY_SIZE(buffer), 10); IfFailGo(AddToSigBuffer(buffer)); IfFailGo(AddToSigBuffer(W(" "))); cbCur += cb; - ulData--; } - + IfFailGo(AddToSigBuffer(W("}"))); + ErrExit: if (cbCur > ulSigBlob) hr = E_FAIL; @@ -900,17 +956,17 @@ HRESULT MDInfo::GetOneElementType(PCCOR_SIGNATURE pbSigBlob, ULONG ulSigBlob, UL //***************************************************************************** typedef struct tagCOR_ILMETHOD_TINY : IMAGE_COR_ILMETHOD_TINY { - bool IsTiny() const { return((Flags_CodeSize & (CorILMethod_FormatMask >> 1)) == CorILMethod_TinyFormat); } - DWORD GetLocalVarSigTok() const { return(0); } + bool IsTiny() const { return((Flags_CodeSize & (CorILMethod_FormatMask >> 1)) == CorILMethod_TinyFormat); } + DWORD GetLocalVarSigTok() const { return(0); } } COR_ILMETHOD_TINY; //***************************************************************************** -// This strucuture is the 'fat' layout, where no compression is attempted. +// This strucuture is the 'fat' layout, where no compression is attempted. // Note that this structure can be added on at the end, thus making it extensible //***************************************************************************** typedef struct tagCOR_ILMETHOD_FAT : IMAGE_COR_ILMETHOD_FAT { - bool IsFat() const { return((Flags & CorILMethod_FormatMask) == CorILMethod_FatFormat); } - mdToken GetLocalVarSigTok() const { return(LocalVarSigTok); } + bool IsFat() const { return((Flags & CorILMethod_FormatMask) == CorILMethod_FatFormat); } + mdToken GetLocalVarSigTok() const { return(LocalVarSigTok); } } COR_ILMETHOD_FAT; diff --git a/src/SOS/Strike/strike.cpp b/src/SOS/Strike/strike.cpp index 766c574d3b..4dab0bd56c 100644 --- a/src/SOS/Strike/strike.cpp +++ b/src/SOS/Strike/strike.cpp @@ -844,8 +844,7 @@ DECLARE_API(DumpIL) return Status; } - -void DumpSigWorker ( +static void DumpSigWorker ( DWORD_PTR dwSigAddr, DWORD_PTR dwModuleAddr, BOOL fMethod) @@ -946,21 +945,24 @@ DECLARE_API(DumpSig) { return E_INVALIDARG; } - if (nArg != 2) + + if (nArg < 1 || nArg > 2) { - ExtOut("%sdumpsig \n", SOSPrefix); + ExtOut("%sdumpsig []?\n", SOSPrefix); return E_INVALIDARG; } DWORD_PTR dwSigAddr = GetExpression(sigExpr.data); - DWORD_PTR dwModuleAddr = GetExpression(moduleExpr.data); - - if (dwSigAddr == 0 || dwModuleAddr == 0) + if (dwSigAddr == 0) { - ExtOut("Invalid parameters %s %s\n", sigExpr.data, moduleExpr.data); - return Status; + ExtOut("Invalid parameter %s\n", sigExpr.data); + return E_INVALIDARG; } + DWORD_PTR dwModuleAddr = 0; + if (nArg == 2) + dwModuleAddr = GetExpression(moduleExpr.data); + DumpSigWorker(dwSigAddr, dwModuleAddr, TRUE); return Status; } @@ -994,21 +996,23 @@ DECLARE_API(DumpSigElem) return E_INVALIDARG; } - if (nArg != 2) + if (nArg < 1 || nArg > 2) { - ExtOut("%sdumpsigelem \n", SOSPrefix); + ExtOut("%sdumpsigelem []?\n", SOSPrefix); return E_INVALIDARG; } DWORD_PTR dwSigAddr = GetExpression(sigExpr.data); - DWORD_PTR dwModuleAddr = GetExpression(moduleExpr.data); - - if (dwSigAddr == 0 || dwModuleAddr == 0) + if (dwSigAddr == 0) { - ExtOut("Invalid parameters %s %s\n", sigExpr.data, moduleExpr.data); + ExtOut("Invalid parameter %s\n", sigExpr.data); return E_INVALIDARG; } + DWORD_PTR dwModuleAddr = 0; + if (nArg == 2) + dwModuleAddr = GetExpression(moduleExpr.data); + DumpSigWorker(dwSigAddr, dwModuleAddr, FALSE); return Status; } @@ -8073,9 +8077,9 @@ DECLARE_API(EEVersion) } } else + { ExtOut("Workstation mode\n"); - - + } if (!GetGcStructuresValid()) { From 7b4f162f0cf8d070eb4b7d7c082f36a635495abd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 May 2025 02:03:58 +0000 Subject: [PATCH 16/36] Update dependencies from https://github.com/dotnet/dotnet build 268047 --- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ eng/common/build.sh | 2 +- eng/common/darc-init.sh | 2 +- global.json | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e825bc30f..9785808bd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + 5d437e96e412b189af05abb84753996de9aa698f - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + 5d437e96e412b189af05abb84753996de9aa698f https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + 5d437e96e412b189af05abb84753996de9aa698f - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + 5d437e96e412b189af05abb84753996de9aa698f - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + 5d437e96e412b189af05abb84753996de9aa698f - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + 5d437e96e412b189af05abb84753996de9aa698f - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + 5d437e96e412b189af05abb84753996de9aa698f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 4eff23d8c0..edc9167d24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 + 10.0.0-preview.5.25263.104 + 10.0.0-preview.5.25263.104 - 10.0.0-preview.5.25260.104 - 10.0.0-preview.5.25260.104 + 10.0.0-preview.5.25263.104 + 10.0.0-preview.5.25263.104 - 10.0.100-preview.5.25260.104 + 10.0.100-preview.5.25263.104 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25260.104 + 10.0.0-beta.25263.104 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/build.sh b/eng/common/build.sh index 36fba82a37..27ae2c8560 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -136,7 +136,7 @@ while [[ $# > 0 ]]; do restore=true pack=true ;; - -productBuild|-pb) + -productbuild|-pb) build=true product_build=true restore=true diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 36dbd45e1c..e889f439b8 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -68,7 +68,7 @@ function InstallDarcCli { fi fi - local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" + local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" echo "Installing Darc CLI version $darcVersion..." echo "You may need to restart your command shell if this is the first dotnet tool you have installed." diff --git a/global.json b/global.json index cb635f7786..68eecc1d1f 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.104" } } From 51e714aee5b53538d76558b41b5e702dfd4a0ecb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 May 2025 02:08:52 +0000 Subject: [PATCH 17/36] Update dependencies from https://github.com/dotnet/dotnet build 268099 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25263.104 -> 10.0.0-beta.25229.109) Microsoft.NET.Sdk (Version 10.0.100-preview.5.25263.104 -> 10.0.100-preview.5.25229.109) Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Runtime.win-x64, VS.Redist.Common.NetCore.SharedFramework.x64.10.0 (Version 10.0.0-preview.5.25263.104 -> 10.0.0-preview.5.25229.109) --- eng/Version.Details.xml | 30 +++++++++---------- eng/Versions.props | 12 ++++---- .../core-templates/steps/source-build.yml | 3 +- global.json | 2 +- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9785808bd0..eb2b62c149 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index edc9167d24..0518b0e08b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25263.104 - 10.0.0-preview.5.25263.104 + 10.0.0-preview.5.25263.108 + 10.0.0-preview.5.25263.108 - 10.0.0-preview.5.25263.104 - 10.0.0-preview.5.25263.104 + 10.0.0-preview.5.25263.108 + 10.0.0-preview.5.25263.108 - 10.0.100-preview.5.25263.104 + 10.0.100-preview.5.25263.108 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25263.104 + 10.0.0-beta.25263.108 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index f2a0f347fd..0dde553c3e 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -51,13 +51,12 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack -bl \ + --source-build \ ${{ parameters.platform.buildArguments }} \ $internalRuntimeDownloadArgs \ $targetRidArgs \ $baseRidArgs \ $portableBuildArgs \ - /p:DotNetBuildSourceOnly=true \ - /p:DotNetBuildRepo=true \ displayName: Build - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml diff --git a/global.json b/global.json index 68eecc1d1f..265b1905d9 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.108" } } From a2bfd7a346c85e716a0a1ca88872dc2b16d76551 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 May 2025 14:08:10 +0000 Subject: [PATCH 18/36] [VMR] Codeflow 362a422-ad85650 [[ commit created by automation ]] --- Directory.Build.props | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 42e40c8907..57094776fd 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ true + false @@ -22,11 +23,11 @@ net462 - 8.0 From 9a02e0b5696d0d9d3b92a3c173660323e78dc3f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 May 2025 14:08:10 +0000 Subject: [PATCH 19/36] Update dependencies from https://github.com/dotnet/dotnet build 268384 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25263.108 -> 10.0.0-beta.25229.109) Microsoft.NET.Sdk (Version 10.0.100-preview.5.25263.108 -> 10.0.100-preview.5.25229.109) Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Runtime.win-x64, VS.Redist.Common.NetCore.SharedFramework.x64.10.0 (Version 10.0.0-preview.5.25263.108 -> 10.0.0-preview.5.25229.109) --- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ eng/common/tools.ps1 | 4 +--- eng/common/tools.sh | 2 +- global.json | 2 +- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb2b62c149..21c2a12bb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0518b0e08b..a3417ac1f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25263.108 - 10.0.0-preview.5.25263.108 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25263.108 - 10.0.0-preview.5.25263.108 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25265.101 - 10.0.100-preview.5.25263.108 + 10.0.100-preview.5.25265.101 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25263.108 + 10.0.0-beta.25265.101 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7373e53054..5f40a3f823 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop' # True if the build is a product build [bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } -[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() } - function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } @@ -853,7 +851,7 @@ function MSBuild-Core() { # When running on Azure Pipelines, override the returned exit code to avoid double logging. # Skip this when the build is a child of the VMR orchestrator build. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) { + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/eng/common/tools.sh b/eng/common/tools.sh index cc007b1f15..25f5932eee 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -507,7 +507,7 @@ function MSBuild-Core { # When running on Azure Pipelines, override the returned exit code to avoid double logging. # Skip this when the build is a child of the VMR orchestrator build. - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index 265b1905d9..10c19dca64 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.108" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101" } } From a0229d7d79732a979dac013d54c6d192215d5f42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 May 2025 02:04:42 +0000 Subject: [PATCH 20/36] [VMR] Codeflow a3c354f-a3c354f [[ commit created by automation ]] --- .github/CODEOWNERS | 1 - eng/Build.props | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a2a328030c..b638e2c575 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -7,4 +7,3 @@ # have proper ownership. /src/ @dotnet/dotnet-diag /documentation/ @dotnet/dotnet-diag -/eng/DotNetBuild.props @dotnet/product-construction diff --git a/eng/Build.props b/eng/Build.props index 9e4698ebbb..61f52242a2 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,5 +1,6 @@ + From 01e17b868fcb226dcc7adec08a9dc49d0f9c5583 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 May 2025 02:04:43 +0000 Subject: [PATCH 21/36] Update dependencies from https://github.com/dotnet/dotnet build 268651 No dependency updates to commit --- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ eng/common/build.ps1 | 2 +- eng/common/build.sh | 6 +++--- global.json | 6 +++--- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21c2a12bb8..72ff5e9ca1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,37 +11,37 @@ - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a3417ac1f7..ad9f015ade 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25266.103 + 10.0.0-preview.5.25266.103 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25266.103 + 10.0.0-preview.5.25266.103 - 10.0.100-preview.5.25265.101 + 10.0.100-preview.5.25266.103 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25265.101 + 10.0.0-beta.25266.103 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 6b3be1916f..ae2309e312 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -127,7 +127,7 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` - /p:DotNetBuildRepo=$productBuild ` + /p:DotNetBuild=$productBuild ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index 27ae2c8560..da906da202 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -129,14 +129,14 @@ while [[ $# > 0 ]]; do -pack) pack=true ;; - -sourcebuild|-sb) + -sourcebuild|-source-build|-sb) build=true source_build=true product_build=true restore=true pack=true ;; - -productbuild|-pb) + -productbuild|-product-build|-pb) build=true product_build=true restore=true @@ -241,7 +241,7 @@ function Build { /p:RepoRoot="$repo_root" \ /p:Restore=$restore \ /p:Build=$build \ - /p:DotNetBuildRepo=$product_build \ + /p:DotNetBuild=$product_build \ /p:DotNetBuildSourceOnly=$source_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ diff --git a/global.json b/global.json index 10c19dca64..9cdcb4ca66 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "10.0.100-preview.3.25201.16", + "version": "10.0.100-preview.5.25265.106", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-preview.3.25201.16", + "dotnet": "10.0.100-preview.5.25265.106", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreApp80Version)" @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25266.103" } } From a84af09212c96a870f4df4e2ac23ae7de67bbe9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 May 2025 16:29:19 +0000 Subject: [PATCH 22/36] Update dependencies from https://github.com/dotnet/dotnet build 268722 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25266.103 -> 10.0.0-beta.25229.109) Microsoft.NET.Sdk (Version 10.0.100-preview.5.25266.103 -> 10.0.100-preview.5.25229.109) Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Runtime.win-x64, VS.Redist.Common.NetCore.SharedFramework.x64.10.0 (Version 10.0.0-preview.5.25266.103 -> 10.0.0-preview.5.25229.109) --- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 10 +++++----- global.json | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a5f397202..0e1a94e6a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,33 +11,33 @@ - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index bb710c1a8c..921c9612dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25266.103 + 10.0.0-preview.5.25267.102 10.0.0-preview.5.25266.103 - 10.0.0-preview.5.25266.103 - 10.0.0-preview.5.25266.103 + 10.0.0-preview.5.25267.102 + 10.0.0-preview.5.25267.102 - 10.0.100-preview.5.25266.103 + 10.0.100-preview.5.25267.102 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25266.103 + 10.0.0-beta.25267.102 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/global.json b/global.json index 9cdcb4ca66..80dced52cc 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25266.103" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25267.102" } } From 876a31391d31a95cc9efdf9d81bf53333b51b0d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 May 2025 02:04:51 +0000 Subject: [PATCH 23/36] [VMR] Codeflow ce653de-ce653de [[ commit created by automation ]] From 1f426bab9d8f61314650e8c8647056767f97384c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 May 2025 02:04:51 +0000 Subject: [PATCH 24/36] Update dependencies from https://github.com/dotnet/dotnet build 268973 No dependency updates to commit --- eng/Version.Details.xml | 26 +-- eng/Versions.props | 10 +- eng/common/templates/steps/vmr-sync.yml | 207 ++++++++++++++++++++++++ eng/common/templates/vmr-build-pr.yml | 33 ++++ eng/common/vmr-sync.ps1 | 138 ++++++++++++++++ eng/common/vmr-sync.sh | 205 +++++++++++++++++++++++ global.json | 2 +- 7 files changed, 602 insertions(+), 19 deletions(-) create mode 100644 eng/common/templates/steps/vmr-sync.yml create mode 100644 eng/common/templates/vmr-build-pr.yml create mode 100755 eng/common/vmr-sync.ps1 create mode 100755 eng/common/vmr-sync.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e1a94e6a6..3bc56f55c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,33 +11,33 @@ - + https://github.com/dotnet/dotnet - 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 + d60c3fe894af16cd15dc86420af0fc9d02be4997 - + https://github.com/dotnet/dotnet - 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 + d60c3fe894af16cd15dc86420af0fc9d02be4997 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 + d60c3fe894af16cd15dc86420af0fc9d02be4997 - + https://github.com/dotnet/dotnet - 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 + d60c3fe894af16cd15dc86420af0fc9d02be4997 - + https://github.com/dotnet/dotnet - 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 + d60c3fe894af16cd15dc86420af0fc9d02be4997 - + https://github.com/dotnet/dotnet - 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 + d60c3fe894af16cd15dc86420af0fc9d02be4997 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 921c9612dd..9a0ad28497 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25267.102 + 10.0.0-preview.5.25269.109 10.0.0-preview.5.25266.103 - 10.0.0-preview.5.25267.102 - 10.0.0-preview.5.25267.102 + 10.0.0-preview.5.25269.109 + 10.0.0-preview.5.25269.109 - 10.0.100-preview.5.25267.102 + 10.0.100-preview.5.25269.109 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25267.102 + 10.0.0-beta.25269.109 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 diff --git a/eng/common/templates/steps/vmr-sync.yml b/eng/common/templates/steps/vmr-sync.yml new file mode 100644 index 0000000000..599afb6186 --- /dev/null +++ b/eng/common/templates/steps/vmr-sync.yml @@ -0,0 +1,207 @@ +### These steps synchronize new code from product repositories into the VMR (https://github.com/dotnet/dotnet). +### They initialize the darc CLI and pull the new updates. +### Changes are applied locally onto the already cloned VMR (located in $vmrPath). + +parameters: +- name: targetRef + displayName: Target revision in dotnet/ to synchronize + type: string + default: $(Build.SourceVersion) + +- name: vmrPath + displayName: Path where the dotnet/dotnet is checked out to + type: string + default: $(Agent.BuildDirectory)/vmr + +- name: additionalSyncs + displayName: Optional list of package names whose repo's source will also be synchronized in the local VMR, e.g. NuGet.Protocol + type: object + default: [] + +steps: +- checkout: vmr + displayName: Clone dotnet/dotnet + path: vmr + clean: true + +- checkout: self + displayName: Clone $(Build.Repository.Name) + path: repo + fetchDepth: 0 + +# This step is needed so that when we get a detached HEAD / shallow clone, +# we still pull the commit into the temporary repo clone to use it during the sync. +# Also unshallow the clone so that forwardflow command would work. +- script: | + git branch repo-head + git rev-parse HEAD + displayName: Label PR commit + workingDirectory: $(Agent.BuildDirectory)/repo + +- script: | + vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml) + echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha" + displayName: Obtain the vmr sha from Version.Details.xml (Unix) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- powershell: | + [xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml + $vmr_sha = $xml.SelectSingleNode("//Source").Sha + Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha" + displayName: Obtain the vmr sha from Version.Details.xml (Windows) + condition: eq(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- script: | + git fetch --all + git checkout $(vmr_sha) + displayName: Checkout VMR at correct sha for repo flow + workingDirectory: ${{ parameters.vmrPath }} + +- script: | + git config --global user.name "dotnet-maestro[bot]" + git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com" + displayName: Set git author to dotnet-maestro[bot] + workingDirectory: ${{ parameters.vmrPath }} + +- script: | + ./eng/common/vmr-sync.sh \ + --vmr ${{ parameters.vmrPath }} \ + --tmp $(Agent.TempDirectory) \ + --azdev-pat '$(dn-bot-all-orgs-code-r)' \ + --ci \ + --debug + + if [ "$?" -ne 0 ]; then + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + fi + displayName: Sync repo into VMR (Unix) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- script: | + git config --global diff.astextplain.textconv echo + git config --system core.longpaths true + displayName: Configure Windows git (longpaths, astextplain) + condition: eq(variables['Agent.OS'], 'Windows_NT') + +- powershell: | + ./eng/common/vmr-sync.ps1 ` + -vmr ${{ parameters.vmrPath }} ` + -tmp $(Agent.TempDirectory) ` + -azdevPat '$(dn-bot-all-orgs-code-r)' ` + -ci ` + -debugOutput + + if ($LASTEXITCODE -ne 0) { + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + } + displayName: Sync repo into VMR (Windows) + condition: eq(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - task: CopyFiles@2 + displayName: Collect failed patches + condition: failed() + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: '*.patch' + TargetFolder: '$(Build.ArtifactStagingDirectory)/FailedPatches' + + - publish: '$(Build.ArtifactStagingDirectory)/FailedPatches' + artifact: $(System.JobDisplayName)_FailedPatches + displayName: Upload failed patches + condition: failed() + +- ${{ each assetName in parameters.additionalSyncs }}: + # The vmr-sync script ends up staging files in the local VMR so we have to commit those + - script: + git commit --allow-empty -am "Forward-flow $(Build.Repository.Name)" + displayName: Commit local VMR changes + workingDirectory: ${{ parameters.vmrPath }} + + - script: | + set -ex + + echo "Searching for details of asset ${{ assetName }}..." + + # Use darc to get dependencies information + dependencies=$(./.dotnet/dotnet darc get-dependencies --name '${{ assetName }}' --ci) + + # Extract repository URL and commit hash + repository=$(echo "$dependencies" | grep 'Repo:' | sed 's/Repo:[[:space:]]*//' | head -1) + + if [ -z "$repository" ]; then + echo "##vso[task.logissue type=error]Asset ${{ assetName }} not found in the dependency list" + exit 1 + fi + + commit=$(echo "$dependencies" | grep 'Commit:' | sed 's/Commit:[[:space:]]*//' | head -1) + + echo "Updating the VMR from $repository / $commit..." + cd .. + git clone $repository ${{ assetName }} + cd ${{ assetName }} + git checkout $commit + git branch "sync/$commit" + + ./eng/common/vmr-sync.sh \ + --vmr ${{ parameters.vmrPath }} \ + --tmp $(Agent.TempDirectory) \ + --azdev-pat '$(dn-bot-all-orgs-code-r)' \ + --ci \ + --debug + + if [ "$?" -ne 0 ]; then + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + fi + displayName: Sync ${{ assetName }} into (Unix) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + + - powershell: | + $ErrorActionPreference = 'Stop' + + Write-Host "Searching for details of asset ${{ assetName }}..." + + $dependencies = .\.dotnet\dotnet darc get-dependencies --name '${{ assetName }}' --ci + + $repository = $dependencies | Select-String -Pattern 'Repo:\s+([^\s]+)' | Select-Object -First 1 + $repository -match 'Repo:\s+([^\s]+)' | Out-Null + $repository = $matches[1] + + if ($repository -eq $null) { + Write-Error "Asset ${{ assetName }} not found in the dependency list" + exit 1 + } + + $commit = $dependencies | Select-String -Pattern 'Commit:\s+([^\s]+)' | Select-Object -First 1 + $commit -match 'Commit:\s+([^\s]+)' | Out-Null + $commit = $matches[1] + + Write-Host "Updating the VMR from $repository / $commit..." + cd .. + git clone $repository ${{ assetName }} + cd ${{ assetName }} + git checkout $commit + git branch "sync/$commit" + + .\eng\common\vmr-sync.ps1 ` + -vmr ${{ parameters.vmrPath }} ` + -tmp $(Agent.TempDirectory) ` + -azdevPat '$(dn-bot-all-orgs-code-r)' ` + -ci ` + -debugOutput + + if ($LASTEXITCODE -ne 0) { + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + } + displayName: Sync ${{ assetName }} into (Windows) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml new file mode 100644 index 0000000000..670cf32c3b --- /dev/null +++ b/eng/common/templates/vmr-build-pr.yml @@ -0,0 +1,33 @@ +trigger: none +pr: + branches: + include: + - main + - release/* + paths: + exclude: + - documentation/* + - README.md + - CODEOWNERS + +variables: +- template: /eng/common/templates/variables/pool-providers.yml@self + +- name: skipComponentGovernanceDetection # we run CG on internal builds only + value: true + +- name: Codeql.Enabled # we run CodeQL on internal builds only + value: false + +resources: + repositories: + - repository: vmr + type: github + name: dotnet/dotnet + endpoint: dotnet + +stages: +- template: /eng/pipelines/templates/stages/vmr-build.yml@vmr + parameters: + isBuiltFromVmr: false + scope: lite diff --git a/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1 new file mode 100755 index 0000000000..8c3c91ce8d --- /dev/null +++ b/eng/common/vmr-sync.ps1 @@ -0,0 +1,138 @@ +<# +.SYNOPSIS + +This script is used for synchronizing the current repository into a local VMR. +It pulls the current repository's code into the specified VMR directory for local testing or +Source-Build validation. + +.DESCRIPTION + +The tooling used for synchronization will clone the VMR repository into a temporary folder if +it does not already exist. These clones can be reused in future synchronizations, so it is +recommended to dedicate a folder for this to speed up re-runs. + +.EXAMPLE + Synchronize current repository into a local VMR: + ./vmr-sync.ps1 -vmrDir "$HOME/repos/dotnet" -tmpDir "$HOME/repos/tmp" + +.PARAMETER tmpDir +Required. Path to the temporary folder where repositories will be cloned + +.PARAMETER vmrBranch +Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch + +.PARAMETER azdevPat +Optional. Azure DevOps PAT to use for cloning private repositories. + +.PARAMETER vmrDir +Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder + +.PARAMETER debugOutput +Optional. Enables debug logging in the darc vmr command. + +.PARAMETER ci +Optional. Denotes that the script is running in a CI environment. +#> +param ( + [Parameter(Mandatory=$true, HelpMessage="Path to the temporary folder where repositories will be cloned")] + [string][Alias('t', 'tmp')]$tmpDir, + [string][Alias('b', 'branch')]$vmrBranch, + [string]$remote, + [string]$azdevPat, + [string][Alias('v', 'vmr')]$vmrDir, + [switch]$ci, + [switch]$debugOutput +) + +function Fail { + Write-Host "> $($args[0])" -ForegroundColor 'Red' +} + +function Highlight { + Write-Host "> $($args[0])" -ForegroundColor 'Cyan' +} + +$verbosity = 'verbose' +if ($debugOutput) { + $verbosity = 'debug' +} +# Validation + +if (-not $tmpDir) { + Fail "Missing -tmpDir argument. Please specify the path to the temporary folder where the repositories will be cloned" + exit 1 +} + +# Sanitize the input + +if (-not $vmrDir) { + $vmrDir = Join-Path $tmpDir 'dotnet' +} + +if (-not (Test-Path -Path $tmpDir -PathType Container)) { + New-Item -ItemType Directory -Path $tmpDir | Out-Null +} + +# Prepare the VMR + +if (-not (Test-Path -Path $vmrDir -PathType Container)) { + Highlight "Cloning 'dotnet/dotnet' into $vmrDir.." + git clone https://github.com/dotnet/dotnet $vmrDir + + if ($vmrBranch) { + git -C $vmrDir switch -c $vmrBranch + } +} +else { + if ((git -C $vmrDir diff --quiet) -eq $false) { + Fail "There are changes in the working tree of $vmrDir. Please commit or stash your changes" + exit 1 + } + + if ($vmrBranch) { + Highlight "Preparing $vmrDir" + git -C $vmrDir checkout $vmrBranch + git -C $vmrDir pull + } +} + +Set-StrictMode -Version Latest + +# Prepare darc + +Highlight 'Installing .NET, preparing the tooling..' +. .\eng\common\tools.ps1 +$dotnetRoot = InitializeDotNetCli -install:$true +$dotnet = "$dotnetRoot\dotnet.exe" +& "$dotnet" tool restore + +Highlight "Starting the synchronization of VMR.." + +# Synchronize the VMR +$darcArgs = ( + "darc", "vmr", "forwardflow", + "--tmp", $tmpDir, + "--$verbosity", + $vmrDir +) + +if ($ci) { + $darcArgs += ("--ci") +} + +if ($azdevPat) { + $darcArgs += ("--azdev-pat", $azdevPat) +} + +& "$dotnet" $darcArgs + +if ($LASTEXITCODE -eq 0) { + Highlight "Synchronization succeeded" +} +else { + Fail "Synchronization of repo to VMR failed!" + Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)." + Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)." + Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." + exit 1 +} diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh new file mode 100755 index 0000000000..86d77ccf5b --- /dev/null +++ b/eng/common/vmr-sync.sh @@ -0,0 +1,205 @@ +#!/bin/bash + +### This script is used for synchronizing the current repository into a local VMR. +### It pulls the current repository's code into the specified VMR directory for local testing or +### Source-Build validation. +### +### The tooling used for synchronization will clone the VMR repository into a temporary folder if +### it does not already exist. These clones can be reused in future synchronizations, so it is +### recommended to dedicate a folder for this to speed up re-runs. +### +### USAGE: +### Synchronize current repository into a local VMR: +### ./vmr-sync.sh --tmp "$HOME/repos/tmp" "$HOME/repos/dotnet" +### +### Options: +### -t, --tmp, --tmp-dir PATH +### Required. Path to the temporary folder where repositories will be cloned +### +### -b, --branch, --vmr-branch BRANCH_NAME +### Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch +### +### --debug +### Optional. Turns on the most verbose logging for the VMR tooling +### +### --remote name:URI +### Optional. Additional remote to use during the synchronization +### This can be used to synchronize to a commit from a fork of the repository +### Example: 'runtime:https://github.com/yourfork/runtime' +### +### --azdev-pat +### Optional. Azure DevOps PAT to use for cloning private repositories. +### +### -v, --vmr, --vmr-dir PATH +### Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +function print_help () { + sed -n '/^### /,/^$/p' "$source" | cut -b 5- +} + +COLOR_RED=$(tput setaf 1 2>/dev/null || true) +COLOR_CYAN=$(tput setaf 6 2>/dev/null || true) +COLOR_CLEAR=$(tput sgr0 2>/dev/null || true) +COLOR_RESET=uniquesearchablestring +FAILURE_PREFIX='> ' + +function fail () { + echo "${COLOR_RED}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_RED}}${COLOR_CLEAR}" >&2 +} + +function highlight () { + echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" +} + +tmp_dir='' +vmr_dir='' +vmr_branch='' +additional_remotes='' +verbosity=verbose +azdev_pat='' +ci=false + +while [[ $# -gt 0 ]]; do + opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -t|--tmp|--tmp-dir) + tmp_dir=$2 + shift + ;; + -v|--vmr|--vmr-dir) + vmr_dir=$2 + shift + ;; + -b|--branch|--vmr-branch) + vmr_branch=$2 + shift + ;; + --remote) + additional_remotes="$additional_remotes $2" + shift + ;; + --azdev-pat) + azdev_pat=$2 + shift + ;; + --ci) + ci=true + ;; + -d|--debug) + verbosity=debug + ;; + -h|--help) + print_help + exit 0 + ;; + *) + fail "Invalid argument: $1" + print_help + exit 1 + ;; + esac + + shift +done + +# Validation + +if [[ -z "$tmp_dir" ]]; then + fail "Missing --tmp-dir argument. Please specify the path to the temporary folder where the repositories will be cloned" + exit 1 +fi + +# Sanitize the input + +if [[ -z "$vmr_dir" ]]; then + vmr_dir="$tmp_dir/dotnet" +fi + +if [[ ! -d "$tmp_dir" ]]; then + mkdir -p "$tmp_dir" +fi + +if [[ "$verbosity" == "debug" ]]; then + set -x +fi + +# Prepare the VMR + +if [[ ! -d "$vmr_dir" ]]; then + highlight "Cloning 'dotnet/dotnet' into $vmr_dir.." + git clone https://github.com/dotnet/dotnet "$vmr_dir" + + if [[ -n "$vmr_branch" ]]; then + git -C "$vmr_dir" switch -c "$vmr_branch" + fi +else + if ! git -C "$vmr_dir" diff --quiet; then + fail "There are changes in the working tree of $vmr_dir. Please commit or stash your changes" + exit 1 + fi + + if [[ -n "$vmr_branch" ]]; then + highlight "Preparing $vmr_dir" + git -C "$vmr_dir" checkout "$vmr_branch" + git -C "$vmr_dir" pull + fi +fi + +set -e + +# Prepare darc + +highlight 'Installing .NET, preparing the tooling..' +source "./eng/common/tools.sh" +InitializeDotNetCli true +dotnetDir=$( cd ./.dotnet/; pwd -P ) +dotnet=$dotnetDir/dotnet +"$dotnet" tool restore + +highlight "Starting the synchronization of VMR.." +set +e + +if [[ -n "$additional_remotes" ]]; then + additional_remotes="--additional-remotes $additional_remotes" +fi + +if [[ -n "$azdev_pat" ]]; then + azdev_pat="--azdev-pat $azdev_pat" +fi + +ci_arg='' +if [[ "$ci" == "true" ]]; then + ci_arg="--ci" +fi + +# Synchronize the VMR + +"$dotnet" darc vmr forwardflow \ + --tmp "$tmp_dir" \ + $azdev_pat \ + --$verbosity \ + $ci_arg \ + $additional_remotes \ + "$vmr_dir" + +if [[ $? == 0 ]]; then + highlight "Synchronization succeeded" +else + fail "Synchronization of repo to VMR failed!" + fail "'$vmr_dir' is left in its last state (re-run of this script will reset it)." + fail "Please inspect the logs which contain path to the failing patch file (use --debug to get all the details)." + fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." + exit 1 +fi diff --git a/global.json b/global.json index 80dced52cc..1aebb7adef 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25267.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25269.109" } } From 8c062db9a63578245ab364cd2e49d3631ea9139b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 May 2025 02:08:18 +0000 Subject: [PATCH 25/36] [VMR] Codeflow d60c3fe-a4d6fdc [[ commit created by automation ]] --- Directory.Build.props | 2 +- .../Microsoft.Diagnostics.NETCore.Client.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 57094776fd..393951b02c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,7 +18,7 @@ git MIT true - diagnostics + diagnostics diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj index 1f5414270e..095957370b 100644 --- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj +++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj @@ -13,7 +13,7 @@ true true false - true + true From e56da778def532b34b4aa64ed2997fa202ca563f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 May 2025 02:08:18 +0000 Subject: [PATCH 26/36] Update dependencies from https://github.com/dotnet/dotnet build 269082 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25269.109 -> 10.0.0-beta.25229.109) Microsoft.NET.Sdk (Version 10.0.100-preview.5.25269.109 -> 10.0.100-preview.5.25229.109) Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.5.25269.109 -> 10.0.0-preview.5.25229.109) --- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++-------- global.json | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bc56f55c7..292b634f5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,49 +11,49 @@ - + https://github.com/dotnet/dotnet - d60c3fe894af16cd15dc86420af0fc9d02be4997 + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 - + https://github.com/dotnet/dotnet - d60c3fe894af16cd15dc86420af0fc9d02be4997 + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - d60c3fe894af16cd15dc86420af0fc9d02be4997 + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 - + https://github.com/dotnet/dotnet - d60c3fe894af16cd15dc86420af0fc9d02be4997 + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 - + https://github.com/dotnet/dotnet - d60c3fe894af16cd15dc86420af0fc9d02be4997 + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 - + https://github.com/dotnet/dotnet - d60c3fe894af16cd15dc86420af0fc9d02be4997 + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 - - https://github.com/dotnet/roslyn - 40e6b96cad11400acb5b8999057ac8ba748df940 + + https://github.com/dotnet/dotnet + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 - - https://github.com/dotnet/roslyn - 40e6b96cad11400acb5b8999057ac8ba748df940 + + https://github.com/dotnet/dotnet + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 - - https://github.com/dotnet/roslyn-analyzers - 7f449a5d6f05c6aed77e4abf85aac2ce19f6a2d6 + + https://github.com/dotnet/dotnet + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 - - https://github.com/dotnet/roslyn-analyzers - 7f449a5d6f05c6aed77e4abf85aac2ce19f6a2d6 + + https://github.com/dotnet/dotnet + a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 diff --git a/eng/Versions.props b/eng/Versions.props index 9a0ad28497..228d537b94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25269.109 + 10.0.0-preview.5.25270.108 10.0.0-preview.5.25266.103 - 10.0.0-preview.5.25269.109 - 10.0.0-preview.5.25269.109 + 10.0.0-preview.5.25270.108 + 10.0.0-preview.5.25270.108 - 10.0.100-preview.5.25269.109 + 10.0.100-preview.5.25270.108 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25269.109 + 10.0.0-beta.25270.108 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 @@ -68,8 +68,8 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.11.0-2.24271.11 - 4.11.0-2.24271.11 + 5.0.0-1.25270.108 + 5.0.0-1.25270.108 4.11.0-2.24271.11 3.11.0 @@ -83,8 +83,8 @@ 4.4.0 4.8.0 $(MicrosoftCodeAnalysisVersion) - 3.12.0-beta1.24605.1 - 10.0.0-preview.24605.1 + 5.0.0-1.25270.108 + 10.0.0-preview.25270.108 diff --git a/global.json b/global.json index 1aebb7adef..f01ebdfe64 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25269.109" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25270.108" } } From afd435657963942dd0918da4a41d936ff43aa880 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 May 2025 02:07:54 +0000 Subject: [PATCH 27/36] [VMR] Codeflow 2650c60-2650c60 [[ commit created by automation ]] From 83b8e0d751ef77162886138bed28931bcf3df6ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 May 2025 02:07:55 +0000 Subject: [PATCH 28/36] Update dependencies from https://github.com/dotnet/dotnet build 269352 No dependency updates to commit --- eng/Version.Details.xml | 42 +++++++++---------- eng/Versions.props | 18 ++++---- eng/common/build.ps1 | 3 ++ eng/common/build.sh | 14 +++++-- .../core-templates/post-build/post-build.yml | 3 -- .../steps/install-microbuild.yml | 35 ---------------- eng/common/tools.ps1 | 8 ++-- eng/common/tools.sh | 8 ++-- global.json | 2 +- 9 files changed, 52 insertions(+), 81 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 292b634f5a..c2661025aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,49 +11,49 @@ - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c diff --git a/eng/Versions.props b/eng/Versions.props index 228d537b94..d9d10de445 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,13 +16,13 @@ - 10.0.0-preview.5.25270.108 + 10.0.0-preview.6.25272.109 10.0.0-preview.5.25266.103 - 10.0.0-preview.5.25270.108 - 10.0.0-preview.5.25270.108 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 - 10.0.100-preview.5.25270.108 + 10.0.100-preview.6.25272.109 @@ -55,7 +55,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25270.108 + 10.0.0-beta.25272.109 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 @@ -68,8 +68,8 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 5.0.0-1.25270.108 - 5.0.0-1.25270.108 + 5.0.0-1.25272.109 + 5.0.0-1.25272.109 4.11.0-2.24271.11 3.11.0 @@ -83,8 +83,8 @@ 4.4.0 4.8.0 $(MicrosoftCodeAnalysisVersion) - 5.0.0-1.25270.108 - 10.0.0-preview.25270.108 + 5.0.0-1.25272.109 + 10.0.0-preview.25272.109 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index ae2309e312..8cfee107e7 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -21,6 +21,7 @@ Param( [switch] $publish, [switch] $clean, [switch][Alias('pb')]$productBuild, + [switch]$fromVMR, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, [switch] $ci, @@ -74,6 +75,7 @@ function Print-Usage() { Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host " -nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" Write-Host " -buildCheck Sets /check msbuild parameter" + Write-Host " -fromVMR Set when building from within the VMR" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -128,6 +130,7 @@ function Build { /p:Test=$test ` /p:Pack=$pack ` /p:DotNetBuild=$productBuild ` + /p:DotNetBuildFromVMR=$fromVMR ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index da906da202..b105db583c 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -43,6 +43,7 @@ usage() echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" echo " --buildCheck Sets /check msbuild parameter" + echo " --fromVMR Set when building from within the VMR" echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -64,6 +65,7 @@ restore=false build=false source_build=false product_build=false +from_vmr=false rebuild=false test=false integration_test=false @@ -89,7 +91,7 @@ verbosity='minimal' runtime_source_feed='' runtime_source_feed_key='' -properties='' +properties=() while [[ $# > 0 ]]; do opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" case "$opt" in @@ -142,6 +144,9 @@ while [[ $# > 0 ]]; do restore=true pack=true ;; + -fromvmr|-from-vmr) + from_vmr=true + ;; -test|-t) test=true ;; @@ -187,7 +192,7 @@ while [[ $# > 0 ]]; do shift ;; *) - properties="$properties $1" + properties+=("$1") ;; esac @@ -221,7 +226,7 @@ function Build { InitializeCustomToolset if [[ ! -z "$projects" ]]; then - properties="$properties /p:Projects=$projects" + properties+=("/p:Projects=$projects") fi local bl="" @@ -243,6 +248,7 @@ function Build { /p:Build=$build \ /p:DotNetBuild=$product_build \ /p:DotNetBuildSourceOnly=$source_build \ + /p:DotNetBuildFromVMR=$from_vmr \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ @@ -251,7 +257,7 @@ function Build { /p:Sign=$sign \ /p:Publish=$publish \ /p:RestoreStaticGraphEnableBinaryLogger=$binary_log \ - $properties + "${properties[@]}" ExitWithExitCode 0 } diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 5757915edb..a151fd811e 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -193,9 +193,6 @@ stages: buildId: $(AzDOBuildId) artifactName: PackageArtifacts checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 2bcf974ee1..a3540ba00c 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -48,38 +48,3 @@ steps: eq(variables['_SignType'], 'real') ) )) - - # Workaround for ESRP CLI on Linux - https://github.com/dotnet/source-build/issues/4964 - - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - - task: UseDotNet@2 - displayName: Install .NET 9.0 SDK for ESRP CLI Workaround - inputs: - packageType: sdk - version: 9.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet - workingDirectory: ${{ parameters.microBuildOutputFolder }} - condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) - - - task: PowerShell@2 - displayName: Workaround for ESRP CLI on Linux - inputs: - targetType: 'inline' - script: | - Write-Host "Copying Linux Path" - $MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)' - $MBSIGN_APPFOLDER = ($MBSIGN_APPFOLDER -replace '/build', '') - - $versionRegex = '\d+\.\d+\.\d+' - $package = Get-ChildItem -Path $MBSIGN_APPFOLDER -Directory | - Where-Object { $_.Name -match $versionRegex } - - if ($package.Count -ne 1) { - Write-Host "There should be exactly one matching subfolder, but found $($package.Count)." - exit 1 - } - - $MBSIGN_APPFOLDER = $package[0].FullName + '/build' - $MBSIGN_APPFOLDER | Write-Host - $SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml' - Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force - condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5f40a3f823..046ec9d08a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -65,8 +65,8 @@ $ErrorActionPreference = 'Stop' # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } -# True if the build is a product build -[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } +# True when the build is running within the VMR. +[bool]$fromVMR = if (Test-Path variable:fromVMR) { $fromVMR } else { $false } function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null @@ -850,8 +850,8 @@ function MSBuild-Core() { } # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR orchestrator build. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) { + # Skip this when the build is a child of the VMR build. + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 25f5932eee..8bc68e8460 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -72,8 +72,8 @@ fi runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed_key=${runtime_source_feed_key:-''} -# True if the build is a product build -product_build=${product_build:-false} +# True when the build is running within the VMR. +from_vmr=${from_vmr:-false} # Resolve any symlinks in the given path. function ResolvePath { @@ -506,8 +506,8 @@ function MSBuild-Core { echo "Build failed with exit code $exit_code. Check errors above." # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR orchestrator build. - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then + # Skip this when the build is a child of the VMR build. + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index f01ebdfe64..4085e930bd 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25270.108" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25272.109" } } From e3fb2d08c55783ff6b181990fd05b58ab1904bda Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Thu, 22 May 2025 22:00:45 -0700 Subject: [PATCH 29/36] Add Microsoft.NETCore.App.Ref node to versions file --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2661025aa..a279f52640 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,6 +35,10 @@ https://github.com/dotnet/dotnet 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + + https://github.com/dotnet/dotnet + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + https://github.com/dotnet/dotnet 445fb3a55b402cbe3a43576105e6fdc6686c8e4c diff --git a/eng/Versions.props b/eng/Versions.props index d9d10de445..17da27e91a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,8 +16,11 @@ + 10.0.0-preview.6.25272.109 - 10.0.0-preview.5.25266.103 + 10.0.0-preview.6.25272.109 10.0.0-preview.6.25272.109 10.0.0-preview.6.25272.109 From 8af21745d408db26b0a017885f21c45a66563c6f Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Fri, 23 May 2025 00:47:27 -0700 Subject: [PATCH 30/36] Fix compilation from new analyzers --- eng/CodeAnalysis.src.globalconfig | 5 ++++ .../ClrMDHelper.cs | 24 ++++++++----------- .../DiagnosticsIpc/IpcTcpSocketEndPoint.cs | 6 ++--- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/eng/CodeAnalysis.src.globalconfig b/eng/CodeAnalysis.src.globalconfig index c5f1ea2287..cbb4bbc276 100644 --- a/eng/CodeAnalysis.src.globalconfig +++ b/eng/CodeAnalysis.src.globalconfig @@ -524,6 +524,11 @@ dotnet_diagnostic.CA2020.severity = warning # CA2021: Do not call Enumerable.Cast or Enumerable.OfType with incompatible types dotnet_diagnostic.CA2021.severity = warning + +# CA2025: Ensure tasks using 'IDisposable' instances complete before the instances are disposed +# This is having a fair bit of false positives - downgrade to suggestion. +dotnet_diagnostic.CA2025.severity = suggestion + # CA2100: Review SQL queries for security vulnerabilities dotnet_diagnostic.CA2100.severity = none diff --git a/src/Microsoft.Diagnostics.ExtensionCommands/ClrMDHelper.cs b/src/Microsoft.Diagnostics.ExtensionCommands/ClrMDHelper.cs index c676f5d2ae..2fa6511d2c 100644 --- a/src/Microsoft.Diagnostics.ExtensionCommands/ClrMDHelper.cs +++ b/src/Microsoft.Diagnostics.ExtensionCommands/ClrMDHelper.cs @@ -150,7 +150,7 @@ public IEnumerable EnumerateTimers() continue; } - if (string.CompareOrdinal(objType.Name, "System.Threading.TimerQueue") != 0) + if (objType.Name != "System.Threading.TimerQueue") { continue; } @@ -386,7 +386,7 @@ private IEnumerable EnumerateGlobalThreadPoolItemsInNetCore() continue; } - if (string.CompareOrdinal(objType.Name, "System.Threading.ThreadPoolWorkQueue") == 0) + if (objType.Name == "System.Threading.ThreadPoolWorkQueue") { // work items are stored in a ConcurrentQueue stored in the "workItems" field ClrInstanceField workItemsField = objType.GetFieldByName("workItems"); @@ -413,11 +413,9 @@ private ThreadPoolItem GetThreadPoolItem(ClrObject item) return GetTask(item); } - if ( - (string.CompareOrdinal(itemType.Name, "System.Threading.QueueUserWorkItemCallback") == 0) || - // new to .NET Core - (string.CompareOrdinal(itemType.Name, "System.Threading.QueueUserWorkItemCallbackDefaultContext") == 0) - ) + if (itemType.Name is + "System.Threading.QueueUserWorkItemCallback" or + "System.Threading.QueueUserWorkItemCallbackDefaultContext") //new to .net core { return GetQueueUserWorkItemCallback(item); } @@ -463,7 +461,7 @@ private ThreadPoolItem GetTask(ClrObject task) if (taskScheduler.IsValid) { string schedulerType = taskScheduler.Type.ToString(); - if (string.CompareOrdinal("System.Threading.Tasks.ThreadPoolTaskScheduler", schedulerType) != 0) + if ("System.Threading.Tasks.ThreadPoolTaskScheduler" != schedulerType) { tpi.MethodName = $"{tpi.MethodName} [{schedulerType}]"; } @@ -542,10 +540,8 @@ internal string BuildDelegateMethodName(ClrType targetType, ClrObject action) // method is implemented by an class inherited from targetType // ... or a simple delegate indirection to a static/instance method { - if ( - (string.CompareOrdinal(targetType.Name, "System.Threading.WaitCallback") == 0) || - targetType.Name.StartsWith("System.Action<", StringComparison.Ordinal) - ) + if (targetType.Name == "System.Threading.WaitCallback" + || targetType.Name.StartsWith("System.Action<", StringComparison.Ordinal)) { return $"{method.Type.Name}.{method.Name}"; } @@ -611,7 +607,7 @@ private IEnumerable EnumerateLocalThreadPoolItemsInNetCore() continue; } - if (string.CompareOrdinal(type.Name, "System.Threading.ThreadPoolWorkQueue+WorkStealingQueue") == 0) + if (type.Name == "System.Threading.ThreadPoolWorkQueue+WorkStealingQueue") { ClrObject stealingQueue = obj; ClrArray workItems = stealingQueue.ReadObjectField("m_array").AsArray(); @@ -667,7 +663,7 @@ private IEnumerable EnumerateGlobalThreadPoolItemsInNetFramework continue; } - if (string.CompareOrdinal(workQueueType.Name, "System.Threading.ThreadPoolWorkQueue") != 0) + if (workQueueType.Name != "System.Threading.ThreadPoolWorkQueue") { continue; } diff --git a/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcTcpSocketEndPoint.cs b/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcTcpSocketEndPoint.cs index 7aaae390f5..abf3141534 100644 --- a/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcTcpSocketEndPoint.cs +++ b/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcTcpSocketEndPoint.cs @@ -38,7 +38,7 @@ public IpcTcpSocketEndPoint(string endPoint) { ParseTcpIpEndPoint(endPoint, out string host, out int port); EndPoint = CreateEndPoint(host, port); - DualMode = string.CompareOrdinal(host, "*") == 0; + DualMode = host == "*"; } public static implicit operator EndPoint(IpcTcpSocketEndPoint endPoint) => endPoint.EndPoint; @@ -98,7 +98,7 @@ private static void ParseTcpIpEndPoint(string endPoint, out string host, out int port = int.Parse(segments[1]); } - if (string.CompareOrdinal(host, "*") != 0) + if (host == "*") { if (!IPAddress.TryParse(host, out _)) { @@ -122,7 +122,7 @@ private static IPEndPoint CreateEndPoint(string host, int port) IPAddress ipAddress = null; try { - if (string.CompareOrdinal(host, "*") == 0) + if (host == "*") { if (Socket.OSSupportsIPv6) { From 6d3ec586d6b34e9599f583178c9de82f46e48671 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 May 2025 02:05:13 +0000 Subject: [PATCH 31/36] Update dependencies from https://github.com/dotnet/dotnet build 269418 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25272.109 -> 10.0.0-beta.25229.109) Microsoft.NET.Sdk (Version 10.0.100-preview.6.25272.109 -> 10.0.100-preview.5.25229.109) Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.6.25272.109 -> 10.0.0-preview.5.25229.109) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp (Version 5.0.0-1.25272.109 -> 4.11.0-2.24271.11) Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25272.109 -> 3.12.0-beta1.24605.1) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25272.109 -> 10.0.0-preview.24605.1) --- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++---------- global.json | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a279f52640..bcb2f84373 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,53 +11,53 @@ - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 diff --git a/eng/Versions.props b/eng/Versions.props index 17da27e91a..25af3862da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,16 +16,16 @@ - - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25273.101 + 10.0.0-preview.6.25273.101 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25273.101 + 10.0.0-preview.6.25273.101 - 10.0.100-preview.6.25272.109 + 10.0.100-preview.6.25273.101 @@ -58,7 +58,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25272.109 + 10.0.0-beta.25273.101 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 @@ -71,8 +71,8 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 5.0.0-1.25272.109 - 5.0.0-1.25272.109 + 5.0.0-1.25273.101 + 5.0.0-1.25273.101 4.11.0-2.24271.11 3.11.0 @@ -86,8 +86,8 @@ 4.4.0 4.8.0 $(MicrosoftCodeAnalysisVersion) - 5.0.0-1.25272.109 - 10.0.0-preview.25272.109 + 5.0.0-1.25273.101 + 10.0.0-preview.25273.101 diff --git a/global.json b/global.json index 4085e930bd..baf3e6613f 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25272.109" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25273.101" } } From fbf69ab7c970b3c60871de91d118101af83e497e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 May 2025 02:03:24 +0000 Subject: [PATCH 32/36] [VMR] Codeflow 84b028b-84b028b [[ commit created by automation ]] From 885e4c50cb11276915f1957790c746def5270799 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 May 2025 02:03:25 +0000 Subject: [PATCH 33/36] Update dependencies from https://github.com/dotnet/dotnet build 269499 No dependency updates to commit --- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- global.json | 6 +++--- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bcb2f84373..9a7d68edd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,53 +11,53 @@ - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 diff --git a/eng/Versions.props b/eng/Versions.props index 25af3862da..fa130af1a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,13 +19,13 @@ - 10.0.0-preview.6.25273.101 - 10.0.0-preview.6.25273.101 + 10.0.0-preview.6.25274.104 + 10.0.0-preview.6.25274.104 - 10.0.0-preview.6.25273.101 - 10.0.0-preview.6.25273.101 + 10.0.0-preview.6.25274.104 + 10.0.0-preview.6.25274.104 - 10.0.100-preview.6.25273.101 + 10.0.100-preview.6.25274.104 @@ -58,7 +58,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25273.101 + 10.0.0-beta.25274.104 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 @@ -71,8 +71,8 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 5.0.0-1.25273.101 - 5.0.0-1.25273.101 + 5.0.0-1.25274.104 + 5.0.0-1.25274.104 4.11.0-2.24271.11 3.11.0 @@ -86,8 +86,8 @@ 4.4.0 4.8.0 $(MicrosoftCodeAnalysisVersion) - 5.0.0-1.25273.101 - 10.0.0-preview.25273.101 + 5.0.0-1.25274.104 + 10.0.0-preview.25274.104 diff --git a/global.json b/global.json index baf3e6613f..a95b71e567 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "10.0.100-preview.5.25265.106", + "version": "10.0.100-preview.6.25272.112", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-preview.5.25265.106", + "dotnet": "10.0.100-preview.6.25272.112", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreApp80Version)" @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25273.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25274.104" } } From fc7fd61112eca8048cfd9238a035704561d972a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 May 2025 02:04:10 +0000 Subject: [PATCH 34/36] [VMR] Codeflow 5996972-5996972 [[ commit created by automation ]] --- src/SOS/SOS.UnitTests/SOSRunner.cs | 3 ++- src/tests/CommonTestRunner/TestRunner.cs | 12 ++++++++++-- src/tests/DbgShim.UnitTests/DebuggeeInfo.cs | 16 ++++++++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/SOS/SOS.UnitTests/SOSRunner.cs b/src/SOS/SOS.UnitTests/SOSRunner.cs index 4d92aff541..647bb08fb7 100644 --- a/src/SOS/SOS.UnitTests/SOSRunner.cs +++ b/src/SOS/SOS.UnitTests/SOSRunner.cs @@ -378,9 +378,10 @@ public static async Task CreateDump(TestInformation information) if (pipeServer != null) { dotnetDumpOutputHelper.WriteLine("Waiting for connection on pipe {0}", pipeName); - CancellationTokenSource source = new(TimeSpan.FromMinutes(5)); + using CancellationTokenSource source = new(TimeSpan.FromMinutes(5)); // Wait for debuggee to connect/write to pipe or if the process exits on some other failure/abnormally + // TODO: This is a resiliency issue - we'll try to collect the dump even if the debuggee fails to connect. await Task.WhenAny(pipeServer.WaitForConnectionAsync(source.Token), processRunner.WaitForExit()); } diff --git a/src/tests/CommonTestRunner/TestRunner.cs b/src/tests/CommonTestRunner/TestRunner.cs index a552385a6a..730dac25d1 100644 --- a/src/tests/CommonTestRunner/TestRunner.cs +++ b/src/tests/CommonTestRunner/TestRunner.cs @@ -245,8 +245,16 @@ public async Task WaitForTracee() WriteLine("WaitForTracee"); try { - CancellationTokenSource source = new(TimeSpan.FromMinutes(2)); - await _pipeServer.WaitForConnectionAsync(source.Token).ConfigureAwait(false); + using CancellationTokenSource source = new(TimeSpan.FromMinutes(2)); + Task processDeath = _runner.WaitForExit(); + Task traceeReady = _pipeServer.WaitForConnectionAsync(source.Token); + Task doneTask = await Task.WhenAny(processDeath, traceeReady).WaitAsync(source.Token).ConfigureAwait(false); + + source.Cancel(); + if (doneTask == processDeath) + { + Trace.TraceWarning($"WaitForTracee: process {Pid} exited without sending the event"); + } WriteLine("WaitForTracee: DONE"); } catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException) diff --git a/src/tests/DbgShim.UnitTests/DebuggeeInfo.cs b/src/tests/DbgShim.UnitTests/DebuggeeInfo.cs index b60e30ed6c..48588a6c64 100644 --- a/src/tests/DbgShim.UnitTests/DebuggeeInfo.cs +++ b/src/tests/DbgShim.UnitTests/DebuggeeInfo.cs @@ -71,9 +71,21 @@ public async Task WaitForDebuggee() } try { - CancellationTokenSource source = new(TimeSpan.FromMinutes(5)); + using CancellationTokenSource source = new(TimeSpan.FromMinutes(5)); Trace.TraceInformation($"DebuggeeInfo.WaitForDebuggee: waiting {ProcessId}"); - await _pipeServer.WaitForConnectionAsync(source.Token); + + Task processDeath = _process.WaitForExitAsync(source.Token); + Task debuggeeReady = _pipeServer.WaitForConnectionAsync(source.Token); + Task doneTask = await Task.WhenAny(processDeath, debuggeeReady).WaitAsync(source.Token); + + source.Cancel(); + + if (doneTask == processDeath) + { + Trace.TraceWarning($"DebuggeeInfo.WaitForDebuggee: process {ProcessId} exited"); + return false; + } + Trace.TraceInformation($"DebuggeeInfo.WaitForDebuggee: after wait {ProcessId}"); } catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException) From e47fbc2ff2ac4869e72612c4633fb15c4b26385a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 May 2025 02:04:10 +0000 Subject: [PATCH 35/36] Update dependencies from https://github.com/dotnet/dotnet build 269610 No dependency updates to commit --- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- global.json | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a7d68edd9..bb331b6c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/microsoft/clrmd @@ -11,53 +11,53 @@ - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c diff --git a/eng/Versions.props b/eng/Versions.props index fa130af1a0..84ecb76522 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,13 +19,13 @@ - 10.0.0-preview.6.25274.104 - 10.0.0-preview.6.25274.104 + 10.0.0-preview.6.25276.103 + 10.0.0-preview.6.25276.103 - 10.0.0-preview.6.25274.104 - 10.0.0-preview.6.25274.104 + 10.0.0-preview.6.25276.103 + 10.0.0-preview.6.25276.103 - 10.0.100-preview.6.25274.104 + 10.0.100-preview.6.25276.103 @@ -58,7 +58,7 @@ 8.0.0 8.0.5 2.0.3 - 10.0.0-beta.25274.104 + 10.0.0-beta.25276.103 1.2.0-beta.556 7.0.0-beta.22316.2 10.0.26100.1 @@ -71,8 +71,8 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 5.0.0-1.25274.104 - 5.0.0-1.25274.104 + 5.0.0-1.25276.103 + 5.0.0-1.25276.103 4.11.0-2.24271.11 3.11.0 @@ -86,8 +86,8 @@ 4.4.0 4.8.0 $(MicrosoftCodeAnalysisVersion) - 5.0.0-1.25274.104 - 10.0.0-preview.25274.104 + 5.0.0-1.25276.103 + 10.0.0-preview.25276.103 diff --git a/global.json b/global.json index a95b71e567..c36dcaacaf 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25274.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25276.103" } } From f82b3b733b87a5807e7cd89adee540054b3aa7bd Mon Sep 17 00:00:00 2001 From: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com> Date: Tue, 27 May 2025 14:31:31 -0700 Subject: [PATCH 36/36] Disable dcd test --- src/SOS/SOS.UnitTests/SOS.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/SOS/SOS.UnitTests/SOS.cs b/src/SOS/SOS.UnitTests/SOS.cs index 48ae26ebe2..365c4f3307 100644 --- a/src/SOS/SOS.UnitTests/SOS.cs +++ b/src/SOS/SOS.UnitTests/SOS.cs @@ -488,6 +488,11 @@ await SOSTestHelpers.RunTest( [SkippableTheory, MemberData(nameof(Configurations))] public async Task ConcurrentDictionaries(TestConfiguration config) { + if (OS.Kind != OSKind.Windows && config.RuntimeFrameworkVersionMajor == 10) + { + throw new SkipTestException("Dumping concurrent dict objects in dumps hits unavailable memory on linux dumps. Tracking: dotnet/diagnostics#5491"); + } + await SOSTestHelpers.RunTest( scriptName: "ConcurrentDictionaries.script", new SOSRunner.TestInformation