Skip to content

Commit 8b5a2ff

Browse files
premunpremun
authored
[Rollout] Production rollout 2025-03-11 (#4551)
#4550
2 parents 4f61e62 + 117b52b commit 8b5a2ff

File tree

62 files changed

+1310
-580
lines changed

Some content is hidden

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

62 files changed

+1310
-580
lines changed

‎.config/dotnet-tools.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dnceng.secretmanager": {
6-
"version": "1.1.0-beta.25125.2",
6+
"version": "1.1.0-beta.25154.1",
77
"commands": [
88
"secret-manager"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dnceng.configuration.bootstrap": {
18-
"version": "1.1.0-beta.25125.2",
18+
"version": "1.1.0-beta.25154.1",
1919
"commands": [
2020
"bootstrap-dnceng-configuration"
2121
]

‎arcade-services.sln

+15
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{02EA681E
9494
EndProject
9595
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.ReproTool", "tools\ProductConstructionService.ReproTool\ProductConstructionService.ReproTool.csproj", "{261CB211-6023-8025-48E1-D11953F4C61C}"
9696
EndProject
97+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlatFlowMigrationCli", "tools\FlatFlowMigrationCli\FlatFlowMigrationCli.csproj", "{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}"
98+
EndProject
9799
Global
98100
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99101
Debug|Any CPU = Debug|Any CPU
@@ -500,6 +502,18 @@ Global
500502
{261CB211-6023-8025-48E1-D11953F4C61C}.Release|x64.Build.0 = Release|Any CPU
501503
{261CB211-6023-8025-48E1-D11953F4C61C}.Release|x86.ActiveCfg = Release|Any CPU
502504
{261CB211-6023-8025-48E1-D11953F4C61C}.Release|x86.Build.0 = Release|Any CPU
505+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
506+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
507+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Debug|x64.ActiveCfg = Debug|Any CPU
508+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Debug|x64.Build.0 = Debug|Any CPU
509+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Debug|x86.ActiveCfg = Debug|Any CPU
510+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Debug|x86.Build.0 = Debug|Any CPU
511+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
512+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Release|Any CPU.Build.0 = Release|Any CPU
513+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Release|x64.ActiveCfg = Release|Any CPU
514+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Release|x64.Build.0 = Release|Any CPU
515+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Release|x86.ActiveCfg = Release|Any CPU
516+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB}.Release|x86.Build.0 = Release|Any CPU
503517
EndGlobalSection
504518
GlobalSection(SolutionProperties) = preSolution
505519
HideSolutionNode = FALSE
@@ -541,6 +555,7 @@ Global
541555
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE} = {243A4561-BF35-405A-AF12-AC57BB27796D}
542556
{B95B12A8-FCE1-618A-CA77-134B59A5C050} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
543557
{261CB211-6023-8025-48E1-D11953F4C61C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
558+
{89DF188B-B1FC-D3C4-A76E-019144ABA9CB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
544559
EndGlobalSection
545560
GlobalSection(ExtensibilityGlobals) = postSolution
546561
SolutionGuid = {32B9C883-432E-4FC8-A1BF-090EB033DD5B}

‎docs/DevGuide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# Configuring the service for local runs
3232

3333
When running locally:
34-
- The service will attempt to read secrets from the [`ProductConstructionDev`](https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/cab65fc3-d077-467d-931f-3932eabf36d3/resourceGroups/product-construction-service/providers/Microsoft.KeyVault/vaults/ProductConstructionDev/overview) KeyVault, using your Microsoft credentials. If you're having some authentication double check the following:
34+
- The service will attempt to read secrets from the [`ProductConstructionDev`](https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/e6b5f9f5-0ca4-4351-879b-014d78400ec2/resourceGroups/product-construction-service/providers/Microsoft.KeyVault/vaults/ProductConstructionDev/overview) KeyVault, using your Microsoft credentials. If you're having some authentication double check the following:
3535
- In VS, go to `Tools -> Options -> Azure Service Authentication -> Account Selection` and make sure your corp account is selected
3636
- Check your environmental variables, you might have `AZURE_TENANT_ID`, `AZURE_CLIENT_ID` and `AZURE_CLIENT_SECRET` set, and the `DefaultAzureCredential` is attempting to use `EnvironmentalCredentials` for an app that doesn't have access to the dev KV.
3737
- The service is configured to use the same SQL Express database Maestro uses. To se it up, follow the [instructions](https://github.com/dotnet/arcade-services/blob/main/docs/DevGuide.md)

‎eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@
8383
<Uri>https://github.com/dotnet/arcade</Uri>
8484
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25125.2">
86+
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25154.1">
8787
<Uri>https://github.com/dotnet/dnceng</Uri>
88-
<Sha>f23f373d1315dbea9c2206e376e4519505fac211</Sha>
88+
<Sha>54eb8e58248998dbf1a9b4a4537fdf82e94a5b1d</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25125.2">
90+
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25154.1">
9191
<Uri>https://github.com/dotnet/dnceng</Uri>
92-
<Sha>f23f373d1315dbea9c2206e376e4519505fac211</Sha>
92+
<Sha>54eb8e58248998dbf1a9b4a4537fdf82e94a5b1d</Sha>
9393
</Dependency>
9494
</ToolsetDependencies>
9595
</Dependencies>

‎eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<MicrosoftDotNetMetricsVersion>1.1.0-beta.25052.1</MicrosoftDotNetMetricsVersion>
3333
<MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.25125.2</MicrosoftDotNetServicesUtilityVersion>
3434
<MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.25053.1</MicrosoftDotNetWebAuthenticationVersion>
35-
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.25125.2</MicrosoftDncEngSecretManagerVersion>
36-
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.25125.2</MicrosoftDncEngConfigurationBootstrapVersion>
35+
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.25154.1</MicrosoftDncEngSecretManagerVersion>
36+
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.25154.1</MicrosoftDncEngConfigurationBootstrapVersion>
3737
</PropertyGroup>
3838
<!--Package names-->
3939
<PropertyGroup>

‎src/Maestro/Maestro.Data/Migrations/20250227091038_IncreaseAssetNameSize.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
using Microsoft.EntityFrameworkCore.Migrations;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
23

3-
#nullable disable
4+
using Microsoft.EntityFrameworkCore.Migrations;
45

56
namespace Maestro.Data.Migrations
67
{

‎src/Maestro/Maestro.DataProviders/ISqlBarClient.cs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System;
5+
using System.Threading.Tasks;
6+
using Microsoft.DotNet.DarcLib;
7+
8+
namespace Maestro.DataProviders;
9+
public interface ISqlBarClient : IBasicBarClient
10+
{
11+
/// <summary>
12+
/// Register a subscription update in the database. This is used to track the status of subscription updates.
13+
/// </summary>
14+
Task RegisterSubscriptionUpdate(
15+
Guid subscriptionId,
16+
string updateMessage);
17+
}

‎src/Maestro/Maestro.DataProviders/SqlBarClient.cs

+24-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Maestro.DataProviders;
1919
/// <summary>
2020
/// A bar client interface implementation used by all services which talks directly to the database.
2121
/// </summary>
22-
public class SqlBarClient : IBasicBarClient
22+
public class SqlBarClient : ISqlBarClient
2323
{
2424
private readonly BuildAssetRegistryContext _context;
2525
private readonly IKustoClientProvider _kustoClientProvider;
@@ -471,4 +471,27 @@ public async Task<BuildTime> GetBuildTimeAsync(int defaultChannelId, int days)
471471
GoalTimeInMinutes = goalTime
472472
};
473473
}
474+
475+
public async Task RegisterSubscriptionUpdate(
476+
Guid subscriptionId,
477+
string updateMessage)
478+
{
479+
Data.Models.Subscription subscription = await _context.Subscriptions.FindAsync(subscriptionId);
480+
Data.Models.SubscriptionUpdate subscriptionUpdate = new()
481+
{
482+
SubscriptionId = subscription.Id,
483+
Subscription = subscription,
484+
Action = updateMessage
485+
};
486+
var existingSubscriptionUpdate = await _context.SubscriptionUpdates.FindAsync(subscriptionUpdate.SubscriptionId);
487+
if (existingSubscriptionUpdate == null)
488+
{
489+
_context.SubscriptionUpdates.Add(subscriptionUpdate);
490+
}
491+
else
492+
{
493+
_context.Entry(existingSubscriptionUpdate).CurrentValues.SetValues(subscriptionUpdate);
494+
}
495+
await _context.SaveChangesAsync();
496+
}
474497
}

‎src/Microsoft.DotNet.Darc/Darc/Helpers/CompactConsoleLoggerFormatter.cs

-196
This file was deleted.

‎src/Microsoft.DotNet.Darc/Darc/Microsoft.DotNet.Darc.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<ItemGroup>
1515
<ProjectReference Include="..\..\Maestro\Maestro.Common\Maestro.Common.csproj" />
16+
<ProjectReference Include="..\..\ProductConstructionService\ProductConstructionService.Common\ProductConstructionService.Common.csproj" />
1617
<ProjectReference Include="..\DarcLib\Microsoft.DotNet.DarcLib.csproj" />
1718
</ItemGroup>
1819

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Threading.Tasks;
77
using Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
88
using Microsoft.DotNet.DarcLib.Helpers;
9+
using Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
910
using Microsoft.DotNet.DarcLib.VirtualMonoRepo;
1011
using Microsoft.Extensions.Logging;
1112

@@ -39,11 +40,12 @@ await _vmrInitializer.InitializeRepository(
3940
null,
4041
_options.Recursive,
4142
new NativePath(_options.SourceMappings),
42-
additionalRemotes,
43-
_options.TpnTemplate,
44-
_options.GenerateCodeowners,
45-
_options.GenerateCredScanSuppressions,
46-
_options.DiscardPatches,
43+
new CodeFlowParameters(
44+
additionalRemotes,
45+
_options.TpnTemplate,
46+
_options.GenerateCodeowners,
47+
_options.GenerateCredScanSuppressions,
48+
_options.DiscardPatches),
4749
_options.EnableBuildLookUp,
4850
cancellationToken);
4951
}

0 commit comments

Comments
 (0)