diff --git a/prereqs/git-info/cecil.props b/prereqs/git-info/cecil.props index 83a1cbe4fbf..6f30d26a40b 100644 --- a/prereqs/git-info/cecil.props +++ b/prereqs/git-info/cecil.props @@ -1,8 +1,8 @@  - 091a4d494e2575c524c316013a482ec88bba28f2 - 20250511.1 - 0.11.5-alpha.25261.1 + 50f19ccf4b834a6eab54496486a114ba3839f7b9 + 20250516.1 + 0.11.5-alpha.25266.1 \ No newline at end of file diff --git a/src/cecil/eng/Version.Details.xml b/src/cecil/eng/Version.Details.xml index 29f8b749402..2e677a36e50 100644 --- a/src/cecil/eng/Version.Details.xml +++ b/src/cecil/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + - + https://github.com/dotnet/dotnet - 85778473549347b3e4bad3ea009e9438df7b11bb + 094631c46bc1d3cf5f3749e57bb584671f9e10f3 diff --git a/src/cecil/eng/common/build.sh b/src/cecil/eng/common/build.sh index 36fba82a379..08f99154b7d 100755 --- a/src/cecil/eng/common/build.sh +++ b/src/cecil/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 diff --git a/src/cecil/eng/common/core-templates/steps/source-build.yml b/src/cecil/eng/common/core-templates/steps/source-build.yml index f2a0f347fdd..0dde553c3eb 100644 --- a/src/cecil/eng/common/core-templates/steps/source-build.yml +++ b/src/cecil/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/src/cecil/eng/common/darc-init.sh b/src/cecil/eng/common/darc-init.sh index 36dbd45e1ce..e889f439b8d 100755 --- a/src/cecil/eng/common/darc-init.sh +++ b/src/cecil/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/src/cecil/eng/common/tools.ps1 b/src/cecil/eng/common/tools.ps1 index 7373e530546..5f40a3f8238 100644 --- a/src/cecil/eng/common/tools.ps1 +++ b/src/cecil/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/src/cecil/eng/common/tools.sh b/src/cecil/eng/common/tools.sh index cc007b1f15a..25f5932eee9 100755 --- a/src/cecil/eng/common/tools.sh +++ b/src/cecil/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/src/cecil/global.json b/src/cecil/global.json index 18ddac93379..bb8d1ea6767 100644 --- a/src/cecil/global.json +++ b/src/cecil/global.json @@ -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" } } diff --git a/src/source-manifest.json b/src/source-manifest.json index 5815c2972e3..a9a4518201c 100644 --- a/src/source-manifest.json +++ b/src/source-manifest.json @@ -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",