[release/6.0] Update dependencies from dotnet/emsdk dotnet/arcade #78062
Update dependencies from https://github.com/dotnet/arcade build 20221…
…108.2 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2
- Loading branch information
commit 583fa6ba67bc591d73c12f1980158e43c9e802c4
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
|
|
||
| function Install-Gdn { | ||
| param( | ||
| [Parameter(Mandatory=$true)] | ||
| [string]$Path, | ||
|
|
||
| # If omitted, install the latest version of Guardian, otherwise install that specific version. | ||
| [string]$Version | ||
| ) | ||
|
|
||
| $ErrorActionPreference = 'Stop' | ||
| Set-StrictMode -Version 2.0 | ||
| $disableConfigureToolsetImport = $true | ||
| $global:LASTEXITCODE = 0 | ||
|
|
||
| # `tools.ps1` checks $ci to perform some actions. Since the SDL | ||
| # scripts don't necessarily execute in the same agent that run the | ||
| # build.ps1/sh script this variable isn't automatically set. | ||
| $ci = $true | ||
| . $PSScriptRoot\..\tools.ps1 | ||
|
|
||
| $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") | ||
|
|
||
| if ($Version) { | ||
| $argumentList += "-Version $Version" | ||
| } | ||
|
|
||
| Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait | ||
|
|
||
| $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path | ||
|
|
||
| if (!$gdnCliPath) | ||
| { | ||
| Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' | ||
| } | ||
|
|
||
| return $gdnCliPath.FullName | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@carlossanlop this is likely the change that causes the source build leg to fail
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So are you suggesting we revert this code removal?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Responded offline. I'm just saying that this PR could be related to the Banana Source Build break, and you want to hold off merging it until you understand the break. A binlog should tell.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, this can't be reverted. It will get moved in a subsequent PR. This is a common script file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change: 552fcf0 is the issue.
Basically, this change to the template must go into arcade.
/cc @ayakael
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think for now a PR can be opened in arcade, and this change reverted in this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I reverted the source-build.yml change in this PR to unblock it.
@ayakael please submit your template change to the arcade repo directly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copy, it's here: dotnet/arcade#11604
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ugh, the maestro bot brought these removals back, causing the banana RID failure happened in the last run.
I'll merge the PR with that known failure, and will submit a separate PR to get the lines restored. I don't want to restart the CI just for this.