Skip to content

Commit 8507821

Browse files
marafmaraf
authored
Merge branch 'main' into fixwebcilex
2 parents 5b87cd4 + 9ff6bb8 commit 8507821

File tree

202 files changed

+8628
-8055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+8628
-8055
lines changed

‎Directory.Build.props

+4-6
Original file line numberDiff line numberDiff line change
@@ -397,12 +397,10 @@
397397
<PropertyGroup Condition="$(MSBuildProjectFullPath.Contains('$([System.IO.Path]::DirectorySeparatorChar)tests$([System.IO.Path]::DirectorySeparatorChar)'))">
398398
<IsTestProject Condition="$(MSBuildProjectName.EndsWith('.UnitTests')) or $(MSBuildProjectName.EndsWith('.Tests'))">true</IsTestProject>
399399
<IsTrimmingTestProject Condition="$(MSBuildProjectName.EndsWith('.TrimmingTests'))">true</IsTrimmingTestProject>
400-
<IsNativeAotTestProject Condition="$(MSBuildProjectName.EndsWith('.NativeAotTests'))">true</IsNativeAotTestProject>
401-
<IsPublishedAppTestProject Condition="'$(IsTrimmingTestProject)' == 'true' or '$(IsNativeAotTestProject)' == 'true'">true</IsPublishedAppTestProject>
402-
<IsTestSupportProject Condition="'$(IsTestProject)' != 'true' and '$(IsPublishedAppTestProject)' != 'true'">true</IsTestSupportProject>
400+
<IsTestSupportProject Condition="'$(IsTestProject)' != 'true' and '$(IsTrimmingTestProject)' != 'true'">true</IsTestSupportProject>
403401

404402
<!-- Treat test assemblies as non-shipping (do not publish or sign them). -->
405-
<IsShipping Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsPublishedAppTestProject)' == 'true'">false</IsShipping>
403+
<IsShipping Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsTrimmingTestProject)' == 'true'">false</IsShipping>
406404
</PropertyGroup>
407405

408406
<PropertyGroup>
@@ -413,7 +411,7 @@
413411
'$(IsReferenceAssemblyProject)' != 'true' and
414412
'$(IsGeneratorProject)' != 'true' and
415413
'$(IsTestProject)' != 'true' and
416-
'$(IsPublishedAppTestProject)' != 'true' and
414+
'$(IsTrimmingTestProject)' != 'true' and
417415
'$(IsTestSupportProject)' != 'true' and
418416
'$(UsingMicrosoftDotNetSharedFrameworkSdk)' != 'true' and
419417
'$(MSBuildProjectExtension)' != '.pkgproj' and
@@ -464,7 +462,7 @@
464462
</PropertyGroup>
465463

466464
<!-- Warnings that should be disabled in our test projects. -->
467-
<PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsPublishedAppTestProject)' == 'true'">
465+
<PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsTrimmingTestProject)' == 'true'">
468466
<!-- we need to re-enable BinaryFormatter within test projects since some tests exercise these code paths to ensure compat -->
469467
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
470468
<!-- don't warn on usage of BinaryFormatter or legacy serialization infrastructure from test projects -->

‎eng/Version.Details.xml

+50-50
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>
@@ -360,17 +360,17 @@
360360
<Uri>https://github.com/dotnet/runtime-assets</Uri>
361361
<Sha>30b6a8d9d3af5681e4caef1ea453619a4b0e9f2e</Sha>
362362
</Dependency>
363-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-1.24215.10">
363+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-1.24219.1">
364364
<Uri>https://github.com/dotnet/roslyn</Uri>
365-
<Sha>ca66296efa86bd8078508fe7b38b91b415364f78</Sha>
365+
<Sha>3027ed4a9186a6924722a1597c8d31a59d411f7c</Sha>
366366
</Dependency>
367-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-1.24215.10">
367+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-1.24219.1">
368368
<Uri>https://github.com/dotnet/roslyn</Uri>
369-
<Sha>ca66296efa86bd8078508fe7b38b91b415364f78</Sha>
369+
<Sha>3027ed4a9186a6924722a1597c8d31a59d411f7c</Sha>
370370
</Dependency>
371-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.11.0-1.24215.10">
371+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.11.0-1.24219.1">
372372
<Uri>https://github.com/dotnet/roslyn</Uri>
373-
<Sha>ca66296efa86bd8078508fe7b38b91b415364f78</Sha>
373+
<Sha>3027ed4a9186a6924722a1597c8d31a59d411f7c</Sha>
374374
</Dependency>
375375
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24216.2">
376376
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
@@ -381,9 +381,9 @@
381381
<Sha>b07c100bfc66013a8444172d00cfa04c9ceb5a97</Sha>
382382
</Dependency>
383383
<!-- Intermediate is necessary for source build. -->
384-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-1.24215.10">
384+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-1.24219.1">
385385
<Uri>https://github.com/dotnet/roslyn</Uri>
386-
<Sha>ca66296efa86bd8078508fe7b38b91b415364f78</Sha>
386+
<Sha>3027ed4a9186a6924722a1597c8d31a59d411f7c</Sha>
387387
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
388388
</Dependency>
389389
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-preview.4.24215.1">

‎eng/Versions.props

+19-19
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4343
they do not break the local dev experience.
4444
-->
45-
<MicrosoftCodeAnalysisCSharpVersion>4.11.0-1.24215.10</MicrosoftCodeAnalysisCSharpVersion>
46-
<MicrosoftCodeAnalysisVersion>4.11.0-1.24215.10</MicrosoftCodeAnalysisVersion>
47-
<MicrosoftNetCompilersToolsetVersion>4.11.0-1.24215.10</MicrosoftNetCompilersToolsetVersion>
45+
<MicrosoftCodeAnalysisCSharpVersion>4.11.0-1.24219.1</MicrosoftCodeAnalysisCSharpVersion>
46+
<MicrosoftCodeAnalysisVersion>4.11.0-1.24219.1</MicrosoftCodeAnalysisVersion>
47+
<MicrosoftNetCompilersToolsetVersion>4.11.0-1.24219.1</MicrosoftNetCompilersToolsetVersion>
4848
</PropertyGroup>
4949
<!--
5050
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
@@ -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

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

-8
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
;;

‎eng/pipelines/common/global-build-job.yml

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ parameters:
3434
extraVariablesTemplates: []
3535
preBuildSteps: []
3636
templatePath: 'templates'
37+
templateContext: ''
3738

3839
jobs:
3940
- template: /eng/common/${{ parameters.templatePath }}/job/job.yml
@@ -51,6 +52,9 @@ jobs:
5152
enablePublishTestResults: ${{ parameters.enablePublishTestResults }}
5253
testResultsFormat: ${{ parameters.testResultsFormat }}
5354

55+
${{ if ne(parameters.templateContext, '') }}:
56+
templateContext: ${{ parameters.templateContext }}
57+
5458
artifacts:
5559
publish:
5660
logs:

‎eng/pipelines/common/templates/publish-pipeline-artifacts.yml

-17
This file was deleted.

0 commit comments

Comments
 (0)