Skip to content

Commit db5e262

Browse files
[main] Update dependencies from devdiv/DevDiv/vs-code-coverage, dotnet/arcade (#6561)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent afba02a commit db5e262

5 files changed

Lines changed: 21 additions & 12 deletions

File tree

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25461.3">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25462.2">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>eaeefbd9f29d54c1543459f7624aecddb06d9c7e</Sha>
6+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25461.3">
8+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25462.2">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>eaeefbd9f29d54c1543459f7624aecddb06d9c7e</Sha>
10+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25461.3">
12+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25462.2">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>eaeefbd9f29d54c1543459f7624aecddb06d9c7e</Sha>
14+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.0.0-preview.25459.1">
16+
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.0.0-preview.25462.2">
1717
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
18-
<Sha>d71460dce5bbe5fce378c510bddeec7cd50d865f</Sha>
18+
<Sha>aeac32704110bf7b363a16815eb51df0d62ae57a</Sha>
1919
</Dependency>
2020
<Dependency Name="MSTest" Version="3.11.0-preview.25460.1">
2121
<Uri>https://github.com/microsoft/testfx</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
88
</PropertyGroup>
99
<PropertyGroup Label="MSTest prod dependencies - darc updated">
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25461.3</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftTestingExtensionsCodeCoverageVersion>18.0.0-preview.25459.1</MicrosoftTestingExtensionsCodeCoverageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25462.2</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftTestingExtensionsCodeCoverageVersion>18.0.0-preview.25462.2</MicrosoftTestingExtensionsCodeCoverageVersion>
1212
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
1313
<MSTestVersion>3.11.0-preview.25460.1</MSTestVersion>
1414
<MicrosoftTestingPlatformVersion>1.9.0-preview.25460.1</MicrosoftTestingPlatformVersion>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ parameters:
4040

4141
repositoryAlias: self
4242

43+
officialBuildId: ''
44+
4345
jobs:
4446
- job: Asset_Registry_Publish
4547

@@ -62,6 +64,11 @@ jobs:
6264
value: false
6365
# unconditional - needed for logs publishing (redactor tool version)
6466
- template: /eng/common/core-templates/post-build/common-variables.yml
67+
- name: OfficialBuildId
68+
${{ if ne(parameters.officialBuildId, '') }}:
69+
value: ${{ parameters.officialBuildId }}
70+
${{ else }}:
71+
value: $(Build.BuildNumber)
6572

6673
pool:
6774
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -124,7 +131,7 @@ jobs:
124131
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
125132
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
126133
/p:MaestroApiEndpoint=https://maestro.dot.net
127-
/p:OfficialBuildId=$(Build.BuildNumber)
134+
/p:OfficialBuildId=$(OfficialBuildId)
128135
condition: ${{ parameters.condition }}
129136
continueOnError: ${{ parameters.continueOnError }}
130137

eng/common/core-templates/jobs/jobs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47+
officialBuildId: ''
4748

4849
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4950
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -116,3 +117,4 @@ jobs:
116117
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
117118
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
118119
repositoryAlias: ${{ parameters.repositoryAlias }}
120+
officialBuildId: ${{ parameters.officialBuildId }}

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"rollForward": "latestFeature"
3434
},
3535
"msbuild-sdks": {
36-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25461.3",
36+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25462.2",
3737
"MSBuild.Sdk.Extras": "3.0.44"
3838
}
3939
}

0 commit comments

Comments
 (0)