8000 [main] Source code updates from microsoft/vstest (#615) · dotnet/dotnet@e7f150b · GitHub
[go: up one dir, main page]
Skip to content

Commit e7f150b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from microsoft/vstest (#615)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 71837fb commit e7f150b

File tree

9 files changed

+21
-75
lines changed

9 files changed

+21
-75
lines changed

‎prereqs/git-info/vstest.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<GitCommitHash>2e6d9288d3aa0269ae710844f3aa9e0a3981b26e</GitCommitHash>
5-
<OfficialBuildId>20250424.1</OfficialBuildId>
6-
<OutputPackageVersion>17.15.0-preview-25224-01</OutputPackageVersion>
4+
<GitCommitHash>f93fcd2943f39c2cbb65d25e3949e21c3190184c</GitCommitHash>
5+
<OfficialBuildId>20250516.1</OfficialBuildId>
6+
<OutputPackageVersion>17.15.0-preview-25266-01</OutputPackageVersion>
77
</PropertyGroup>
88
</Project>

‎src/source-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@
162162
"commitSha": "297983ef280be4b32f0d36b5bb2742b8e6e947b3"
163163
},
164164
{
165-
"packageVersion": "17.15.0-preview-25224-01",
166-
"barId": 265567,
165+
"packageVersion": "17.15.0-preview-25266-01",
166+
"barId": 268581,
167167
"path": "vstest",
168168
"remoteUri": "https://github.com/microsoft/vstest",
169-
"commitSha": "2e6d9288d3aa0269ae710844f3aa9e0a3981b26e"
169+
"commitSha": "f93fcd2943f39c2cbb65d25e3949e21c3190184c"
170170
},
171171
{
172172
"packageVersion": "10.0.0-preview.5.25265.1",

‎src/vstest/eng/DotNetBuild.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<!-- When altering this file, please include @dotnet/product-construction as a reviewer. -->
2-
32
<Project>
43

4+
<!-- TODO: Remove this file when vstest upgrades to Arcade 10 -->
55
<PropertyGroup>
66
<GitHubRepositoryName>vstest</GitHubRepositoryName>
77
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
8+
<ReportPrebuiltUsage Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DotNetBuildOrchestrator)</ReportPrebuiltUsage>
9+
<SetUpSourceBuildIntermediateNupkgCache>false</SetUpSourceBuildIntermediateNupkgCache>
10+
<CreateIntermediatePackage>false</CreateIntermediatePackage>
811
</PropertyGroup>
912

1013
</Project>

‎src/vstest/eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎src/vstest/eng/Version.Details.xml

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="vstest" Sha="721dc7a2a59416b21fc49447d264009d708d6000" BarId="265489" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="vstest" Sha="86c2177121ebf8d49b372dd7232588ceaae6c7cb" BarId="266849" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.14.3-preview.25164.1">
66
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
@@ -10,24 +10,6 @@
1010
<Uri>https://github.com/dotnet/diagnostics</Uri>
1111
<Sha>22431fb5bfe047454e652a7274f4b4bc4b367527</Sha>
1212
</Dependency>
13-
<!-- Intermediate is necessary for source build. -->
14-
<Dependency Name="Microsoft.SourceBuild.Intermediate.diagnostics" Version="9.0.0-preview.25220.1">
15-
<Uri>https://github.com/dotnet/diagnostics</Uri>
16-
<Sha>22431fb5bfe047454e652a7274f4b4bc4b367527</Sha>
17-
<SourceBuild RepoName="diagnostics" ManagedOnly="true" />
18-
</Dependency>
19-
<!-- Intermediate is necessary for source build. -->
20-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24516.3">
21-
<Uri>https://github.com/dotnet/source-build-externals</Uri>
22-
<Sha>4df883d781a4290873b3b968afc0ff0df7132507</Sha>
23-
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
24-
</Dependency>
25-
<!-- Intermediate is necessary for source build. -->
26-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25209.1">
27-
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
28-
<Sha>7dbf5deea5bdccf513df73cba179c4c0ad106010</Sha>
29-
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
30-
</Dependency>
3113
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
3214
<Dependency Name="System.ComponentModel.Composition" Version="4.5.0">
3315
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -45,15 +27,9 @@
4527
</Dependency>
4628
</ProductDependencies>
4729
<ToolsetDependencies>
48-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25204.5">
30+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.5">
4931
<Uri>https://github.com/dotnet/arcade</Uri>
50-
<Sha>97cbc7361ff28b2948c8182720c166a744049f55</Sha>
51-
</Dependency>
52-
<!-- Intermediate is necessary for source build. -->
53-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25204.5">
54-
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>97cbc7361ff28b2948c8182720c166a744049f55</Sha>
56-
<SourceBuild RepoName="arcade" ManagedOnly="true" />
32+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
5733
</Dependency>
5834
<Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
5935
<Uri>https://github.com/dotnet/symreader-converter</Uri>
@@ -63,9 +39,5 @@
6339
<Uri>https://github.com/dotnet/symreader-converter</Uri>
6440
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
6541
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25204.5">
67-
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>97cbc7361ff28b2948c8182720c166a744049f55</Sha>
69-
</Dependency>
7042
</ToolsetDependencies>
7143
</Dependencies>

‎src/vstest/eng/common/core-templates/job/source-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ parameters:
2626
# Specifies the build script to invoke to perform the build in the repo. The default
2727
# './build.sh' should work for typical Arcade repositories, but this is customizable for
2828
# difficult situations.
29+
# buildArguments: ''
30+
# Specifies additional build arguments to pass to the build script.
2931
# jobProperties: {}
3032
# A list of job properties to inject at the top level, for potential extensibility beyond
3133
# container and pool.

‎src/vstest/eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
3+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
55
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []

‎src/vstest/eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ steps:
7979
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8080
--configuration $buildConfig \
8181
--restore --build --pack $publishArgs -bl \
82+
${{ parameters.platform.buildArguments }} \
8283
$officialBuildArgs \
8384
$internalRuntimeDownloadArgs \
8485
$internalRestoreArgs \

‎src/vstest/global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.104",
3+
"version": "9.0.105",
44
"rollForward": "minor",
55
"allowPrerelease": false,
66
"architecture": "x64"
@@ -28,9 +28,9 @@
2828
"version": "17.8.0"
2929
},
3030
"vswhere": "2.2.7",
31-
"dotnet": "9.0.104"
31+
"dotnet": "9.0.105"
3232
},
3333
"msbuild-sdks": {
34-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25204.5"
34+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5"
3535
}
3636
}

0 commit comments

Comments
 (0)
0