Skip to content

Commit 309bca4

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#338)
[main] Update dependencies from dotnet/arcade
1 parent c19a7f8 commit 309bca4

File tree

9 files changed

+88
-22
lines changed

9 files changed

+88
-22
lines changed

‎eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24475.5">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24510.1">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
6+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
77
</Dependency>
88
<Dependency Name="Microsoft.DotNet.Arcade.Wpf.Sdk" Version="6.0.0-preview.5.21220.1">
99
<Uri>https://github.com/dotnet/wpf</Uri>

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

+10-18
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
enableMicrobuildForMacAndLinux: false
2223
enablePublishBuildArtifacts: false
2324
enablePublishBuildAssets: false
2425
enablePublishTestResults: false
@@ -127,18 +128,11 @@ jobs:
127128
- ${{ preStep }}
128129

129130
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
130-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
131-
- task: MicroBuildSigningPlugin@4
132-
displayName: Install MicroBuild plugin
133-
inputs:
134-
signType: $(_SignType)
135-
zipSources: false
136-
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137-
env:
138-
TeamName: $(_TeamName)
139-
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
131+
- template: /eng/common/core-templates/steps/install-microbuild.yml
132+
parameters:
133+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
134+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
140135
continueOnError: ${{ parameters.continueOnError }}
141-
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
142136

143137
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
144138
- task: NuGetAuthenticate@1
@@ -167,14 +161,12 @@ jobs:
167161
- ${{ each step in parameters.componentGovernanceSteps }}:
168162
- ${{ step }}
169163

170-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
171-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
172-
- task: MicroBuildCleanup@1
173-
displayName: Execute Microbuild cleanup tasks
174-
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
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 }}
175169
continueOnError: ${{ parameters.continueOnError }}
176-
env:
177-
TeamName: $(_TeamName)
178170

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

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

+28
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

+43
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/cross/build-rootfs.sh

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ __UbuntuPackages+=" libcurl4-openssl-dev"
6666
__UbuntuPackages+=" libkrb5-dev"
6767
__UbuntuPackages+=" libssl-dev"
6868
__UbuntuPackages+=" zlib1g-dev"
69+
__UbuntuPackages+=" libbrotli-dev"
6970

7071
__AlpinePackages+=" curl-dev"
7172
__AlpinePackages+=" krb5-dev"

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

+1
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

+1
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

‎eng/common/tools.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ function IsWindowsPlatform() {
900900
}
901901

902902
function Get-Darc($version) {
903-
$darcPath = "$TempDir\darc\$(New-Guid)"
903+
$darcPath = "$TempDir\darc\$([guid]::NewGuid())"
904904
if ($version -ne $null) {
905905
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
906906
} else {

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24475.5",
15+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.1",
1616
"Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6",
1717
"Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7"
1818
},

0 commit comments

Comments
 (0)