Skip to content

Commit 5268dc8

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240417.1 (dotnet#101178)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24212.4 -> To Version 9.0.0-beta.24217.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5c9f64c commit 5268dc8

File tree

8 files changed

+68
-68
lines changed

8 files changed

+68
-68
lines changed

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -92,87 +92,87 @@
9292
</Dependency>
9393
</ProductDependencies>
9494
<ToolsetDependencies>
95-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24212.4">
95+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24217.1">
9696
<Uri>https://github.com/dotnet/arcade</Uri>
97-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
97+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
9898
</Dependency>
9999
<!-- Intermediate is necessary for source build. -->
100-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24212.4">
100+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24217.1">
101101
<Uri>https://github.com/dotnet/arcade</Uri>
102-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
102+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
103103
<SourceBuild RepoName="arcade" ManagedOnly="true" />
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24212.4">
105+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24217.1">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
107+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24212.4">
109+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24217.1">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
111+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24212.4">
113+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24217.1">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
115+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24212.4">
117+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24217.1">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
119+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24212.4">
121+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24217.1">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
123+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24212.4">
125+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24217.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
127+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24212.4">
129+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24217.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
131+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24212.4">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24217.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
135+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24212.4">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24217.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
139+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24212.4">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24217.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
143+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24212.4">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24217.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
147+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24212.4">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24217.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
151+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24212.4">
153+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24217.1">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
155+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24212.4">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24217.1">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
159+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
161+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24217.1">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
163+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24212.4">
165+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24217.1">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
167+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24212.4">
169+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24217.1">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
171+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24212.4">
173+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24217.1">
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
175+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
176176
</Dependency>
177177
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24215.1">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -332,9 +332,9 @@
332332
<Uri>https://github.com/dotnet/xharness</Uri>
333333
<Sha>50b43ece7daf9f8a88ac16a95a4f8647a4c71c4b</Sha>
334334
</Dependency>
335-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24212.4">
335+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24217.1">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
337-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
337+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
338338
</Dependency>
339339
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24106.4">
340340
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@
8383
<!-- SDK dependencies -->
8484
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.4.24215.1</MicrosoftDotNetApiCompatTaskVersion>
8585
<!-- Arcade dependencies -->
86-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksFeedVersion>
87-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24212.4</MicrosoftDotNetCodeAnalysisVersion>
88-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24212.4</MicrosoftDotNetGenAPIVersion>
89-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24212.4</MicrosoftDotNetGenFacadesVersion>
90-
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24212.4</MicrosoftDotNetXUnitAssertVersion>
91-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24212.4</MicrosoftDotNetXUnitExtensionsVersion>
92-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24212.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
93-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksArchivesVersion>
94-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksInstallersVersion>
95-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksPackagingVersion>
96-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
98-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24212.4</MicrosoftDotNetRemoteExecutorVersion>
100-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24212.4</MicrosoftDotNetVersionToolsTasksVersion>
101-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24212.4</MicrosoftDotNetPackageTestingVersion>
86+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksFeedVersion>
87+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24217.1</MicrosoftDotNetCodeAnalysisVersion>
88+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24217.1</MicrosoftDotNetGenAPIVersion>
89+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24217.1</MicrosoftDotNetGenFacadesVersion>
90+
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24217.1</MicrosoftDotNetXUnitAssertVersion>
91+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24217.1</MicrosoftDotNetXUnitExtensionsVersion>
92+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24217.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
93+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksArchivesVersion>
94+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksInstallersVersion>
95+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksPackagingVersion>
96+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksTemplatingVersion>
98+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24217.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24217.1</MicrosoftDotNetRemoteExecutorVersion>
100+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24217.1</MicrosoftDotNetVersionToolsTasksVersion>
101+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24217.1</MicrosoftDotNetPackageTestingVersion>
102102
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
103103
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
104104
<!-- NuGet dependencies -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
- task: 1ES.PublishPipelineArtifact@1
211211
inputs:
212212
targetPath: 'artifacts/log'
213-
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
213+
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }}
214214
displayName: 'Publish logs'
215215
continueOnError: true
216216
condition: always()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# If it's not devdiv, it's dnceng
5757
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5858
name: $(DncEngInternalBuildPool)
59-
image: 1es-windows-2022-pt
59+
image: 1es-windows-2022
6060
os: windows
6161

6262
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5454
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
55-
image: 1es-mariner-2-pt
55+
image: 1es-mariner-2
5656
os: linux
5757

5858
${{ if ne(parameters.platform.pool, '') }}:

‎eng/common/templates-official/post-build/post-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ stages:
110110
# If it's not devdiv, it's dnceng
111111
${{ else }}:
112112
name: $(DncEngInternalBuildPool)
113-
image: 1es-windows-2022-pt
113+
image: 1es-windows-2022
114114
os: windows
115115

116116
steps:
@@ -150,7 +150,7 @@ stages:
150150
# If it's not devdiv, it's dnceng
151151
${{ else }}:
152152
name: $(DncEngInternalBuildPool)
153-
image: 1es-windows-2022-pt
153+
image: 1es-windows-2022
154154
os: windows
155155
steps:
156156
- template: setup-maestro-vars.yml
@@ -208,7 +208,7 @@ stages:
208208
# If it's not devdiv, it's dnceng
209209
${{ else }}:
210210
name: $(DncEngInternalBuildPool)
211-
image: 1es-windows-2022-pt
211+
image: 1es-windows-2022
212212
os: windows
213213
steps:
214214
- template: setup-maestro-vars.yml

‎eng/common/templates-official/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# image: 1es-windows-2022-pt
26+
# image: 1es-windows-2022
2727

2828
variables:
2929
# Coalesce the target and source branches so we know when a PR targets a release branch

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "9.0.100-preview.3.24204.13"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24212.4",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24212.4",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24217.1",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24217.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24217.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24215.1"

0 commit comments

Comments
 (0)