Skip to content
This repository has been archived by the owner on Jul 30, 2024. It is now read-only.
/ NuGet.Jobs Public archive

Update to NuGet client 5.9.1 #986

Merged
merged 1 commit into from
May 24, 2021
Merged

Update to NuGet client 5.9.1 #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- NuGet dependencies shared across projects -->
<PropertyGroup>
<ServerCommonPackageVersion>2.86.0</ServerCommonPackageVersion>
<NuGetClientPackageVersion>5.9.1</NuGetClientPackageVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're practically devs on CPVM at this point

<NuGetGalleryPackageVersion>4.4.5-dev-4633971</NuGetGalleryPackageVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NuGet.Protocol.Catalog/NuGet.Protocol.Catalog.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Version>9.0.1</Version>
</PackageReference>
<PackageReference Include="NuGet.Protocol">
<Version>5.9.0</Version>
<Version>$(NuGetClientPackageVersion)</Version>
</PackageReference>
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NuGet.Services.AzureSearch/Auxiliary2AzureSearch/UpdateDownloadsCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ private void CleanDownloadData(DownloadData data)
foreach (var id in data.Keys.ToList())
{
var isValidId = id.Length <= PackageIdValidator.MaxPackageIdLength
&& PackageIdValidator.IsValidPackageIdWithTimeout(id);
&& PackageIdValidator.IsValidPackageId(id);
if (!isValidId)
{
invalidIdCount++;
Expand Down
29 changes: 0 additions & 29 deletions src/NuGet.Services.AzureSearch/PackageIdValidator.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/NuGet.Services.AzureSearch/SearchService/IndexOperationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ private bool TryGetSinglePackageId(
{
packageId = terms.First();
if (packageId.Length <= PackageIdValidator.MaxPackageIdLength
&& PackageIdValidator.IsValidPackageIdWithTimeout(packageId))
&& PackageIdValidator.IsValidPackageId(packageId))
{
return true;
}
Expand Down Expand Up @@ -183,7 +183,7 @@ private static bool HasInvalidParameters(SearchRequest request, string packageTy
// Requests with bad parameters yield no results. For the package type case, by specification a package type
// valid characters are the same as a package ID.
return request.Skip > MaximumSkip
|| (packageType != null && !PackageIdValidator.IsValidPackageIdWithTimeout(packageType));
|| (packageType != null && !PackageIdValidator.IsValidPackageId(packageType));
}

private static bool PagedToFirstItem(SearchRequest request)
Expand Down
6 changes: 3 additions & 3 deletions src/NuGet.Services.AzureSearch/SearchService/SearchParametersBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class SearchParametersBuilder : ISearchParametersBuilder
private static readonly List<string> CreatedAsc = new List<string> { IndexFields.Created + Asc }; // Newest first
private static readonly List<string> CreatedDesc = new List<string> { IndexFields.Created + Desc }; // Oldest first
private static readonly List<string> TotalDownloadsAsc = new List<string> { IndexFields.Search.TotalDownloadCount + Asc, IndexFields.Created + Asc }; // Least downloads first, then oldest
private static readonly List<string> TotalDownloadsDesc = new List<string> { IndexFields.Search.TotalDownloadCount + Desc, IndexFields.Created + Desc}; // Most downloads first, then newest
private static readonly List<string> TotalDownloadsDesc = new List<string> { IndexFields.Search.TotalDownloadCount + Desc, IndexFields.Created + Desc }; // Most downloads first, then newest

public SearchParameters LastCommitTimestamp()
{
Expand Down Expand Up @@ -104,7 +104,7 @@ public SearchParameters Autocomplete(AutocompleteRequest request, bool isDefault
searchParameters.Select = PackageIdsAutocompleteSelect;
ApplyPaging(searchParameters, request);
break;

// Package version autocomplete should only match a single document
// regardless of the request's parameters.
case AutocompleteRequestType.PackageVersions:
Expand Down Expand Up @@ -153,7 +153,7 @@ private void ApplySearchIndexFilter(

// Verify that the package type only has valid package ID characters so we don't need to worry about
// escaping quotes and such.
if (packageType != null && PackageIdValidator.IsValidPackageIdWithTimeout(packageType))
if (packageType != null && PackageIdValidator.IsValidPackageId(packageType))
{
filterString += $" and {IndexFields.Search.FilterablePackageTypes}/any(p: p eq '{packageType.ToLowerInvariant()}')";
}
Expand Down
2 changes: 1 addition & 1 deletion src/NuGet.Services.AzureSearch/SearchService/SearchTextBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private static IEnumerable<string> ProcessFieldValues(QueryField field, IEnumera
private static bool IsId(string query)
{
return query.Length <= PackageIdValidator.MaxPackageIdLength
&& PackageIdValidator.IsValidPackageIdWithTimeout(query);
&& PackageIdValidator.IsValidPackageId(query);
}

private static bool IsIdWithSeparator(string query)
Expand Down
2 changes: 1 addition & 1 deletion src/Stats.CreateAzureCdnWarehouseReports/Stats.CreateAzureCdnWarehouseReports.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<Version>5.8.4</Version>
</PackageReference>
<PackageReference Include="NuGet.Versioning">
<Version>5.9.0</Version>
<Version>$(NuGetClientPackageVersion)</Version>
</PackageReference>
<PackageReference Include="MicroBuild.Core">
<Version>0.3.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/Stats.ImportAzureCdnStatistics/Stats.ImportAzureCdnStatistics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<Version>5.8.4</Version>
</PackageReference>
<PackageReference Include="NuGet.Versioning">
<Version>5.9.0</Version>
<Version>$(NuGetClientPackageVersion)</Version>
</PackageReference>
<PackageReference Include="MicroBuild.Core">
<Version>0.3.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/Stats.LogInterpretation/Stats.LogInterpretation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Version>11.0.2</Version>
</PackageReference>
<PackageReference Include="NuGet.Versioning">
<Version>5.9.0</Version>
<Version>$(NuGetClientPackageVersion)</Version>
</PackageReference>
<PackageReference Include="UAParser">
<Version>3.1.44</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/Validation.Common.Job/Validation.Common.Job.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="NuGet.Packaging">
<Version>5.9.0</Version>
<Version>$(NuGetClientPackageVersion)</Version>
</PackageReference>
<PackageReference Include="NuGetGallery.Core">
<Version>$(NuGetGalleryPackageVersion)</Version>
Expand Down
2 changes: 1 addition & 1 deletion ...et.Services.AzureSearch.FunctionalTests/NuGet.Services.AzureSearch.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<Version>$(ServerCommonPackageVersion)</Version>
</PackageReference>
<PackageReference Include="NuGet.Versioning">
<Version>5.9.0</Version>
<Version>$(NuGetClientPackageVersion)</Version>
</PackageReference>
<PackageReference Include="xunit">
<Version>2.4.1</Version>
Expand Down
1 change: 0 additions & 1 deletion tests/NuGet.Services.AzureSearch.Tests/NuGet.Services.AzureSearch.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
<Compile Include="Models\CommittedDocumentFacts.cs" />
<Compile Include="AuxiliaryFiles\OwnerDataClientFacts.cs" />
<Compile Include="DependencyInjectionExtensionsFacts.cs" />
<Compile Include="PackageIdValidatorFacts.cs" />
<Compile Include="SearchIndexActionBuilderFacts.cs" />
<Compile Include="Auxiliary2AzureSearch\UpdateOwnersCommandFacts.cs" />
<Compile Include="Auxiliary2AzureSearch\DataSetComparerFacts.cs" />
Expand Down
168 changes: 0 additions & 168 deletions tests/NuGet.Services.AzureSearch.Tests/PackageIdValidatorFacts.cs
View file
Open in desktop

This file was deleted.