Skip to content

Commit 18ddb76

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20241010.1 (dotnet#2627)
[main] Update dependencies from dotnet/arcade
1 parent 16309d7 commit 18ddb76

File tree

6 files changed

+91
-56
lines changed

6 files changed

+91
-56
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24504.4">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24510.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
8+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24504.4">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24510.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
12+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24504.4">
14+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24510.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
16+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
1616
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
1717
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
18-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24504.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
18+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24510.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
1919
</PropertyGroup>
2020
</Project>

‎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+
))

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-rc.1.24452.12"
3+
"version": "9.0.100-rc.2.24474.11"
44
},
55
"tools": {
6-
"dotnet": "9.0.100-rc.1.24452.12",
6+
"dotnet": "9.0.100-rc.2.24474.11",
77
"runtimes": {
88
"dotnet": [
99
"6.0.33",
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24504.4",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24504.4"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.1",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24510.1"
2323
}
2424
}

0 commit comments

Comments
 (0)