Skip to content

Commit 3c73d4d

Browse files
hoyosjshoyosjs
authored
[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)
1 parent 37193fd commit 3c73d4d

5 files changed

Lines changed: 111 additions & 77 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -54,77 +54,77 @@
5454
</Dependency>
5555
</ProductDependencies>
5656
<ToolsetDependencies>
57-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
57+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
59+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
61+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
63+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
65+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
67+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
69+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
71+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
73+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
75+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
77+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
79+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
81+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
83+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
87+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
91+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
95+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
97+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
99+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
101+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
103+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
105+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
107+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
109+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
111+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
113+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
115+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
117+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
119+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
121+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
123+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
125+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
127+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
128128
</Dependency>
129129
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
130130
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -250,9 +250,9 @@
250250
<Uri>https://github.com/dotnet/xharness</Uri>
251251
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
252252
</Dependency>
253-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
253+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
254254
<Uri>https://github.com/dotnet/arcade</Uri>
255-
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
255+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
256256
</Dependency>
257257
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
258258
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,22 @@
5454
<!-- SDK dependencies -->
5555
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
5656
<!-- Arcade dependencies -->
57-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
58-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
59-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
60-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
61-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
62-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
63-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
64-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
65-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
66-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
67-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
68-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
69-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
70-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
71-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
72-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
57+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
58+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
59+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
60+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
61+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
62+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
63+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
64+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
65+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
66+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
67+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
68+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
69+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
70+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
71+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
72+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
7373
<!-- NuGet dependencies -->
7474
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7575
<!-- Installer dependencies -->

‎eng/common/sdl/sdl.ps1‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
function Install-Gdn {
3+
param(
4+
[string]$Path,
5+
6+
# If omitted, install the latest version of Guardian, otherwise install that specific version.
7+
[string]$Version
8+
)
9+
10+
$ErrorActionPreference = 'Stop'
11+
Set-StrictMode -Version 2.0
12+
$disableConfigureToolsetImport = $true
13+
$global:LASTEXITCODE = 0
14+
15+
# `tools.ps1` checks $ci to perform some actions. Since the SDL
16+
# scripts don't necessarily execute in the same agent that run the
17+
# build.ps1/sh script this variable isn't automatically set.
18+
$ci = $true
19+
. $PSScriptRoot\..\tools.ps1
20+
21+
$argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache")
22+
23+
if ($Version) {
24+
$argumentList += "-Version $Version"
25+
}
26+
27+
Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
28+
29+
$gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path
30+
31+
if (!$gdnCliPath)
32+
{
33+
Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian'
34+
}
35+
36+
return $gdnCliPath.FullName
37+
}

‎eng/common/templates/steps/execute-sdl.yml‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,26 @@ parameters:
88
condition: ''
99

1010
steps:
11-
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
12-
- powershell: |
13-
$content = Get-Content $(GuardianPackagesConfigFile)
14-
15-
Write-Host "packages.config content was:`n$content"
16-
17-
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
18-
$content | Set-Content $(GuardianPackagesConfigFile)
19-
20-
Write-Host "packages.config content updated to:`n$content"
21-
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
11+
- task: NuGetAuthenticate@1
12+
inputs:
13+
nuGetServiceConnections: GuardianConnect
2214

2315
- task: NuGetToolInstaller@1
2416
displayName: 'Install NuGet.exe'
2517

26-
- task: NuGetCommand@2
27-
displayName: 'Install Guardian'
28-
inputs:
29-
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
30-
feedsToUse: config
31-
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
32-
externalFeedCredentials: GuardianConnect
33-
restoreDirectory: $(Build.SourcesDirectory)\.packages
18+
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
19+
- pwsh: |
20+
. $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1
21+
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }}
22+
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
23+
displayName: Install Guardian (Overridden)
24+
25+
- ${{ if eq(parameters.overrideGuardianVersion, '') }}:
26+
- pwsh: |
27+
. $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1
28+
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts
29+
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
30+
displayName: Install Guardian
3431
3532
- ${{ if ne(parameters.overrideParameters, '') }}:
3633
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
@@ -40,7 +37,7 @@ steps:
4037

4138
- ${{ if eq(parameters.overrideParameters, '') }}:
4239
- powershell: ${{ parameters.executeAllSdlToolsScript }}
43-
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
40+
-GuardianCliLocation $(GuardianCliLocation)
4441
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
4542
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
4643
${{ parameters.additionalParameters }}

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "7.0.100-preview.7.22377.5"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
12-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
12+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22418.4",
1414
"Microsoft.Build.NoTargets": "3.5.0",
1515
"Microsoft.Build.Traversal": "3.1.6",
1616
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"

0 commit comments

Comments
 (0)