8000 [main] Source code updates from dotnet/cecil by dotnet-maestro[bot] · Pull Request #604 · dotnet/dotnet · GitHub
[go: up one dir, main page]

Skip to content

[main] Source code updates from dotnet/cecil #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions prereqs/git-info/cecil.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>091a4d494e2575c524c316013a482ec88bba28f2</GitCommitHash>
<OfficialBuildId>20250511.1</OfficialBuildId>
<OutputPackageVersion>0.11.5-alpha.25261.1</OutputPackageVersion>
<GitCommitHash>50f19ccf4b834a6eab54496486a114ba3839f7b9</GitCommitHash>
<OfficialBuildId>20250516.1</OfficialBuildId>
<OutputPackageVersion>0.11.5-alpha.25266.1</OutputPackageVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions src/cecil/eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="cecil" Sha="85778473549347b3e4bad3ea009e9438df7b11bb" BarId="267776" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="cecil" Sha="094631c46bc1d3cf5f3749e57bb584671f9e10f3" BarId="268570" />
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25260.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25265.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
<Sha>094631c46bc1d3cf5f3749e57bb584671f9e10f3</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions src/cecil/eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/cecil/eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/cecil/eng/common/darc-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
4 changes: 1 addition & 3 deletions src/cecil/eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/cecil/eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/cecil/global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"tools": {
"dotnet": "10.0.100-preview.3.25201.16"
"dotnet": "10.0.100-preview.5.25230.108"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.103"
}
}
6 changes: 3 additions & 3 deletions src/source-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"commitSha": "f0a43e8c514e5b2f013bdac6f4eca3a107e0438a"
},
{
"packageVersion": "0.11.5-alpha.25261.1",
"barId": 267824,
"packageVersion": "0.11.5-alpha.25266.1",
"barId": 268579,
"path": "cecil",
"remoteUri": "https://github.com/dotnet/cecil",
"commitSha": "091a4d494e2575c524c316013a482ec88bba28f2"
"commitSha": "50f19ccf4b834a6eab54496486a114ba3839f7b9"
},
{
"packageVersion": "0.1.626501",
Expand Down
0