Skip to content
Merged
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
4 changes: 2 additions & 2 deletions build/common.project.props
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<MicroBuildDirectory>$(SolutionPackagesFolder)microsoft.visualstudioeng.microbuild.core\1.0.0\build\</MicroBuildDirectory>
<MicrosoftDotNetBuildTasksFeedFilePath>$(SolutionPackagesFolder)microsoft.dotnet.build.tasks.feed\6.0.0-beta.20528.5\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Feed.dll</MicrosoftDotNetBuildTasksFeedFilePath>
<MicrosoftDotNetMaestroTasksFilePath>$(SolutionPackagesFolder)microsoft.dotnet.maestro.tasks\1.1.0-beta.21378.2\tools\netcoreapp3.1\Microsoft.DotNet.Maestro.Tasks.dll</MicrosoftDotNetMaestroTasksFilePath>
<NoWarn>$(NoWarn);NU5105;MSB3277</NoWarn>
<NoWarn>$(NoWarn);NU5105;MSB3277;CA1416</NoWarn>
<!-- additional warnings new in .NET 6 that we need to disable when building with source-build -->
<NoWarn Condition="'$(DotNetBuildFromSource)' == 'true'">$(NoWarn);CS1998;CA1416;CS0618;CS1574</NoWarn>
</PropertyGroup>
Expand Down Expand Up @@ -295,7 +295,7 @@
$(RepositoryRootDirectory)src\NuGet.Core\NuGet.Versioning\NuGet.Versioning.csproj;
$(RepositoryRootDirectory)src\NuGet.Core\NuGet.Credentials\NuGet.Credentials.csproj;
$(RepositoryRootDirectory)src\NuGet.Core\NuGet.LibraryModel\\NuGet.LibraryModel.csproj;"/>

<CoreUnitTestProjects Include="$(RepositoryRootDirectory)test\NuGet.Core.Tests\NuGet.Commands.Test\NuGet.Commands.Test.csproj;
$(RepositoryRootDirectory)test\NuGet.Core.Tests\NuGet.Common.Test\NuGet.Common.Test.csproj;
$(RepositoryRootDirectory)test\NuGet.Core.Tests\NuGet.Configuration.Test\NuGet.Configuration.Test.csproj;
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
#nullable enable
NuGet.VisualStudio.Internal.Contracts.TransitivePackageSearchMetadata.AvailableVersionSource.get -> string!
NuGet.VisualStudio.Internal.Contracts.TransitivePackageSearchMetadata.AvailableVersionSource.set -> void
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ public partial class TransitivePackageSearchMetadata : IPackageSearchMetadata

public bool PrefixReserved => _packageSearchMetadata.PrefixReserved;

public string AvailableVersionSource
{
get => _packageSearchMetadata.AvailableVersionSource;
set => _packageSearchMetadata.AvailableVersionSource = value;
}

public LicenseMetadata LicenseMetadata => _packageSearchMetadata.LicenseMetadata;

public IEnumerable<PackageVulnerabilityMetadata> Vulnerabilities => _packageSearchMetadata.Vulnerabilities;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,5 +187,10 @@ public Uri BugTrackerUrl
/// Not applicable to local packages
/// </remarks>
public string PackageScanFlagResult => null;

/// <remarks>
/// Not applicable to local packages
/// </remarks>
public string AvailableVersionSource { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,7 @@ public partial class PackageSearchMetadata : IPackageSearchMetadata
public DateTime? PackageScanResultDate { get; set; }
[JsonIgnore]
public string PackageScanFlagResult { get; set; }
[JsonIgnore]
public string AvailableVersionSource { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public IEnumerable<DownloadCache> DownloadCache
public string PackageScanStatus { get; private set; }
public DateTime? PackageScanResultDate { get; private set; }
public string PackageScanFlagResult { get; private set; }
public string AvailableVersionSource { get; set; }

private void FinishInitialization(V2FeedPackageInfo package)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@ public partial interface IPackageSearchMetadata
string PackageScanStatus { get; }
DateTime? PackageScanResultDate { get; }
string PackageScanFlagResult { get; }

string AvailableVersionSource { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public partial class ClonedPackageSearchMetadata : IPackageSearchMetadata
[Obsolete("PackagePath is recommended in place of PackageReader")]
public Func<PackageReaderBase> PackageReader { get; set; }
public string PackagePath { get; set; }
public string AvailableVersionSource { get; set; }
}

private PackageSearchMetadataBuilder(IPackageSearchMetadata metadata)
Expand Down Expand Up @@ -168,6 +169,7 @@ public IPackageSearchMetadata Build()
PackageScanStatus = _metadata.PackageScanStatus,
PackageScanResultDate = _metadata.PackageScanResultDate,
PackageScanFlagResult = _metadata.PackageScanFlagResult,
AvailableVersionSource = _metadata.AvailableVersionSource

//////////////////////////////////////////////////////////
// End - Chocolatey Specific Modification
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.get -> string
NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.set -> void
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.get -> string
NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.set -> void
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.get -> string
NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.set -> void
NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.get -> string
NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.set -> void
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@ partial class TestPackageSearchMetadata : IPackageSearchMetadata
public string PackageScanStatus { get; set; }
public DateTime? PackageScanResultDate { get; set; }
public string PackageScanFlagResult { get; set; }
public string AvailableVersionSource { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public partial class MockPackageSearchMetadata : IPackageSearchMetadata
public string PackageScanStatus => null;
public DateTime? PackageScanResultDate => null;
public string PackageScanFlagResult => null;
public string AvailableVersionSource => null;
}
}
}