Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change CacheFile.LogMessages type to Ilist<AssetsLogMessage> #6132

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using NuGet.Common;
Expand All @@ -22,7 +23,7 @@ public NoOpRestoreResult(bool success, string lockFilePath, Lazy<LockFile> lockF
cacheFile: cacheFile, cacheFilePath: cacheFilePath, packagesLockFilePath: null, packagesLockFile: null, dependencyGraphSpecFilePath: null, dependencyGraphSpec: null, projectStyle: projectStyle, elapsedTime: elapsedTime)
{
_lockFileLazy = lockFileLazy ?? throw new ArgumentNullException(nameof(lockFileLazy));
LogMessages = cacheFile?.LogMessages ?? new List<IAssetsLogMessage>();
LogMessages = cacheFile?.LogMessages?.Cast<IAssetsLogMessage>().ToList() ?? new List<IAssetsLogMessage>();
}

public override LockFile LockFile => _lockFileLazy.Value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ await _logger.LogAsync(RestoreLogMessage.CreateWarning(NuGetLogCode.NU1803,
{
cacheFile.Success = _success;
cacheFile.ProjectFilePath = _request.Project.FilePath;
cacheFile.LogMessages = assetsFile.LogMessages;
cacheFile.LogMessages = assetsFile.LogMessages.Select(m => (AssetsLogMessage)m).ToList();
cacheFile.ExpectedPackageFilePaths = NoOpRestoreUtilities.GetRestoreOutput(_request, assetsFile);
telemetry.TelemetryEvent[TotalUniquePackagesCount] = cacheFile?.ExpectedPackageFilePaths.Count;
}
Expand Down
2 changes: 1 addition & 1 deletion src/NuGet.Core/NuGet.ProjectModel/CacheFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public bool HasAnyMissingPackageFiles
/// </summary>
public string ProjectFilePath { get; set; }

public IList<IAssetsLogMessage> LogMessages { get; set; }
public IList<AssetsLogMessage> LogMessages { get; set; }

public bool IsValid { get { return Version == CurrentVersion && Success && DgSpecHash != null; } }

Expand Down
12 changes: 6 additions & 6 deletions src/NuGet.Core/NuGet.ProjectModel/LockFile/LockFileFormat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ private static LockFile ReadLockFile(JObject cursor, string path, LockFileReadFl

var logMessage = (flags & LockFileReadFlags.LogMessages) == LockFileReadFlags.LogMessages
? ReadLogMessageArray(cursor[LogsProperty] as JArray, packagesSpec?.RestoreMetadata?.ProjectPath)
: Array.Empty<IAssetsLogMessage>();
: Array.Empty<AssetsLogMessage>();

var lockFile = new LockFile()
{
Expand All @@ -259,7 +259,7 @@ private static LockFile ReadLockFile(JObject cursor, string path, LockFileReadFl
CentralTransitiveDependencyGroups = centralTransitiveDependencyGroups
};

lockFile.LogMessages = logMessage;
lockFile.LogMessages = logMessage?.Cast<IAssetsLogMessage>().ToList();

return lockFile;
}
Expand Down Expand Up @@ -493,7 +493,7 @@ private static void WriteLogMessage(JsonWriter writer, IAssetsLogMessage logMess
/// </summary>
/// <param name="json"><code>JObject</code> containg the json representation of the log message.</param>
/// <returns><code>IAssetsLogMessage</code> representing the log message.</returns>
private static IAssetsLogMessage ReadLogMessage(JObject json, string projectPath)
private static AssetsLogMessage ReadLogMessage(JObject json, string projectPath)
{
AssetsLogMessage assetsLogMessage = null;

Expand Down Expand Up @@ -905,14 +905,14 @@ private static IList<TItem> ReadArray<TItem>(JArray json, Func<JToken, TItem> re
return items;
}

internal static IList<IAssetsLogMessage> ReadLogMessageArray(JArray json, string projectPath)
internal static IList<AssetsLogMessage> ReadLogMessageArray(JArray json, string projectPath)
{
if (json == null)
{
return new List<IAssetsLogMessage>();
return new List<AssetsLogMessage>();
}

var items = new List<IAssetsLogMessage>(json.Count);
var items = new List<AssetsLogMessage>(json.Count);
foreach (var child in json)
{
var logMessage = ReadLogMessage(child as JObject, projectPath);
Expand Down
1 change: 0 additions & 1 deletion src/NuGet.Core/NuGet.ProjectModel/PublicAPI.Shipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ NuGet.ProjectModel.CacheFile
NuGet.ProjectModel.CacheFile.HasAnyMissingPackageFiles.get -> bool
NuGet.ProjectModel.CacheFile.HasAnyMissingPackageFiles.set -> void
NuGet.ProjectModel.CacheFile.IsValid.get -> bool
~NuGet.ProjectModel.CacheFile.LogMessages.get -> System.Collections.Generic.IList<NuGet.ProjectModel.IAssetsLogMessage>
~NuGet.ProjectModel.CacheFile.LogMessages.set -> void
~NuGet.ProjectModel.CacheFile.ProjectFilePath.get -> string
~NuGet.ProjectModel.CacheFile.ProjectFilePath.set -> void
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#nullable enable
NuGet.ProjectModel.TargetFrameworkInformation.AssetTargetFallback.init -> void
NuGet.ProjectModel.TargetFrameworkInformation.Warn.init -> void
~NuGet.ProjectModel.CacheFile.LogMessages.get -> System.Collections.Generic.IList<NuGet.ProjectModel.AssetsLogMessage>
~NuGet.ProjectModel.TargetFrameworkInformation.CentralPackageVersions.get -> System.Collections.Generic.IReadOnlyDictionary<string, NuGet.LibraryModel.CentralPackageVersion>
~NuGet.ProjectModel.TargetFrameworkInformation.CentralPackageVersions.init -> void
~NuGet.ProjectModel.TargetFrameworkInformation.Dependencies.get -> System.Collections.Immutable.ImmutableArray<NuGet.LibraryModel.LibraryDependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public void WhenRestoreResult_LogMessagesAreSourcedFromTheAssetsFile()
var cacheFile = new CacheFile("hash")
{
Success = true,
LogMessages = new List<IAssetsLogMessage>() { cacheLogMessage },
LogMessages = new List<AssetsLogMessage>() { cacheLogMessage },
};

// Act
Expand Down Expand Up @@ -382,7 +382,7 @@ public void WhenNoOpRestoreResult_LogMessagesAreSourcedFromTheCacheFile()
var cacheFile = new CacheFile("hash")
{
Success = true,
LogMessages = new List<IAssetsLogMessage>() { cacheLogMessage },
LogMessages = new List<AssetsLogMessage>() { cacheLogMessage },
};

// Act
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void Write_WhenVersionIsCurrentVersion_WritesCorrectly()
file1,
file2
},
LogMessages = new List<IAssetsLogMessage>
LogMessages = new List<AssetsLogMessage>
{
new AssetsLogMessage(LogLevel.Information, NuGetLogCode.NU1000, "Test")
}
Expand Down