Skip to content

Commit 0227c76

Browse files
MilenaHristovaMilenaHristova
authored
[Rollout] Production rollout 2024-11-13 (#4147)
2 parents 84bb10b + 402811f commit 0227c76

File tree

59 files changed

+1746
-1297
lines changed

Some content is hidden

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

59 files changed

+1746
-1297
lines changed

‎.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
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.24474.1",
6+
"version": "1.1.0-beta.24555.1",
77
"commands": [
88
"secret-manager"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dnceng.configuration.bootstrap": {
18-
"version": "1.1.0-beta.24474.1",
18+
"version": "1.1.0-beta.24555.1",
1919
"commands": [
2020
"bootstrap-dnceng-configuration"
2121
]

‎Directory.Build.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
<LangVersion>latest</LangVersion>
3232
<IsShipping>false</IsShipping>
3333
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
34+
<!--
35+
This compiler property is required for debugging the BarViz project locally.
36+
37+
When set to `full`, all debugging information will be made available together with the built
38+
artifacts. If not present, Visual Studio debugger will fail to connect to the browser during
39+
the debugging session
40+
-->
41+
<DebugType>Full</DebugType>
3442

3543
<EnableCentralPackageVersions>true</EnableCentralPackageVersions>
3644
<CentralPackagesFile>$(MSBuildThisFileDirectory)eng/Packages.props</CentralPackagesFile>

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<clear />

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,37 +91,37 @@
9191
</Dependency>
9292
</ProductDependencies>
9393
<ToolsetDependencies>
94-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
94+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24525.2">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
96+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24516.1">
98+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24525.2">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
100+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24516.1">
102+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24525.2">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
104+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.24516.1">
106+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.24525.2">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
108+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Git.IssueManager" Version="8.0.0-beta.24516.1">
110+
<Dependency Name="Microsoft.DotNet.Git.IssueManager" Version="8.0.0-beta.24525.2">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
112+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.24516.1">
114+
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.24525.2">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
116+
<Sha>24e02f80c5458d1f75240ae57fc2a98fb8a9022a</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.24474.1">
118+
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.24555.1">
119119
<Uri>https://github.com/dotnet/dnceng</Uri>
120-
<Sha>fa5f53c54c7d30fac266d7e70e7adfab720a55fa</Sha>
120+
<Sha>64878fb972e889fc51b1f2e80a1ad2285fbd896c</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.24474.1">
122+
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.24555.1">
123123
<Uri>https://github.com/dotnet/dnceng</Uri>
124-
<Sha>fa5f53c54c7d30fac266d7e70e7adfab720a55fa</Sha>
124+
<Sha>64878fb972e889fc51b1f2e80a1ad2285fbd896c</Sha>
125125
</Dependency>
126126
</ToolsetDependencies>
127127
</Dependencies>

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
1010
<MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.0-preview.1</MicrosoftNetFrameworkReferenceAssembliesVersion>
1111
<!-- Libs -->
12-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24516.1</MicrosoftDotNetSignToolVersion>
13-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksFeedVersion>
14-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.24516.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
15-
<MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.24516.1</MicrosoftDotNetGitIssueManagerVersion>
16-
<MicrosoftDotNetVersionToolsVersion>8.0.0-beta.24516.1</MicrosoftDotNetVersionToolsVersion>
12+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24525.2</MicrosoftDotNetSignToolVersion>
13+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24525.2</MicrosoftDotNetBuildTasksFeedVersion>
14+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.24525.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
15+
<MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.24525.2</MicrosoftDotNetGitIssueManagerVersion>
16+
<MicrosoftDotNetVersionToolsVersion>8.0.0-beta.24525.2</MicrosoftDotNetVersionToolsVersion>
1717
<MicrosoftNetTestSdkVersion>17.4.1</MicrosoftNetTestSdkVersion>
1818
<MicrosoftDotNetInternalLoggingVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalLoggingVersion>
1919
<MicrosoftAspNetCoreApiPaginationVersion>1.1.0-beta.24376.1</MicrosoftAspNetCoreApiPaginationVersion>
@@ -37,8 +37,8 @@
3737
<MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24376.1</MicrosoftDotNetWebAuthenticationVersion>
3838
<ServiceFabricMocksVersion>1.1.0-beta.24376.1</ServiceFabricMocksVersion>
3939
<CoreHealthMonitorVersion>1.1.0-beta.24376.1</CoreHealthMonitorVersion>
40-
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24474.1</MicrosoftDncEngSecretManagerVersion>
41-
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24474.1</MicrosoftDncEngConfigurationBootstrapVersion>
40+
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24555.1</MicrosoftDncEngSecretManagerVersion>
41+
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24555.1</MicrosoftDncEngConfigurationBootstrapVersion>
4242
</PropertyGroup>
4343
<!--Package names-->
4444
<PropertyGroup>

‎eng/service-templates/ProductConstructionService/provision.bicep

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ module subscriptionTriggererTwiceDaily 'scheduledContainerJob.bicep' = {
202202
containerRegistryName: containerRegistryName
203203
containerAppsEnvironmentId: containerEnvironmentModule.outputs.containerEnvironmentId
204204
containerImageName: containerImageName
205-
command: 'cd /app/SubscriptionTriggerer && dotnet ProductConstructionService.SubscriptionTriggerer.dll'
205+
command: 'cd /app/SubscriptionTriggerer && dotnet ProductConstructionService.SubscriptionTriggerer.dll twicedaily'
206206
contributorRoleId: contributorRole
207207
deploymentIdentityPrincipalId: managedIdentitiesModule.outputs.deploymentIdentityPrincipalId
208208
}
@@ -223,7 +223,7 @@ module subscriptionTriggererDaily 'scheduledContainerJob.bicep' = {
223223
containerRegistryName: containerRegistryName
224224
containerAppsEnvironmentId: containerEnvironmentModule.outputs.containerEnvironmentId
225225
containerImageName: containerImageName
226-
command: 'cd /app/SubscriptionTriggerer && dotnet ProductConstructionService.SubscriptionTriggerer.dll'
226+
command: 'cd /app/SubscriptionTriggerer && dotnet ProductConstructionService.SubscriptionTriggerer.dll daily'
227227
contributorRoleId: contributorRole
228228
deploymentIdentityPrincipalId: managedIdentitiesModule.outputs.deploymentIdentityPrincipalId
229229
}
@@ -244,7 +244,7 @@ module subscriptionTriggererWeekly 'scheduledContainerJob.bicep' = {
244244
containerRegistryName: containerRegistryName
245245
containerAppsEnvironmentId: containerEnvironmentModule.outputs.containerEnvironmentId
246246
containerImageName: containerImageName
247-
command: 'cd /app/SubscriptionTriggerer && dotnet ProductConstructionService.SubscriptionTriggerer.dll'
247+
command: 'cd /app/SubscriptionTriggerer && dotnet ProductConstructionService.SubscriptionTriggerer.dll weekly'
248248
contributorRoleId: contributorRole
249249
deploymentIdentityPrincipalId: managedIdentitiesModule.outputs.deploymentIdentityPrincipalId
250250
}

‎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": "8.0.0-beta.24516.1"
18+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24525.2"
1919
}
2020
}

‎src/Maestro/Maestro.Data/Models/Build.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Collections.Generic;
66
using System.ComponentModel.DataAnnotations;
77
using System.ComponentModel.DataAnnotations.Schema;
8-
using System.Reflection.Metadata.Ecma335;
98
using Microsoft.DotNet.DarcLib;
109
using Microsoft.DotNet.Services.Utility;
1110

‎src/Maestro/Maestro.Web/Api/v2018_07_16/Controllers/SubscriptionsController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ protected async Task<IActionResult> TriggerSubscriptionCore(Guid id, int buildId
125125
// TODO (https://github.com/dotnet/arcade-services/issues/3880) - Remove subscriptionIdGenerator
126126
if (!_subscriptionIdGenerator.ShouldTriggerSubscription(id))
127127
{
128-
return BadRequest("Maestro shouldn't trigger PCS subscriptions");
128+
return BadRequest(new ApiError("Maestro shouldn't trigger PCS subscriptions"));
129129
}
130130
Data.Models.Subscription subscription = await _context.Subscriptions.Include(sub => sub.LastAppliedBuild)
131131
.Include(sub => sub.Channel)
@@ -137,13 +137,13 @@ protected async Task<IActionResult> TriggerSubscriptionCore(Guid id, int buildId
137137
// Non-existent build
138138
if (build == null)
139139
{
140-
return BadRequest($"Build {buildId} was not found");
140+
return BadRequest(new ApiError($"Build {buildId} was not found"));
141141
}
142142
// Build doesn't match source repo
143143
if (!(build.GitHubRepository?.Equals(subscription.SourceRepository, StringComparison.InvariantCultureIgnoreCase) == true ||
144144
build.AzureDevOpsRepository?.Equals(subscription.SourceRepository, StringComparison.InvariantCultureIgnoreCase) == true))
145145
{
146-
return BadRequest($"Build {buildId} does not match source repo");
146+
return BadRequest(new ApiError($"Build {buildId} does not match source repo"));
147147
}
148148
}
149149

‎src/Microsoft.DotNet.Darc/Darc/Options/AddBuildToChannelCommandLineOptions.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ internal class AddBuildToChannelCommandLineOptions : CommandLineOptions<AddBuild
5858
[RedactFromLogging]
5959
public string ArtifactPublishingAdditionalParameters { get; set; }
6060

61-
[Option("publish-installers-and-checksums", HelpText = "Whether installers and checksums should be published. This option is ignored")]
62-
public bool PublishInstallersAndChecksums { get; set; }
63-
6461
[Option("skip-assets-publishing", HelpText = "Add the build to the channel without publishing assets to the channel's feeds.")]
6562
public bool SkipAssetsPublishing { get; set; }
6663

‎src/Microsoft.DotNet.Darc/DarcLib/AzureDevOpsClient.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,14 +1328,15 @@ public async Task<AzureDevOpsFeed> GetFeedAndPackagesAsync(string accountName, s
13281328
/// <param name="accountName">Azure DevOps account name</param>
13291329
/// <param name="project">Project that the feed was created in</param>
13301330
/// <param name="feedIdentifier">Name or id of the feed</param>
1331+
/// <param name="includeDeleted">Include deleted packages</param>
13311332
/// <returns>List of packages in the feed</returns>
1332-
public async Task<List<AzureDevOpsPackage>> GetPackagesForFeedAsync(string accountName, string project, string feedIdentifier)
1333+
public async Task<List<AzureDevOpsPackage>> GetPackagesForFeedAsync(string accountName, string project, string feedIdentifier, bool includeDeleted = true)
13331334
{
13341335
JObject content = await ExecuteAzureDevOpsAPIRequestAsync(
13351336
HttpMethod.Get,
13361337
accountName,
13371338
project,
1338-
$"_apis/packaging/feeds/{feedIdentifier}/packages?includeAllVersions=true&includeDeleted=true",
1339+
$"_apis/packaging/feeds/{feedIdentifier}/packages?includeAllVersions=true" + (includeDeleted ? "&includeDeleted=true" : string.Empty),
13391340
_logger,
13401341
versionOverride: "5.1-preview.1",
13411342
baseAddressSubpath: "feeds.");

‎src/Microsoft.DotNet.Darc/DarcLib/IAzureDevOpsClient.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,11 @@ public interface IAzureDevOpsClient
111111
/// Gets all Artifact feeds along with their packages in an Azure DevOps account.
112112
/// </summary>
113113
/// <param name="accountName">Azure DevOps account name.</param>
114+
/// <param name="projectName">Azure DevOps project to get the ID for</param>
115+
/// <param name="feedIdentifier">ID or name of the feed</param>
116+
/// <param name="includeDeleted">Include deleted packages</param>
114117
/// <returns>List of Azure DevOps feeds in the account.</returns>
115-
Task<List<AzureDevOpsPackage>> GetPackagesForFeedAsync(string accountName, string project, string feedIdentifier);
118+
Task<List<AzureDevOpsPackage>> GetPackagesForFeedAsync(string accountName, string projectName, string feedIdentifier, bool includeDeleted = true);
116119

117120
/// <summary>
118121
/// Returns the project ID for a combination of Azure DevOps account and project name

‎src/Microsoft.DotNet.Darc/DarcLib/ILocalGitClient.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ Task<string> BlameLineAsync(
3636
int line,
3737
string? blameFromCommit = null);
3838

39+
/// <summary>
40+
/// Checks if the repository has any working tree changes.
41+
/// </summary>
42+
/// <param name="repoPath">Path to the repository</param>
43+
Task<bool> HasWorkingTreeChangesAsync(string repoPath);
44+
3945
/// <summary>
4046
/// Checkout the repo to the specified state.
4147
/// </summary>

‎src/Microsoft.DotNet.Darc/DarcLib/ILocalGitRepo.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ Task<string> BlameLineAsync(
4747
int line,
4848
string? blameFromCommit = null);
4949

50+
/// <summary>
51+
/// Checks if the repository has any working tree changes.
52+
/// </summary>
53+
Task<bool> HasWorkingTreeChangesAsync();
54+
5055
/// <summary>
5156
/// Checkout the repo to the specified state.
5257
/// </summary>

‎src/Microsoft.DotNet.Darc/DarcLib/LocalGitClient.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,12 @@ public async Task<string> BlameLineAsync(string repoPath, string relativeFilePat
436436
return result.StandardOutput.Trim().Split(' ').First();
437437
}
438438

439+
public async Task<bool> HasWorkingTreeChangesAsync(string repoPath)
440+
{
441+
var result = await _processManager.ExecuteGit(repoPath, ["diff", "--exit-code"]);
442+
return !result.Succeeded;
443+
}
444+
439445
public async Task AddGitAuthHeader(IList<string> args, IDictionary<string, string> envVars, string repoUri)
440446
{
441447
var token = await _remoteConfiguration.GetTokenForRepositoryAsync(repoUri);

‎src/Microsoft.DotNet.Darc/DarcLib/LocalGitRepo.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ public async Task<string> AddRemoteIfMissingAsync(string repoUrl, CancellationTo
3535
public async Task<string> BlameLineAsync(string relativeFilePath, int line, string? blameFromCommit = null)
3636
=> await _localGitClient.BlameLineAsync(Path, relativeFilePath, line, blameFromCommit);
3737

38+
public async Task<bool> HasWorkingTreeChangesAsync()
39+
=> await _localGitClient.HasWorkingTreeChangesAsync(Path);
40+
3841
public async Task CheckoutAsync(string refToCheckout)
3942
=> await _localGitClient.CheckoutAsync(Path, refToCheckout);
4043

‎src/Microsoft.DotNet.Darc/DarcLib/Models/MsBuildPropsFile.cs

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Collections.Generic;
66
using System.IO;
77
using System.Linq;
8+
using System.Text;
89
using System.Xml;
910
using System.Xml.Linq;
1011
using System.Xml.Serialization;
@@ -14,7 +15,16 @@ namespace Microsoft.DotNet.DarcLib.Models;
1415

1516
public interface IMsBuildPropsFile
1617
{
18+
/// <summary>
19+
/// Serializes the properties to an XML file.
20+
/// </summary>
21+
/// <param name="path">Path to the file</param>
1722
void SerializeToXml(string path);
23+
24+
/// <summary>
25+
/// Serializes the properties to an XML string.
26+
/// </summary>
27+
string SerializeToXml();
1828
}
1929

2030
/// <summary>
@@ -53,8 +63,38 @@ public void SerializeToXml(string path)
5363
{
5464
Directory.CreateDirectory(directory);
5565
}
56-
57-
XmlSerializer serializer = new XmlSerializer(typeof(XmlElement));
66+
67+
var settings = new XmlWriterSettings
68+
{
69+
Indent = true,
70+
Encoding = Encoding.UTF8,
71+
};
72+
73+
using var writer = XmlWriter.Create(path, settings);
74+
SerializeToXml(writer);
75+
}
76+
77+
public string SerializeToXml()
78+
{
79+
var settings = new XmlWriterSettings
80+
{
81+
Indent = true,
82+
Encoding = Encoding.UTF8,
83+
};
84+
85+
using var stringWriter = new StringWriter();
86+
using (var writer = XmlWriter.Create(stringWriter, settings))
87+
{
88+
SerializeToXml(writer);
89+
writer.Flush();
90+
}
91+
92+
return stringWriter.ToString();
93+
}
94+
95+
private void SerializeToXml(XmlWriter xmlWriter)
96+
{
97+
var serializer = new XmlSerializer(typeof(XmlElement));
5898
var xmlDocument = new XmlDocument();
5999
XmlElement root = xmlDocument.CreateElement(ProjectPropertyName);
60100
var propertyGroup = xmlDocument.CreateElement(PropertyGroupName);
@@ -65,11 +105,10 @@ public void SerializeToXml(string path)
65105
var settings = new XmlWriterSettings
66106
{
67107
Indent = true,
68-
Encoding = System.Text.Encoding.UTF8,
108+
Encoding = Encoding.UTF8,
69109
};
70110

71-
using var writer = XmlWriter.Create(path, settings);
72-
serializer.Serialize(writer, root);
111+
serializer.Serialize(xmlWriter, root);
73112
}
74113

75114
protected abstract void SerializeProperties(XmlElement propertyGroup, Func<string, XmlElement> createElement);

‎src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/IVmrPatchHandler.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ Task<List<VmrIngestionPatch>> CreatePatches(
3939
UnixPath? applicationPath,
4040
CancellationToken cancellationToken);
4141

42-
IReadOnlyCollection<string> GetVmrPatches(SourceMapping mapping) => GetVmrPatches(mapping.Name);
43-
44-
IReadOnlyCollection<string> GetVmrPatches(string mappingName);
42+
IReadOnlyCollection<VmrIngestionPatch> GetVmrPatches();
4543

4644
Task<IReadOnlyCollection<UnixPath>> GetPatchedFiles(string patchPath, CancellationToken cancellationToken);
4745
}

‎src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/PatchApplicationFailedException.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ namespace Microsoft.DotNet.DarcLib.VirtualMonoRepo;
1010

1111
internal class PatchApplicationFailedException : Exception
1212
{
13-
public PatchApplicationFailedException(VmrIngestionPatch patch, ProcessExecutionResult result)
14-
: base($"Failed to apply the patch {Path.GetFileName(patch.Path)} to {patch.ApplicationPath ?? "/"}."
13+
public PatchApplicationFailedException(VmrIngestionPatch patch, ProcessExecutionResult result, bool reverseApply)
14+
: base($"Failed to {(reverseApply ? "reverse-apply" : "apply")} the patch {Path.GetFileName(patch.Path)} to {patch.ApplicationPath ?? "/"}."
1515
+ Environment.NewLine
1616
+ Environment.NewLine
1717
+ result)

‎src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/PcsVmrForwardFlower.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public PcsVmrForwardFlower(
6060
IAssetLocationResolver assetLocationResolver,
6161
IFileSystem fileSystem,
6262
ILogger<VmrCodeFlower> logger)
63-
: base(vmrInfo, sourceManifest, vmrUpdater, dependencyTracker, vmrCloneManager, dependencyFileManager, repositoryCloneManager, localGitClient, libGit2Client, basicBarClient, localGitRepoFactory, versionDetailsParser, processManager, workBranchFactory, coherencyUpdateResolver, assetLocationResolver, fileSystem, logger)
63+
: base(vmrInfo, sourceManifest, vmrUpdater, dependencyTracker, vmrCloneManager, dependencyFileManager, localGitClient, libGit2Client, basicBarClient, localGitRepoFactory, versionDetailsParser, processManager, coherencyUpdateResolver, assetLocationResolver, fileSystem, logger)
6464
{
6565
_sourceManifest = sourceManifest;
6666
_dependencyTracker = dependencyTracker;

0 commit comments

Comments
 (0)