Skip to content

Commit 3e0db9e

Browse files
dotnet-maestro[bot]jonsequitur
dotnet-maestro[bot]
authored and
jonsequitur
committed
Update dependencies from https://github.com/dotnet/arcade build 20220211.10
Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22103.1 -> To Version 7.0.0-beta.22111.10
1 parent 83402ea commit 3e0db9e

10 files changed

+129
-5
lines changed

‎eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22103.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22111.10">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
8+
<Sha>ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>

‎eng/common/cross/build-rootfs.sh

+9
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,15 @@ while :; do
120120
__UbuntuRepo="http://ftp.debian.org/debian/"
121121
__CodeName=jessie
122122
;;
123+
ppc64le)
124+
__BuildArch=ppc64le
125+
__UbuntuArch=ppc64el
126+
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
127+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
128+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
129+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
130+
unset __LLDB_Package
131+
;;
123132
s390x)
124133
__BuildArch=s390x
125134
__UbuntuArch=s390x

‎eng/common/cross/ppc64le/sources.list.bionic

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse

‎eng/common/cross/toolchain.cmake

+5-2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
5454
if(TIZEN)
5555
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
5656
endif()
57+
elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
58+
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
59+
set(TOOLCHAIN "powerpc64le-linux-gnu")
5760
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
5861
set(CMAKE_SYSTEM_PROCESSOR s390x)
5962
set(TOOLCHAIN "s390x-linux-gnu")
@@ -67,7 +70,7 @@ elseif (ILLUMOS)
6770
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
6871
set(TOOLCHAIN "x86_64-illumos")
6972
else()
70-
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, s390x and x86 are supported!")
73+
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, ppc64le, s390x and x86 are supported!")
7174
endif()
7275

7376
if(DEFINED ENV{TOOLCHAIN})
@@ -201,7 +204,7 @@ endif()
201204

202205
# Specify compile options
203206

204-
if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS)
207+
if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID) OR ILLUMOS)
205208
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
206209
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
207210
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

‎eng/common/generate-sbom-prep.ps1

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Param(
2+
[Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
3+
)
4+
5+
Write-Host "Creating dir $ManifestDirPath"
6+
# create directory for sbom manifest to be placed
7+
if (!(Test-Path -path $ManifestDirPath))
8+
{
9+
New-Item -ItemType Directory -path $ManifestDirPath
10+
Write-Host "Successfully created directory $ManifestDirPath"
11+
}
12+
else{
13+
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
14+
}
15+
16+
Write-Host "Updating artifact name"
17+
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
18+
Write-Host "Artifact name $artifact_name"
19+
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"

‎eng/common/generate-sbom-prep.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
3+
source="${BASH_SOURCE[0]}"
4+
5+
manifest_dir=$1
6+
7+
if [ ! -d "$manifest_dir" ] ; then
8+
mkdir -p "$manifest_dir"
9+
echo "Sbom directory created." $manifest_dir
10+
else
11+
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
12+
fi
13+
14+
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
15+
echo "Artifact name before : "$artifact_name
16+
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
17+
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
18+
echo "Artifact name after : "$safe_artifact_name
19+
export ARTIFACT_NAME=$safe_artifact_name
20+
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
21+
22+
exit 0

‎eng/common/templates/job/job.yml

+11
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ parameters:
3131
name: ''
3232
preSteps: []
3333
runAsPublic: false
34+
# Sbom related params
35+
enableSbom: true
36+
PackageVersion: 7.0.0
37+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
3438

3539
jobs:
3640
- job: ${{ parameters.name }}
@@ -248,3 +252,10 @@ jobs:
248252
ArtifactName: AssetManifests
249253
continueOnError: ${{ parameters.continueOnError }}
250254
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
255+
256+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
257+
- template: /eng/common/templates/steps/generate-sbom.yml
258+
parameters:
259+
PackageVersion: ${{ parameters.packageVersion}}
260+
BuildDropPath: ${{ parameters.buildDropPath }}
261+

‎eng/common/templates/jobs/jobs.yml

+5
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ parameters:
4141
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4242
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
4343

44+
# Sbom related params
45+
enableSbom: true
46+
PackageVersion: 7.0.0
47+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
48+
4449
jobs:
4550
- ${{ each job in parameters.jobs }}:
4651
- template: ../job/job.yml

‎eng/common/templates/steps/generate-sbom.yml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
2+
# PackageName - The name of the package this SBOM represents.
3+
# PackageVersion - The version of the package this SBOM represents.
4+
# ManifestDirPath - The path of the directory where the generated manifest files will be placed
5+
6+
parameters:
7+
PackageVersion: 7.0.0
8+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
9+
PackageName: '.NET'
10+
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
11+
sbomContinueOnError: true
12+
13+
steps:
14+
- task: PowerShell@2
15+
displayName: Prep for SBOM generation in (Non-linux)
16+
condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
17+
inputs:
18+
filePath: ./eng/common/generate-sbom-prep.ps1
19+
arguments: ${{parameters.manifestDirPath}}
20+
21+
# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
22+
- script: |
23+
chmod +x ./eng/common/generate-sbom-prep.sh
24+
./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
25+
displayName: Prep for SBOM generation in (Linux)
26+
condition: eq(variables['Agent.Os'], 'Linux')
27+
continueOnError: ${{ parameters.sbomContinueOnError }}
28+
29+
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
30+
displayName: 'Generate SBOM manifest'
31+
continueOnError: ${{ parameters.sbomContinueOnError }}
32+
inputs:
33+
PackageName: ${{ parameters.packageName }}
34+
BuildDropPath: ${{ parameters.buildDropPath }}
35+
PackageVersion: ${{ parameters.packageVersion }}
36+
ManifestDirPath: ${{ parameters.manifestDirPath }}
37+
38+
- task: PublishPipelineArtifact@1
39+
displayName: Publish SBOM manifest
40+
continueOnError: ${{parameters.sbomContinueOnError}}
41+
inputs:
42+
targetPath: '${{parameters.manifestDirPath}}'
43+
artifactName: $(ARTIFACT_NAME)
44+

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"xcopy-msbuild": "16.10.0-preview2"
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1"
12+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22111.10"
1313
}
1414
}

0 commit comments

Comments
 (0)