Skip to content

Commit 47e9f53

Browse files
SimonZhao888SimonZhao888
authored
Merge pull request #9449 from dotnet/merge/release/10.0.2xx-to-main
[automated] Merge branch 'release/10.0.2xx' => 'main'
2 parents 02d52a0 + fa2e52f commit 47e9f53

File tree

10 files changed

+37
-37
lines changed

10 files changed

+37
-37
lines changed

‎src/Microsoft.TemplateEngine.Abstractions/Installer/InstallRequest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public InstallRequest(string identifier, string? version = null, string? install
2424
/// <summary>
2525
/// Name to be used when display the request.
2626
/// </summary>
27-
public string DisplayName => string.IsNullOrWhiteSpace(Version) ? PackageIdentifier : $"{PackageIdentifier}::{Version}";
27+
public string DisplayName => string.IsNullOrWhiteSpace(Version) ? PackageIdentifier : $"{PackageIdentifier}@{Version}";
2828

2929
/// <summary>
3030
/// Installer to be used to install the request.

‎src/Microsoft.TemplateEngine.Edge/Installers/NuGet/Exceptions/DownloadException.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ namespace Microsoft.TemplateEngine.Edge.Installers.NuGet
55
{
66
internal class DownloadException : Exception
77
{
8-
public DownloadException(string packageIdentifier, string packageVersion, string filePath) : base($"Failed to download {packageIdentifier}::{packageVersion} from {filePath}")
8+
public DownloadException(string packageIdentifier, string packageVersion, string filePath) : base($"Failed to download {packageIdentifier}@{packageVersion} from {filePath}")
99
{
1010
PackageIdentifier = packageIdentifier;
1111
PackageVersion = packageVersion;
1212
PackageLocation = filePath;
1313
}
1414

15-
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources) : base($"Failed to download {packageIdentifier}::{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}")
15+
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources) : base($"Failed to download {packageIdentifier}@{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}")
1616
{
1717
PackageIdentifier = packageIdentifier;
1818
PackageVersion = packageVersion;
1919
SourcesList = attemptedSources;
2020
}
2121

22-
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources, Exception inner) : base($"Failed to download {packageIdentifier}::{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}", inner)
22+
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources, Exception inner) : base($"Failed to download {packageIdentifier}@{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}", inner)
2323
{
2424
PackageIdentifier = packageIdentifier;
2525
PackageVersion = packageVersion;

‎src/Microsoft.TemplateEngine.Edge/Installers/NuGet/Exceptions/PackageNotFoundException.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ internal class PackageNotFoundException : Exception
1313
SourcesList = attemptedSources;
1414
}
1515

16-
public PackageNotFoundException(string packageIdentifier, NuGetVersion packageVersion, IEnumerable<string> attemptedSources) : base($"{packageIdentifier}::{packageVersion} was not found in NuGet feeds {string.Join(";", attemptedSources)}")
16+
public PackageNotFoundException(string packageIdentifier, NuGetVersion packageVersion, IEnumerable<string> attemptedSources) : base($"{packageIdentifier}@{packageVersion} was not found in NuGet feeds {string.Join(";", attemptedSources)}")
1717
{
1818
PackageIdentifier = packageIdentifier;
1919
PackageVersion = packageVersion;

‎src/Microsoft.TemplateEngine.Edge/Installers/NuGet/NuGetManagedTemplatePackage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private NuGetManagedTemplatePackage(
8686

8787
public IManagedTemplatePackageProvider ManagedProvider { get; }
8888

89-
public string DisplayName => string.IsNullOrWhiteSpace(Version) ? Identifier : $"{Identifier}::{Version}";
89+
public string DisplayName => string.IsNullOrWhiteSpace(Version) ? Identifier : $"{Identifier}@{Version}";
9090

9191
public string Identifier => Details[PackageIdKey];
9292

‎src/Microsoft.TemplateEngine.Edge/Installers/NuGet/NugetApiPackageManager.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ await GetLatestVersionInternalAsync(
137137
_nugetLogger.LogWarning(
138138
string.Format(
139139
LocalizableStrings.NuGetApiPackageManager_Warning_FailedToDownload,
140-
$"{packageMetadata.Identity.Id}::{packageMetadata.Identity.Version}",
140+
$"{packageMetadata.Identity.Id}@{packageMetadata.Identity.Version}",
141141
source.Source));
142142
try
143143
{
@@ -159,7 +159,7 @@ await GetLatestVersionInternalAsync(
159159
_nugetLogger.LogWarning(
160160
string.Format(
161161
LocalizableStrings.NuGetApiPackageManager_Warning_FailedToDownload,
162-
$"{packageMetadata.Identity.Id}::{packageMetadata.Identity.Version}",
162+
$"{packageMetadata.Identity.Id}@{packageMetadata.Identity.Version}",
163163
source.Source));
164164
_nugetLogger.LogDebug($"Details: {e}.");
165165
try
@@ -335,13 +335,13 @@ await Task.WhenAll(
335335
NugetPackageMetadata? matchedVersion = foundPackages.FirstOrDefault(package => package.Identity.Version == packageVersion);
336336
if (matchedVersion != null)
337337
{
338-
_nugetLogger.LogDebug($"{packageIdentifier}::{packageVersion} was found in {foundSource.Source}.");
338+
_nugetLogger.LogDebug($"{packageIdentifier}@{packageVersion} was found in {foundSource.Source}.");
339339
linkedCts.Cancel();
340340
return (foundSource, matchedVersion);
341341
}
342342
else
343343
{
344-
_nugetLogger.LogDebug($"{packageIdentifier}::{packageVersion} is not found in NuGet feed {foundSource.Source}.");
344+
_nugetLogger.LogDebug($"{packageIdentifier}@{packageVersion} is not found in NuGet feed {foundSource.Source}.");
345345
}
346346
}
347347
if (!atLeastOneSourceValid)
@@ -351,7 +351,7 @@ await Task.WhenAll(
351351
_nugetLogger.LogWarning(
352352
string.Format(
353353
LocalizableStrings.NuGetApiPackageManager_Warning_PackageNotFound,
354-
$"{packageIdentifier}::{packageVersion}",
354+
$"{packageIdentifier}@{packageVersion}",
355355
string.Join(", ", sources.Select(source => source.Source))));
356356
throw new PackageNotFoundException(packageIdentifier, packageVersion, sources.Select(source => source.Source));
357357
}

‎test/Microsoft.TemplateEngine.Edge.UnitTests/NuGetInstallerTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public async Task Install_LocalPackage()
156156
source.Owners.Should().BeNull();
157157
source.Reserved.Should().Be("False");
158158
source.Version.Should().NotBeNullOrEmpty();
159-
source.DisplayName.Should().StartWith("Microsoft.TemplateEngine.TestTemplates::");
159+
source.DisplayName.Should().StartWith("Microsoft.TemplateEngine.TestTemplates@");
160160
source.Identifier.Should().Be("Microsoft.TemplateEngine.TestTemplates");
161161
source.Installer.Should().Be(installer);
162162
source.IsLocalPackage.Should().Be(true);
@@ -239,7 +239,7 @@ public async Task Install_RemotePackage()
239239
source.Owners.Should().Be("Microsoft");
240240
source.Reserved.Should().Be("True");
241241
source.Version.Should().Be("1.0.0");
242-
source.DisplayName.Should().Be("Microsoft.TemplateEngine.TestTemplates::1.0.0");
242+
source.DisplayName.Should().Be("Microsoft.TemplateEngine.TestTemplates@1.0.0");
243243
source.Identifier.Should().Be("Microsoft.TemplateEngine.TestTemplates");
244244
source.Installer.Should().Be(installer);
245245
source.IsLocalPackage.Should().Be(false);
@@ -447,7 +447,7 @@ public async Task Update_RemotePackage()
447447
updatedSource!.MountPointUri.Should().ContainAll(new[] { installPath, "Microsoft.TemplateEngine.TestTemplates" });
448448
updatedSource.Author.Should().Be("Microsoft");
449449
updatedSource.Version.Should().Be("1.0.1");
450-
updatedSource.DisplayName.Should().Be("Microsoft.TemplateEngine.TestTemplates::1.0.1");
450+
updatedSource.DisplayName.Should().Be("Microsoft.TemplateEngine.TestTemplates@1.0.1");
451451
updatedSource.Identifier.Should().Be("Microsoft.TemplateEngine.TestTemplates");
452452
updatedSource.Installer.Should().Be(installer);
453453
updatedSource.IsLocalPackage.Should().Be(false);
@@ -514,7 +514,7 @@ public void Deserialize(
514514
source.Reserved.Should().Be(reserved);
515515
source.Owners.Should().Be(owners);
516516
source.Version.Should().Be(version);
517-
source.DisplayName.Should().Be($"{identifier}::{version}");
517+
source.DisplayName.Should().Be($"{identifier}@{version}");
518518
source.Identifier.Should().Be(identifier);
519519
source.Installer.Should().Be(installer);
520520
source.IsLocalPackage.Should().Be(local);

‎test/Microsoft.TemplateEngine.TestHelper/PackageManager.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ internal async Task<string> DownloadPackageAsync(
185185
}
186186
else
187187
{
188-
_nugetLogger.LogDebug($"[NuGet Package Manager] Getting package metadata {identifier}::{version}.");
188+
_nugetLogger.LogDebug($"[NuGet Package Manager] Getting package metadata {identifier}@{version}.");
189189
packageVersion = new NuGetVersion(version!);
190190
(source, packageMetadata) = await GetPackageMetadataAsync(identifier, packageVersion, packagesSources, cancellationToken);
191191
}
@@ -284,7 +284,7 @@ await Task.WhenAll(
284284

285285
return current.package.Identity.Version > max.package.Identity.Version ? current : max;
286286
});
287-
_nugetLogger.LogDebug($"[NuGet Package Manager] Latest version is {latestVersion.Item2.Identity.Id}::{latestVersion.Item2.Identity.Version}, source: {latestVersion.Item1.Source}.");
287+
_nugetLogger.LogDebug($"[NuGet Package Manager] Latest version is {latestVersion.Item2.Identity.Id}@{latestVersion.Item2.Identity.Version}, source: {latestVersion.Item1.Source}.");
288288
return latestVersion;
289289
}
290290

@@ -321,7 +321,7 @@ await Task.WhenAll(
321321
IPackageSearchMetadata? matchedVersion = foundPackages!.FirstOrDefault(package => package.Identity.Version == packageVersion);
322322
if (matchedVersion != null)
323323
{
324-
_nugetLogger.LogDebug($"[NuGet Package Manager] Processed source {foundSource.Source}, found {matchedVersion.Identity.Id}:: {matchedVersion.Identity.Version} package, cancelling other tasks.");
324+
_nugetLogger.LogDebug($"[NuGet Package Manager] Processed source {foundSource.Source}, found {matchedVersion.Identity.Id}@{matchedVersion.Identity.Version} package, cancelling other tasks.");
325325
linkedCts.Cancel();
326326
return (foundSource, matchedVersion);
327327
}

‎test/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public async Task CanDetectNewPackagesInDiffMode()
190190
.And.HaveStdOutContaining(
191191
@"Template packages:
192192
new: 1
193-
Test.Templates::1.0.0
193+
Test.Templates@1.0.0
194194
updated: 0
195195
removed: 0
196196
not changed: 0")
@@ -231,7 +231,7 @@ public async Task CanDetectNewPackagesInDiffMode()
231231
.And.HaveStdOutContaining(
232232
@"Template packages:
233233
new: 1
234-
Microsoft.Azure.WebJobs.ProjectTemplates::1.0.0
234+
Microsoft.Azure.WebJobs.ProjectTemplates@1.0.0
235235
updated: 0
236236
removed: 0
237237
not changed: 1")
@@ -278,7 +278,7 @@ public void CanDetectUpdatedPackagesInDiffMode()
278278
.And.HaveStdOutContaining(
279279
@"Template packages:
280280
new: 1
281-
Test.Templates::1.0.0
281+
Test.Templates@1.0.0
282282
updated: 0
283283
removed: 0
284284
not changed: 0")
@@ -365,7 +365,7 @@ public void CanDetectRemovedPackagesInDiffMode()
365365
.And.HaveStdOutContaining(
366366
@"Template packages:
367367
new: 1
368-
Test.Templates::1.0.0
368+
Test.Templates@1.0.0
369369
updated: 0
370370
removed: 0
371371
not changed: 0")
@@ -406,7 +406,7 @@ public void CanDetectRemovedPackagesInDiffMode()
406406
new: 0
407407
updated: 0
408408
removed: 1
409-
Test.Templates::1.0.0
409+
Test.Templates@1.0.0
410410
not changed: 0")
411411
.And.HaveStdOutContaining(
412412
@"Non template packages:
@@ -416,7 +416,7 @@ public void CanDetectRemovedPackagesInDiffMode()
416416
not changed: 0")
417417
.And.HaveStdOutContaining(
418418
@"[Error]: the following 1 packages were removed
419-
Test.Templates::1.0.0
419+
Test.Templates@1.0.0
420420
Checking template packages via API:
421421
Package Test.Templates was unlisted.");
422422

‎tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/AdditionalDataExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ internal static class AdditionalDataExtensions
2727
}
2828
catch (Exception ex)
2929
{
30-
Verbose.WriteLine($"Failed to produce additional data for {package.Name}::{package.Version} with producer {producer.DataUniqueName}, details: {ex}");
30+
Verbose.WriteLine($"Failed to produce additional data for {package.Name}@{package.Version} with producer {producer.DataUniqueName}, details: {ex}");
3131
}
3232
}
3333
if (additionalData.Any())

‎tools/Microsoft.TemplateSearch.TemplateDiscovery/PackChecking/PackSourceChecker.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private async Task ProcessTemplatePackagesUsingSearchAsync(
9797
count = ProcessCount(count);
9898
if (newCache.ContainsKey(sourceInfo.Name) || filteredPackages.ContainsKey(sourceInfo.Name))
9999
{
100-
Verbose.WriteLine($"Package {sourceInfo.Name}::{sourceInfo.Version} is already processed.");
100+
Verbose.WriteLine($"Package {sourceInfo.Name}@{sourceInfo.Version} is already processed.");
101101
continue;
102102
}
103103
string? oldTemplateVersion = null;
@@ -209,7 +209,7 @@ private async Task CheckRemovedPackagesAsync(
209209
IDownloadedPackInfo? packInfo = await provider.DownloadPackageAsync(package, cancellationToken).ConfigureAwait(false);
210210
if (packInfo == null)
211211
{
212-
Console.WriteLine($"[Error] Package {package.Name}::{package.Version} is not processed.");
212+
Console.WriteLine($"[Error] Package {package.Name}@{package.Version} is not processed.");
213213
continue;
214214
}
215215
if (CheckIfPackageIsFiltered(packInfo, filteredPackages, scanningStats, null, oldNonTemplateVersion))
@@ -233,7 +233,7 @@ private bool CheckIfVersionIsKnownTemplatePackage(
233233
{
234234
if (sourceInfo.Version == existingInfo.Version)
235235
{
236-
Verbose.WriteLine($"Package {sourceInfo.Name}::{sourceInfo.Version} has not changed since last scan, updating metadata only.");
236+
Verbose.WriteLine($"Package {sourceInfo.Name}@{sourceInfo.Version} has not changed since last scan, updating metadata only.");
237237
newCache[sourceInfo.Name] = new TemplatePackageSearchData(sourceInfo, existingInfo.Templates, sourceInfo.ProduceAdditionalData(_additionalDataProducers));
238238

239239
scanningStats.SameTemplatePacksCount++;
@@ -258,7 +258,7 @@ private bool CheckIfVersionIsKnownNonTemplatePackage(
258258
{
259259
if (sourceInfo.Version == info.Version)
260260
{
261-
Verbose.WriteLine($"Package {sourceInfo.Name}::{sourceInfo.Version} has not changed since last scan, skipping as it was filtered last time.");
261+
Verbose.WriteLine($"Package {sourceInfo.Name}@{sourceInfo.Version} has not changed since last scan, skipping as it was filtered last time.");
262262
filteredPackages[sourceInfo.Name] = info;
263263
scanningStats.SameNonTemplatePacksCount++;
264264
return true;
@@ -296,7 +296,7 @@ private async Task ProcessTemplatePackageAsync(
296296
CancellationToken cancellationToken)
297297
{
298298
IEnumerable<TemplateSearchData> foundTemplates = await TryGetTemplatesInPackAsync(sourceInfo, _additionalDataProducers, cancellationToken).ConfigureAwait(false);
299-
Verbose.WriteLine($"{sourceInfo.Name}::{sourceInfo.Version} is processed");
299+
Verbose.WriteLine($"{sourceInfo.Name}@{sourceInfo.Version} is processed");
300300
if (foundTemplates.Any())
301301
{
302302
Verbose.WriteLine("Found templates:");
@@ -346,7 +346,7 @@ private void ProcessNonTemplatePackage(
346346
string? oldTemplatePackageVersion,
347347
string? oldNonTemplatePackageVersion)
348348
{
349-
Verbose.WriteLine($"{sourceInfo.Name}::{sourceInfo.Version} is skipped, {filterReason}");
349+
Verbose.WriteLine($"{sourceInfo.Name}@{sourceInfo.Version} is skipped, {filterReason}");
350350
filteredPackages[sourceInfo.Name] = new FilteredPackageInfo(sourceInfo, filterReason);
351351
if (string.IsNullOrWhiteSpace(oldNonTemplatePackageVersion))
352352
{
@@ -396,7 +396,7 @@ private async Task<IEnumerable<TemplateSearchData>> TryGetTemplatesInPackAsync(I
396396
}
397397
catch (Exception ex)
398398
{
399-
Console.WriteLine("Failed to read package {0}::{1}, details: {2}. The package will be skipped.", packInfo.Name, packInfo.Version, ex);
399+
Console.WriteLine("Failed to read package {0}@{1}, details: {2}. The package will be skipped.", packInfo.Name, packInfo.Version, ex);
400400
return [];
401401
}
402402
}
@@ -428,15 +428,15 @@ private async Task<IEnumerable<TemplateSearchData>> TryGetTemplatesInPackAsync(I
428428
Console.WriteLine($"[Error]: the following {removedTemplatePacks.Count} packages were removed");
429429
foreach (var package in removedTemplatePacks)
430430
{
431-
Console.WriteLine($" {package.Name}::{package.Version}");
431+
Console.WriteLine($" {package.Name}@{package.Version}");
432432
}
433433
}
434434
if (removedNonTemplatePacks.Any())
435435
{
436436
Console.WriteLine($"[Error]: the following {removedNonTemplatePacks.Count} non template packages were removed");
437437
foreach (var package in removedNonTemplatePacks)
438438
{
439-
Console.WriteLine($" {package.Name}::{package.Version}");
439+
Console.WriteLine($" {package.Name}@{package.Version}");
440440
}
441441
}
442442
return (removedTemplatePacks, removedNonTemplatePacks);
@@ -449,7 +449,7 @@ private void DisplayScanningStats(ScanningStats scanningStats)
449449
Console.WriteLine($" new: {scanningStats.NewTemplatePacks.Count}");
450450
foreach (var package in scanningStats.NewTemplatePacks)
451451
{
452-
Console.WriteLine($" {package.Name}::{package.Version}");
452+
Console.WriteLine($" {package.Name}@{package.Version}");
453453
}
454454

455455
Console.WriteLine($" updated: {scanningStats.UpdatedTemplatePacks.Count}");
@@ -461,14 +461,14 @@ private void DisplayScanningStats(ScanningStats scanningStats)
461461
Console.WriteLine($" removed: {scanningStats.RemovedTemplatePacks.Count}");
462462
foreach (var package in scanningStats.RemovedTemplatePacks)
463463
{
464-
Console.WriteLine($" {package.Name}::{package.Version}");
464+
Console.WriteLine($" {package.Name}@{package.Version}");
465465
}
466466
if (scanningStats.BecameTemplatePacks.Any())
467467
{
468468
Console.WriteLine($" became template packages: {scanningStats.BecameTemplatePacks.Count}");
469469
foreach (var package in scanningStats.BecameTemplatePacks)
470470
{
471-
Console.WriteLine($" {package.Name}::{package.Version}");
471+
Console.WriteLine($" {package.Name}@{package.Version}");
472472
}
473473
}
474474
Console.WriteLine($" not changed: {scanningStats.SameTemplatePacksCount}");

0 commit comments

Comments
 (0)