Skip to content

Commit 5f5dc14

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20241010.1 (#58343)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24510.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5926039 commit 5f5dc14

File tree

6 files changed

+98
-63
lines changed

6 files changed

+98
-63
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -388,31 +388,31 @@
388388
<Uri>https://github.com/dotnet/winforms</Uri>
389389
<Sha>efe6e112d821ad55a060f5c7e244c85a2478e9c3</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24504.4">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24510.1">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
393+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24504.4">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24510.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
398+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24504.4">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24510.1">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
403+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24504.4">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24510.1">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
407+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24504.4">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24510.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
411+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24504.4">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24510.1">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
415+
<Sha>380002a14775d7f68f098c7e6b7d1c3638bd4c5d</Sha>
416416
</Dependency>
417417
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.9.24503.1">
418418
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@
165165
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
166166
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
167167
<!-- Packages from dotnet/arcade -->
168-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksInstallersVersion>
169-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksTemplatingVersion>
170-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24504.4</MicrosoftDotNetRemoteExecutorVersion>
171-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24504.4</MicrosoftSourceBuildIntermediatearcadeVersion>
168+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24510.1</MicrosoftDotNetBuildTasksInstallersVersion>
169+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24510.1</MicrosoftDotNetBuildTasksTemplatingVersion>
170+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24510.1</MicrosoftDotNetRemoteExecutorVersion>
171+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24510.1</MicrosoftSourceBuildIntermediatearcadeVersion>
172172
<!-- Packages from dotnet/source-build-externals -->
173173
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.0-alpha.1.24502.3</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
174174
<!-- Packages from dotnet/source-build-reference-packages -->

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"jdk": "11"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24504.4",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24504.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.1",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24510.1"
3232
}
3333
}

0 commit comments

Comments
 (0)