Skip to content

Commit 699b126

Browse files
adamzipadamzip
authored
[Rollout] Production rollout 2026-02-18 (#5977)
#5976
1 parent e4f5467 commit 699b126

18 files changed

+118
-81
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"dotnet-ef": {
12-
"version": "10.0.2",
12+
"version": "10.0.3",
1313
"commands": [
1414
"dotnet-ef"
1515
]
@@ -21,4 +21,4 @@
2121
]
2222
}
2323
}
24-
}
24+
}

‎Directory.Packages.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageVersion Include="Aspire.Azure.Storage.Queues" Version="13.1.0" />
9-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.1.0" />
10-
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="13.1.0" />
11-
<PackageVersion Include="Aspire.Hosting.Azure" Version="13.1.0" />
12-
<PackageVersion Include="Aspire.Hosting.Redis" Version="13.1.0" />
8+
<PackageVersion Include="Aspire.Azure.Storage.Queues" Version="13.1.1" />
9+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.1.1" />
10+
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="13.1.1" />
11+
<PackageVersion Include="Aspire.Hosting.Azure" Version="13.1.1" />
12+
<PackageVersion Include="Aspire.Hosting.Redis" Version="13.1.1" />
1313
<PackageVersion Include="Azure.Core" Version="1.51.1" />
1414
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
1515
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.5.1" />

‎eng/Version.Details.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dnceng-shared dependencies -->
9-
<MicrosoftAspNetCoreApiPaginationPackageVersion>1.1.0-beta.25608.1</MicrosoftAspNetCoreApiPaginationPackageVersion>
10-
<MicrosoftAspNetCoreApiVersioningPackageVersion>1.1.0-beta.25608.1</MicrosoftAspNetCoreApiVersioningPackageVersion>
11-
<MicrosoftAspNetCoreApiVersioningSwashbucklePackageVersion>1.1.0-beta.25608.1</MicrosoftAspNetCoreApiVersioningSwashbucklePackageVersion>
12-
<MicrosoftDncEngConfigurationExtensionsPackageVersion>1.1.0-beta.25608.1</MicrosoftDncEngConfigurationExtensionsPackageVersion>
13-
<MicrosoftDotNetGitHubAuthenticationPackageVersion>1.1.0-beta.25608.1</MicrosoftDotNetGitHubAuthenticationPackageVersion>
14-
<MicrosoftDotNetInternalDependencyInjectionPackageVersion>1.1.0-beta.25608.1</MicrosoftDotNetInternalDependencyInjectionPackageVersion>
15-
<MicrosoftDotNetInternalDependencyInjectionTestingPackageVersion>1.1.0-beta.25608.1</MicrosoftDotNetInternalDependencyInjectionTestingPackageVersion>
16-
<MicrosoftDotNetInternalLoggingPackageVersion>1.1.0-beta.25608.1</MicrosoftDotNetInternalLoggingPackageVersion>
17-
<MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsPackageVersion>1.1.0-beta.25608.1</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsPackageVersion>
18-
<MicrosoftDotNetInternalTestingDependencyInjectionCodeGenPackageVersion>1.1.0-beta.25608.1</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenPackageVersion>
19-
<MicrosoftDotNetInternalTestingUtilityPackageVersion>1.1.0-beta.25608.1</MicrosoftDotNetInternalTestingUtilityPackageVersion>
20-
<MicrosoftDotNetKustoPackageVersion>1.1.0-beta.25608.1</MicrosoftDotNetKustoPackageVersion>
21-
<MicrosoftDotNetServicesUtilityPackageVersion>1.1.0-beta.25608.1</MicrosoftDotNetServicesUtilityPackageVersion>
9+
<MicrosoftAspNetCoreApiPaginationPackageVersion>1.1.0-beta.26113.1</MicrosoftAspNetCoreApiPaginationPackageVersion>
10+
<MicrosoftAspNetCoreApiVersioningPackageVersion>1.1.0-beta.26113.1</MicrosoftAspNetCoreApiVersioningPackageVersion>
11+
<MicrosoftAspNetCoreApiVersioningSwashbucklePackageVersion>1.1.0-beta.26113.1</MicrosoftAspNetCoreApiVersioningSwashbucklePackageVersion>
12+
<MicrosoftDncEngConfigurationExtensionsPackageVersion>1.1.0-beta.26113.1</MicrosoftDncEngConfigurationExtensionsPackageVersion>
13+
<MicrosoftDotNetGitHubAuthenticationPackageVersion>1.1.0-beta.26113.1</MicrosoftDotNetGitHubAuthenticationPackageVersion>
14+
<MicrosoftDotNetInternalDependencyInjectionPackageVersion>1.1.0-beta.26113.1</MicrosoftDotNetInternalDependencyInjectionPackageVersion>
15+
<MicrosoftDotNetInternalDependencyInjectionTestingPackageVersion>1.1.0-beta.26113.1</MicrosoftDotNetInternalDependencyInjectionTestingPackageVersion>
16+
<MicrosoftDotNetInternalLoggingPackageVersion>1.1.0-beta.26113.1</MicrosoftDotNetInternalLoggingPackageVersion>
17+
<MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsPackageVersion>1.1.0-beta.26113.1</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsPackageVersion>
18+
<MicrosoftDotNetInternalTestingDependencyInjectionCodeGenPackageVersion>1.1.0-beta.26113.1</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenPackageVersion>
19+
<MicrosoftDotNetInternalTestingUtilityPackageVersion>1.1.0-beta.26113.1</MicrosoftDotNetInternalTestingUtilityPackageVersion>
20+
<MicrosoftDotNetKustoPackageVersion>1.1.0-beta.26113.1</MicrosoftDotNetKustoPackageVersion>
21+
<MicrosoftDotNetServicesUtilityPackageVersion>1.1.0-beta.26113.1</MicrosoftDotNetServicesUtilityPackageVersion>
2222
<!-- dotnet/arcade dependencies -->
23-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26106.4</MicrosoftDotNetArcadeSdkPackageVersion>
24-
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26106.4</MicrosoftDotNetBuildTasksFeedPackageVersion>
25-
<MicrosoftDotNetSignToolPackageVersion>10.0.0-beta.26106.4</MicrosoftDotNetSignToolPackageVersion>
26-
<MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>10.0.0-beta.26106.4</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
23+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26110.1</MicrosoftDotNetArcadeSdkPackageVersion>
24+
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26110.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
25+
<MicrosoftDotNetSignToolPackageVersion>10.0.0-beta.26110.1</MicrosoftDotNetSignToolPackageVersion>
26+
<MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>10.0.0-beta.26110.1</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
2727
<MicrosoftDotNetVersionToolsPackageVersion>8.0.0-beta.25555.2</MicrosoftDotNetVersionToolsPackageVersion>
2828
<!-- dotnet/dnceng dependencies -->
2929
<MicrosoftDncEngConfigurationBootstrapPackageVersion>1.1.0-beta.26077.1</MicrosoftDncEngConfigurationBootstrapPackageVersion>
3030
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.26077.1</MicrosoftDncEngSecretManagerPackageVersion>
3131
<!-- _git/maestro-configuration dependencies -->
32-
<MicrosoftDotNetMaestroConfigurationClientPackageVersion>1.1.0-beta.26110.1</MicrosoftDotNetMaestroConfigurationClientPackageVersion>
32+
<MicrosoftDotNetMaestroConfigurationClientPackageVersion>1.1.0-beta.26116.2</MicrosoftDotNetMaestroConfigurationClientPackageVersion>
3333
</PropertyGroup>
3434
<!--Property group for alternate package version names-->
3535
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.DotNet.Internal.Logging" Version="1.1.0-beta.25608.1">
4+
<Dependency Name="Microsoft.DotNet.Internal.Logging" Version="1.1.0-beta.26113.1">
55
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
6-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
6+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.AspNetCore.ApiPagination" Version="1.1.0-beta.25608.1">
8+
<Dependency Name="Microsoft.AspNetCore.ApiPagination" Version="1.1.0-beta.26113.1">
99
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
10-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
10+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.AspNetCore.ApiVersioning" Version="1.1.0-beta.25608.1">
12+
<Dependency Name="Microsoft.AspNetCore.ApiVersioning" Version="1.1.0-beta.26113.1">
1313
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
14-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
14+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Swashbuckle" Version="1.1.0-beta.25608.1">
16+
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Swashbuckle" Version="1.1.0-beta.26113.1">
1717
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
18-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
18+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.25608.1">
20+
<Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.26113.1">
2121
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
22-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
22+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.25608.1">
24+
<Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.26113.1">
2525
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
26-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
26+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.25608.1">
28+
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.26113.1">
2929
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
30-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
30+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.25608.1">
32+
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.26113.1">
3333
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
34-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
34+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.25608.1">
36+
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.26113.1">
3737
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
38-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
38+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.25608.1">
40+
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.26113.1">
4141
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
42-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
42+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.25608.1">
44+
<Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.26113.1">
4545
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
46-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
46+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.25608.1">
48+
<Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.26113.1">
4949
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
50-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
50+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.25608.1">
52+
<Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.26113.1">
5353
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
54-
<Sha>2a02ce0d218021532c8c6c083336b374ba0ca6a2</Sha>
54+
<Sha>eebcd469208a67368a1bac0cf0301373583f41c7</Sha>
5555
</Dependency>
5656
</ProductDependencies>
5757
<ToolsetDependencies>
58-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26106.4">
58+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26110.1">
5959
<Uri>https://github.com/dotnet/arcade</Uri>
60-
<Sha>58d75363f4b03e408aa2502e0db546173be722d4</Sha>
60+
<Sha>4bf37ce670528cf2aef4d9b1cd892554b1b02d9d</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.26106.4">
62+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.26110.1">
6363
<Uri>https://github.com/dotnet/arcade</Uri>
64-
<Sha>58d75363f4b03e408aa2502e0db546173be722d4</Sha>
64+
<Sha>4bf37ce670528cf2aef4d9b1cd892554b1b02d9d</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26106.4">
66+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26110.1">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>58d75363f4b03e408aa2502e0db546173be722d4</Sha>
68+
<Sha>4bf37ce670528cf2aef4d9b1cd892554b1b02d9d</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.26106.4">
70+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.26110.1">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>58d75363f4b03e408aa2502e0db546173be722d4</Sha>
72+
<Sha>4bf37ce670528cf2aef4d9b1cd892554b1b02d9d</Sha>
7373
</Dependency>
7474
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25555.2">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -83,9 +83,9 @@
8383
<Uri>https://github.com/dotnet/dnceng</Uri>
8484
<Sha>9a0ad177268eedb2ff4c77140e94cc942c44baa9</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.MaestroConfiguration.Client" Version="1.1.0-beta.26110.1">
86+
<Dependency Name="Microsoft.DotNet.MaestroConfiguration.Client" Version="1.1.0-beta.26116.2">
8787
<Uri>https://dev.azure.com/dnceng/internal/_git/maestro-configuration</Uri>
88-
<Sha>a3309618c379c70fcb85244755f68c42e9169b19</Sha>
88+
<Sha>cd28606d6b78286bb5cd506c0241f2fffafac34b</Sha>
8989
</Dependency>
9090
</ToolsetDependencies>
9191
</Dependencies>

‎eng/pipelines/azure-pipelines-pr.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,22 @@ pr:
2828
- THIRD-PARTY-NOTICES.TXT
2929

3030
stages:
31+
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
32+
- stage: GitHub_Issue_Verification
33+
displayName: GitHub Issue Verification
34+
dependsOn: []
35+
# System.PullRequest.TargetBranch only evaulates during runtime conditions
36+
condition: and(notIn(variables['System.PullRequest.TargetBranch'], 'refs/heads/production', 'production'), notIn(variables['System.PullRequest.SourceBranch'], 'refs/heads/production', 'production'))
37+
jobs:
38+
- job: VerifyGitHubIssue
39+
displayName: Verify GitHub Issue Link included in all PRs
40+
pool:
41+
vmImage: windows-latest
42+
steps:
43+
- checkout: self
44+
- powershell: eng/enforce-issue.ps1 -PullRequestNumber $(System.PullRequest.PullRequestNumber) -RepositoryName $(Build.Repository.Name)
45+
displayName: Enforce GitHub issue link presence
46+
3147
- stage: build
3248
dependsOn: []
3349
displayName: Build

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
}
1616
},
1717
"msbuild-sdks": {
18-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26106.4"
18+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26110.1"
1919
}
2020
}

‎src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResetOperation.cs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public override async Task<int> ExecuteAsync()
5757
}
5858

5959
string mappingName, targetSha = default!;
60+
ProductConstructionService.Client.Models.Build? build = null;
6061

6162
if (_options.Build.HasValue || !string.IsNullOrEmpty(_options.Channel))
6263
{
@@ -116,11 +117,13 @@ public override async Task<int> ExecuteAsync()
116117
// Determine the target SHA from build or channel option
117118
if (_options.Build.HasValue)
118119
{
119-
targetSha = await GetShaFromBuildAsync(_options.Build.Value, mappingName);
120+
build = await GetBuildAsync(_options.Build.Value, mappingName);
121+
targetSha = build.Commit;
120122
}
121123
else if (!string.IsNullOrEmpty(_options.Channel))
122124
{
123-
targetSha = await GetShaFromChannelAsync(_options.Channel, mapping);
125+
build = await GetBuildFromChannelAsync(_options.Channel, mapping);
126+
targetSha = build.Commit;
124127
}
125128

126129
_logger.LogInformation("Resetting VMR mapping '{mapping}' to SHA '{sha}'", mappingName, targetSha);
@@ -176,7 +179,7 @@ .. mapping.Exclude.Select(VmrPatchHandler.GetExclusionRule)
176179
DarcLib.Constants.EmptyGitObject,
177180
Parent: null,
178181
OfficialBuildId: null,
179-
BarId: null));
182+
BarId: build?.Id));
180183

181184
await _vmrUpdater.UpdateRepository(
182185
mappingName,
@@ -197,9 +200,10 @@ await _vmrUpdater.UpdateRepository(
197200
}
198201

199202
/// <summary>
200-
/// Gets the commit SHA from a BAR build ID and validates that the build's repository matches the mapping.
203+
/// Gets the build from BAR and validates that the build's repository matches the mapping.
201204
/// </summary>
202-
private async Task<string> GetShaFromBuildAsync(int buildId, string mappingName)
205+
/// <returns>The Build object.</returns>
206+
private async Task<ProductConstructionService.Client.Models.Build> GetBuildAsync(int buildId, string mappingName)
203207
{
204208
var build = await _barClient.GetBuildAsync(buildId)
205209
?? throw new DarcException($"Build with ID {buildId} not found in BAR.");
@@ -222,13 +226,14 @@ private async Task<string> GetShaFromBuildAsync(int buildId, string mappingName)
222226
$"but you specified mapping '{mappingName}'. These must match.");
223227
}
224228

225-
return build.Commit;
229+
return build;
226230
}
227231

228232
/// <summary>
229-
/// Gets the commit SHA from the latest build on a channel for the mapping's default remote.
233+
/// Gets the build from the latest build on a channel for the mapping's default remote.
230234
/// </summary>
231-
private async Task<string> GetShaFromChannelAsync(string channelName, SourceMapping mapping)
235+
/// <returns>The Build object.</returns>
236+
private async Task<ProductConstructionService.Client.Models.Build> GetBuildFromChannelAsync(string channelName, SourceMapping mapping)
232237
{
233238
_logger.LogInformation("Finding latest build for repository '{repo}' on channel '{channel}'...",
234239
mapping.DefaultRemote, channelName);
@@ -247,6 +252,6 @@ private async Task<string> GetShaFromChannelAsync(string channelName, SourceMapp
247252
"Found latest build on channel '{channel}': Build {buildId} @ {commit}",
248253
channel.Name, build.Id, build.Commit);
249254

250-
return build.Commit;
255+
return build;
251256
}
252257
}

‎src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/AddRepoCommandLineOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
1111
[Verb("add-repo", HelpText = "Adds new repo(s) to the VMR that haven't been synchronized yet.")]
1212
internal class AddRepoCommandLineOptions : VmrCommandLineOptions<AddRepoOperation>, IBaseVmrCommandLineOptions
1313
{
14-
[Value(0, Required = true, HelpText =
14+
[Value(0, MetaName = "Repository URIs", Required = true, HelpText =
1515
"Repository URIs in the form of URI:REVISION where URI is the git repository URL (e.g., https://github.com/dotnet/runtime) and REVISION is a commit SHA or other git reference (branch, tag).")]
1616
public IEnumerable<string> Repositories { get; set; }
1717

‎src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/BackflowCommandLineOptions.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ namespace Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
1212
"into a target local repository. Must be called from the VMR directory.")]
1313
internal class BackflowCommandLineOptions : CodeFlowCommandLineOptions<BackflowOperation>
1414
{
15-
[Value(0, Required = true, HelpText = "Path to a local repository to flow the current VMR commit to")]
15+
[Value(0,
16+
Required = true,
17+
MetaName = "Target repo path",
18+
HelpText = "Path to the local repository on disk to flow the current VMR commit to")]
1619
public string Repository { get; set; }
1720

1821
public override IEnumerable<string> Repositories => [Path.GetFileName(Repository) + ":" + Repository];

0 commit comments

Comments
 (0)