Skip to content

Commit 1634b13

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5657)
[main] Update dependencies from dotnet/arcade
1 parent 1985f3c commit 1634b13

File tree

13 files changed

+167
-80
lines changed

13 files changed

+167
-80
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24476.2">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24557.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>7e8b8f4f321c8671aa01b53567d31aaa4950706f</Sha>
9+
<Sha>39290b60a9015b444a1762d67e26f0f187eb5cc2</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24476.2">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24557.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>7e8b8f4f321c8671aa01b53567d31aaa4950706f</Sha>
13+
<Sha>39290b60a9015b444a1762d67e26f0f187eb5cc2</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24476.2">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24557.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>7e8b8f4f321c8671aa01b53567d31aaa4950706f</Sha>
17+
<Sha>39290b60a9015b444a1762d67e26f0f187eb5cc2</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24557.1</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24557.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

‎eng/common/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ function Build {
231231
/p:Restore=$restore \
232232
/p:Build=$build \
233233
/p:DotNetBuildRepo=$product_build \
234-
/p:ArcadeBuildFromSource=$source_build \
235234
/p:DotNetBuildSourceOnly=$source_build \
236235
/p:Rebuild=$rebuild \
237236
/p:Test=$test \

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

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -128,33 +128,11 @@ jobs:
128128
- ${{ preStep }}
129129

130130
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
131-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
132-
- task: MicroBuildSigningPlugin@4
133-
displayName: Install MicroBuild plugin
134-
inputs:
135-
signType: $(_SignType)
136-
zipSources: false
137-
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138-
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
139-
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
140-
env:
141-
TeamName: $(_TeamName)
142-
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
143-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
131+
- template: /eng/common/core-templates/steps/install-microbuild.yml
132+
parameters:
133+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
134+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
144135
continueOnError: ${{ parameters.continueOnError }}
145-
condition: and(
146-
succeeded(),
147-
or(
148-
and(
149-
eq(variables['Agent.Os'], 'Windows_NT'),
150-
in(variables['_SignType'], 'real', 'test')
151-
),
152-
and(
153-
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
154-
ne(variables['Agent.Os'], 'Windows_NT'),
155-
eq(variables['_SignType'], 'real')
156-
)
157-
))
158136

159137
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
160138
- task: NuGetAuthenticate@1
@@ -183,26 +161,12 @@ jobs:
183161
- ${{ each step in parameters.componentGovernanceSteps }}:
184162
- ${{ step }}
185163

186-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
187-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
188-
- task: MicroBuildCleanup@1
189-
displayName: Execute Microbuild cleanup tasks
190-
condition: and(
191-
always(),
192-
or(
193-
and(
194-
eq(variables['Agent.Os'], 'Windows_NT'),
195-
in(variables['_SignType'], 'real', 'test')
196-
),
197-
and(
198-
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
199-
ne(variables['Agent.Os'], 'Windows_NT'),
200-
eq(variables['_SignType'], 'real')
201-
)
202-
))
164+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
165+
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
166+
parameters:
167+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
168+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
203169
continueOnError: ${{ parameters.continueOnError }}
204-
env:
205-
TeamName: $(_TeamName)
206170

207171
# Publish test results
208172
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:

‎eng/common/core-templates/steps/cleanup-microbuild.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
parameters:
2+
# Enable cleanup tasks for MicroBuild
3+
enableMicrobuild: false
4+
# Enable cleanup tasks for MicroBuild on Mac and Linux
5+
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
6+
enableMicrobuildForMacAndLinux: false
7+
continueOnError: false
8+
9+
steps:
10+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
11+
- task: MicroBuildCleanup@1
12+
displayName: Execute Microbuild cleanup tasks
13+
condition: and(
14+
always(),
15+
or(
16+
and(
17+
eq(variables['Agent.Os'], 'Windows_NT'),
18+
in(variables['_SignType'], 'real', 'test')
19+
),
20+
and(
21+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
22+
ne(variables['Agent.Os'], 'Windows_NT'),
23+
eq(variables['_SignType'], 'real')
24+
)
25+
))
26+
continueOnError: ${{ parameters.continueOnError }}
27+
env:
28+
TeamName: $(_TeamName)

‎eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
parameters:
2+
# Enable cleanup tasks for MicroBuild
3+
enableMicrobuild: false
4+
# Enable cleanup tasks for MicroBuild on Mac and Linux
5+
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
6+
enableMicrobuildForMacAndLinux: false
7+
continueOnError: false
8+
9+
steps:
10+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
11+
# Remove Python downgrade with https://github.com/dotnet/arcade/issues/15151
12+
- ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
13+
- task: UsePythonVersion@0
14+
displayName: 'Use Python 3.11.x'
15+
inputs:
16+
versionSpec: '3.11.x'
17+
18+
- task: MicroBuildSigningPlugin@4
19+
displayName: Install MicroBuild plugin
20+
inputs:
21+
signType: $(_SignType)
22+
zipSources: false
23+
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
24+
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
25+
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
26+
env:
27+
TeamName: $(_TeamName)
28+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
29+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
30+
continueOnError: ${{ parameters.continueOnError }}
31+
condition: and(
32+
succeeded(),
33+
or(
34+
and(
35+
eq(variables['Agent.Os'], 'Windows_NT'),
36+
in(variables['_SignType'], 'real', 'test')
37+
),
38+
and(
39+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
40+
ne(variables['Agent.Os'], 'Windows_NT'),
41+
eq(variables['_SignType'], 'real')
42+
)
43+
))

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ steps:
8686
$runtimeOsArgs \
8787
$baseOsArgs \
8888
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
89-
/p:ArcadeBuildFromSource=true \
9089
/p:DotNetBuildSourceOnly=true \
9190
/p:DotNetBuildRepo=true \
9291
/p:AssetManifestFileName=$assetManifestFileName

‎eng/common/native/install-dependencies.sh

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#!/bin/sh
2+
3+
set -e
4+
5+
# This is a simple script primarily used for CI to install necessary dependencies
6+
#
7+
# Usage:
8+
#
9+
# ./install-dependencies.sh <OS>
10+
11+
os="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
12+
13+
if [ -z "$os" ]; then
14+
. "$(dirname "$0")"/init-os-and-arch.sh
15+
fi
16+
17+
case "$os" in
18+
linux)
19+
if [ -e /etc/os-release ]; then
20+
. /etc/os-release
21+
fi
22+
23+
if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then
24+
apt update
25+
26+
apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
27+
libssl-dev libkrb5-dev zlib1g-dev pigz
28+
29+
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
30+
elif [ "$ID" = "fedora" ]; then
31+
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz
32+
elif [ "$ID" = "alpine" ]; then
33+
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz
34+
else
35+
echo "Unsupported distro. distro: $ID"
36+
exit 1
37+
fi
38+
;;
39+
40+
osx|maccatalyst|ios|iossimulator|tvos|tvossimulator)
41+
echo "Installed xcode version: $(xcode-select -p)"
42+
43+
export HOMEBREW_NO_INSTALL_CLEANUP=1
44+
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
45+
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
46+
# brew update --preinstall
47+
brew bundle --no-upgrade --no-lock --file=- <<EOF
48+
brew "cmake"
49+
brew "icu4c"
50+
brew "openssl@3"
51+
brew "pkg-config"
52+
brew "python3"
53+
brew "pigz"
54+
EOF
55+
;;
56+
57+
*)
58+
echo "Unsupported platform. OS: $os"
59+
exit 1
60+
;;
61+
esac

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
# Sbom related params
33
enableSbom: true
4+
runAsPublic: false
45
PackageVersion: 9.0.0
56
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
67

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ parameters:
44
componentGovernanceIgnoreDirectories: ''
55
# Sbom related params
66
enableSbom: true
7+
runAsPublic: false
78
PackageVersion: 9.0.0
89
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
910

0 commit comments

Comments
 (0)