Skip to content

Commit 30a7c4f

Browse files
[main] Update dependencies from dotnet/arcade (#101234)
* Update dependencies from https://github.com/dotnet/arcade build 20240417.5 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.24217.1 -> To Version 9.0.0-beta.24217.5 * Update dependencies from https://github.com/dotnet/arcade build 20240419.1 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.24217.1 -> To Version 9.0.0-beta.24219.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5661009 commit 30a7c4f

File tree

5 files changed

+62
-72
lines changed

5 files changed

+62
-72
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.24217.1">
95+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.1">
9696
<Uri>https://github.com/dotnet/arcade</Uri>
97-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
97+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
9898
</Dependency>
9999
<!-- Intermediate is necessary for source build. -->
100-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24217.1">
100+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.1">
101101
<Uri>https://github.com/dotnet/arcade</Uri>
102-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
102+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
103103
<SourceBuild RepoName="arcade" ManagedOnly="true" />
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24217.1">
105+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24219.1">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
107+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24217.1">
109+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24219.1">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
111+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24217.1">
113+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24219.1">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
115+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24217.1">
117+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24219.1">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
119+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24217.1">
121+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24219.1">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
123+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24217.1">
125+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24219.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
127+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24217.1">
129+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24219.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
131+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24217.1">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24219.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
135+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24217.1">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24219.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
139+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24217.1">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
143+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24217.1">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24219.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
147+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24217.1">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24219.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
151+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24217.1">
153+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24219.1">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
155+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24217.1">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24219.1">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
159+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24217.1">
161+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24219.1">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
163+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24217.1">
165+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24219.1">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
167+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24217.1">
169+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24219.1">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
171+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24217.1">
173+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24219.1">
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
175+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</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.24217.1">
335+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24219.1">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
337-
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
337+
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</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.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>
86+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksFeedVersion>
87+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24219.1</MicrosoftDotNetCodeAnalysisVersion>
88+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24219.1</MicrosoftDotNetGenAPIVersion>
89+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24219.1</MicrosoftDotNetGenFacadesVersion>
90+
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24219.1</MicrosoftDotNetXUnitAssertVersion>
91+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24219.1</MicrosoftDotNetXUnitExtensionsVersion>
92+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24219.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
93+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksArchivesVersion>
94+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksInstallersVersion>
95+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksPackagingVersion>
96+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksTemplatingVersion>
98+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24219.1</MicrosoftDotNetRemoteExecutorVersion>
100+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24219.1</MicrosoftDotNetVersionToolsTasksVersion>
101+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24219.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/build.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Param(
1919
[switch] $pack,
2020
[switch] $publish,
2121
[switch] $clean,
22-
[switch] $verticalBuild,
2322
[switch][Alias('pb')]$productBuild,
2423
[switch][Alias('bl')]$binaryLog,
2524
[switch][Alias('nobl')]$excludeCIBinarylog,
@@ -60,7 +59,6 @@ function Print-Usage() {
6059
Write-Host " -sign Sign build outputs"
6160
Write-Host " -publish Publish artifacts (e.g. symbols)"
6261
Write-Host " -clean Clean the solution"
63-
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
6462
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
6563
Write-Host ""
6664

@@ -124,7 +122,7 @@ function Build {
124122
/p:Deploy=$deploy `
125123
/p:Test=$test `
126124
/p:Pack=$pack `
127-
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
125+
/p:DotNetBuildRepo=$productBuild `
128126
/p:IntegrationTest=$integrationTest `
129127
/p:PerformanceTest=$performanceTest `
130128
/p:Sign=$sign `

eng/common/build.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
6262
restore=false
6363
build=false
6464
source_build=false
65-
vertical_build=false
6665
product_build=false
6766
rebuild=false
6867
test=false
@@ -141,13 +140,6 @@ while [[ $# > 0 ]]; do
141140
restore=true
142141
pack=true
143142
;;
144-
-verticalbuild|-vb)
145-
build=true
146-
vertical_build=true
147-
product_build=true
148-
restore=true
149-
pack=true
150-
;;
151143
-test|-t)
152144
test=true
153145
;;

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.24217.1",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24217.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24217.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24219.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24219.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)