Skip to content

Commit c284ce8

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20221114.9 (#29125)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.22517.1 -> To Version 6.0.0-beta.22564.9 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent e3b45b9 commit c284ce8

File tree

8 files changed

+98
-42
lines changed

8 files changed

+98
-42
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,16 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7-
<add key="darc-int-dotnet-aspnetcore-617d594" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-617d594f/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-aspnetcore -->
98
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
109
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1110
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1211
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1312
<!-- Begin: Package sources from dotnet-runtime -->
14-
<add key="darc-int-dotnet-runtime-943474c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-943474ca/nuget/v3/index.json" />
1513
<!-- End: Package sources from dotnet-runtime -->
1614
<!-- Begin: Package sources from dotnet-templating -->
17-
<add key="darc-int-dotnet-templating-84fa040" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-84fa0403/nuget/v3/index.json" />
1815
<!-- End: Package sources from dotnet-templating -->
1916
<!-- Begin: Package sources from dotnet-windowsdesktop -->
20-
<add key="darc-int-dotnet-windowsdesktop-ee26d5b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ee26d5bd/nuget/v3/index.json" />
2117
<!-- End: Package sources from dotnet-windowsdesktop -->
2218
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2319
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -37,16 +33,12 @@
3733
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3834
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3935
<!-- Begin: Package sources from dotnet-templating -->
40-
<add key="darc-int-dotnet-templating-84fa040" value="true" />
4136
<!-- End: Package sources from dotnet-templating -->
4237
<!-- Begin: Package sources from dotnet-aspnetcore -->
43-
<add key="darc-int-dotnet-aspnetcore-617d594" value="true" />
4438
<!-- End: Package sources from dotnet-aspnetcore -->
4539
<!-- Begin: Package sources from dotnet-runtime -->
46-
<add key="darc-int-dotnet-runtime-943474c" value="true" />
4740
<!-- End: Package sources from dotnet-runtime -->
4841
<!-- Begin: Package sources from dotnet-windowsdesktop -->
49-
<add key="darc-int-dotnet-windowsdesktop-ee26d5b" value="true" />
5042
<!-- End: Package sources from dotnet-windowsdesktop -->
5143
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5244
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,22 +287,22 @@
287287
</Dependency>
288288
</ProductDependencies>
289289
<ToolsetDependencies>
290-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22517.1">
290+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22564.9">
291291
<Uri>https://github.com/dotnet/arcade</Uri>
292-
<Sha>afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6</Sha>
292+
<Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
293293
<SourceBuild RepoName="arcade" ManagedOnly="true" />
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22517.1">
295+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22564.9">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6</Sha>
297+
<Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.22517.1">
299+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.22564.9">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6</Sha>
301+
<Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22517.1">
303+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22564.9">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6</Sha>
305+
<Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
306306
</Dependency>
307307
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
308308
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<NewtonsoftJsonVersion>$(NewtonsoftJsonPackageVersion)</NewtonsoftJsonVersion>
2929
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3030
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
31-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.22517.1</MicrosoftDotNetSignToolVersion>
31+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.22564.9</MicrosoftDotNetSignToolVersion>
3232
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3333
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
3434
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -168,7 +168,7 @@
168168
<PropertyGroup>
169169
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
170170
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
171-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22517.1</MicrosoftDotNetXUnitExtensionsVersion>
171+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22564.9</MicrosoftDotNetXUnitExtensionsVersion>
172172
<MoqPackageVersion>4.8.2</MoqPackageVersion>
173173
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
174174
</PropertyGroup>

‎eng/common/dotnet-install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ done
5252
# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
5353
cpuname=$(uname -m)
5454
case $cpuname in
55-
aarch64)
55+
arm64|aarch64)
5656
buildarch=arm64
5757
;;
5858
amd64|x86_64)
@@ -61,7 +61,7 @@ case $cpuname in
6161
armv*l)
6262
buildarch=arm
6363
;;
64-
i686)
64+
i[3-6]86)
6565
buildarch=x86
6666
;;
6767
*)

‎eng/common/sdl/sdl.ps1‎

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

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

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,28 @@ 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+
Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl
21+
. .\sdl.ps1
22+
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }}
23+
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
24+
displayName: Install Guardian (Overridden)
25+
26+
- ${{ if eq(parameters.overrideGuardianVersion, '') }}:
27+
- pwsh: |
28+
Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl
29+
. .\sdl.ps1
30+
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts
31+
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
32+
displayName: Install Guardian
3433
3534
- ${{ if ne(parameters.overrideParameters, '') }}:
3635
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
@@ -40,7 +39,7 @@ steps:
4039

4140
- ${{ if eq(parameters.overrideParameters, '') }}:
4241
- powershell: ${{ parameters.executeAllSdlToolsScript }}
43-
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
42+
-GuardianCliLocation $(GuardianCliLocation)
4443
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
4544
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
4645
${{ parameters.additionalParameters }}
@@ -62,7 +61,28 @@ steps:
6261
c
6362
i
6463
condition: succeededOrFailed()
64+
6565
- publish: $(Agent.BuildDirectory)/.gdn
6666
artifact: GuardianConfiguration
6767
displayName: Publish GuardianConfiguration
68+
condition: succeededOrFailed()
69+
70+
# Publish the SARIF files in a container named CodeAnalysisLogs to enable integration
71+
# with the "SARIF SAST Scans Tab" Azure DevOps extension
72+
- task: CopyFiles@2
73+
displayName: Copy SARIF files
74+
inputs:
75+
flattenFolders: true
76+
sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/
77+
contents: '**/*.sarif'
78+
targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs
79+
condition: succeededOrFailed()
80+
81+
# Use PublishBuildArtifacts because the SARIF extension only checks this case
82+
# see microsoft/sarif-azuredevops-extension#4
83+
- task: PublishBuildArtifacts@1
84+
displayName: Publish SARIF files to CodeAnalysisLogs container
85+
inputs:
86+
pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs
87+
artifactName: CodeAnalysisLogs
6888
condition: succeededOrFailed()

‎eng/common/templates/steps/source-build.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ steps:
6363
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
6464
fi
6565
66+
runtimeOsArgs=
67+
if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
68+
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
69+
fi
70+
6671
publishArgs=
6772
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
6873
publishArgs='--publish'
@@ -75,6 +80,7 @@ steps:
7580
$internalRuntimeDownloadArgs \
7681
$internalRestoreArgs \
7782
$targetRidArgs \
83+
$runtimeOsArgs \
7884
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
7985
/p:ArcadeBuildFromSource=true
8086
displayName: Build

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22517.1",
15-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22517.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22564.9",
15+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22564.9"
1616
}
1717
}

0 commit comments

Comments
 (0)