NuGet · loic-sharma · Apr 24, 2021 · Apr 26, 2021 · May 20, 2021 · May 20, 2021
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,6 +3,7 @@
   <!-- NuGet dependencies shared across projects -->
   <PropertyGroup>
     <ServerCommonPackageVersion>2.86.0</ServerCommonPackageVersion>
+    <NuGetClientPackageVersion>5.9.1</NuGetClientPackageVersion>
     <NuGetGalleryPackageVersion>4.4.5-dev-4633971</NuGetGalleryPackageVersion>
   </PropertyGroup>
 

diff --git a/src/NuGet.Protocol.Catalog/NuGet.Protocol.Catalog.csproj b/src/NuGet.Protocol.Catalog/NuGet.Protocol.Catalog.csproj
@@ -15,7 +15,7 @@
       <Version>9.0.1</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Protocol">
-      <Version>5.9.0</Version>
+      <Version>$(NuGetClientPackageVersion)</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/src/NuGet.Services.AzureSearch/Auxiliary2AzureSearch/UpdateDownloadsCommand.cs b/src/NuGet.Services.AzureSearch/Auxiliary2AzureSearch/UpdateDownloadsCommand.cs
@@ -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++;

diff --git a/src/NuGet.Services.AzureSearch/PackageIdValidator.cs b/src/NuGet.Services.AzureSearch/PackageIdValidator.cs
diff --git a/src/NuGet.Services.AzureSearch/SearchService/IndexOperationBuilder.cs b/src/NuGet.Services.AzureSearch/SearchService/IndexOperationBuilder.cs
@@ -150,7 +150,7 @@ private bool TryGetSinglePackageId(
             {
                 packageId = terms.First();
                 if (packageId.Length <= PackageIdValidator.MaxPackageIdLength
-                    && PackageIdValidator.IsValidPackageIdWithTimeout(packageId))
+                    && PackageIdValidator.IsValidPackageId(packageId))
                 {
                     return true;
                 }
@@ -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)

diff --git a/src/NuGet.Services.AzureSearch/SearchService/Models/V3SearchPackage.cs b/src/NuGet.Services.AzureSearch/SearchService/Models/V3SearchPackage.cs
@@ -64,6 +64,10 @@ public class V3SearchPackage
         [JsonPropertyName("authors")]
         public string[] Authors { get; set; }
 
+        [JsonProperty("owners")]
+        [JsonPropertyName("owners")]
+        public string[] Owners { get; set; }
+
         [JsonProperty("totalDownloads")]
         [JsonPropertyName("totalDownloads")]
         public long TotalDownloads { get; set; }

diff --git a/src/NuGet.Services.AzureSearch/SearchService/SearchParametersBuilder.cs b/src/NuGet.Services.AzureSearch/SearchService/SearchParametersBuilder.cs
@@ -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()
         {
@@ -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:
@@ -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()}')";
             }

diff --git a/src/NuGet.Services.AzureSearch/SearchService/SearchResponseBuilder.cs b/src/NuGet.Services.AzureSearch/SearchService/SearchResponseBuilder.cs
@@ -377,6 +377,7 @@ private V3SearchPackage ToV3SearchPackage(SearchDocument.Full result, string reg
                 ProjectUrl = result.ProjectUrl,
                 Tags = result.Tags ?? Array.Empty<string>(),
                 Authors = new[] { result.Authors ?? string.Empty },
+                Owners = result.Owners ?? Array.Empty<string>(),
                 TotalDownloads = AuxiliaryData.GetTotalDownloadCount(result.PackageId),
                 Verified = AuxiliaryData.IsVerified(result.PackageId),
                 PackageTypes = GetV3SearchPackageTypes(result),

diff --git a/src/NuGet.Services.AzureSearch/SearchService/SearchTextBuilder.cs b/src/NuGet.Services.AzureSearch/SearchService/SearchTextBuilder.cs
@@ -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)

diff --git a/src/Stats.CreateAzureCdnWarehouseReports/Stats.CreateAzureCdnWarehouseReports.csproj b/src/Stats.CreateAzureCdnWarehouseReports/Stats.CreateAzureCdnWarehouseReports.csproj
@@ -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>

diff --git a/src/Stats.ImportAzureCdnStatistics/Stats.ImportAzureCdnStatistics.csproj b/src/Stats.ImportAzureCdnStatistics/Stats.ImportAzureCdnStatistics.csproj
@@ -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>

diff --git a/src/Stats.LogInterpretation/Stats.LogInterpretation.csproj b/src/Stats.LogInterpretation/Stats.LogInterpretation.csproj
@@ -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>

diff --git a/src/Validation.Common.Job/Validation.Common.Job.csproj b/src/Validation.Common.Job/Validation.Common.Job.csproj
@@ -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>

diff --git a/...et.Services.AzureSearch.FunctionalTests/NuGet.Services.AzureSearch.FunctionalTests.csproj b/...et.Services.AzureSearch.FunctionalTests/NuGet.Services.AzureSearch.FunctionalTests.csproj
@@ -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>

diff --git a/tests/NuGet.Services.AzureSearch.Tests/NuGet.Services.AzureSearch.Tests.csproj b/tests/NuGet.Services.AzureSearch.Tests/NuGet.Services.AzureSearch.Tests.csproj
@@ -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" />

diff --git a/tests/NuGet.Services.AzureSearch.Tests/PackageIdValidatorFacts.cs b/tests/NuGet.Services.AzureSearch.Tests/PackageIdValidatorFacts.cs
diff --git a/tests/NuGet.Services.AzureSearch.Tests/SearchService/SearchResponseBuilderFacts.cs b/tests/NuGet.Services.AzureSearch.Tests/SearchService/SearchResponseBuilderFacts.cs
@@ -682,6 +682,7 @@ public void CoalescesSomeNullFields()
                 doc.Summary = null;
                 doc.Tags = null;
                 doc.Authors = null;
+                doc.Owners = null;
 
                 var response = Target.V3FromSearch(
                     _v3Request,
@@ -695,6 +696,7 @@ public void CoalescesSomeNullFields()
                 Assert.Equal(string.Empty, result.Summary);
                 Assert.Empty(result.Tags);
                 Assert.Equal(string.Empty, Assert.Single(result.Authors));
+                Assert.Empty(result.Owners);
             }
 
             [Fact]
@@ -884,6 +886,10 @@ public void ProducesExpectedResponse(bool useNewtonsoftJson)
       ""authors"": [
         ""Microsoft""
       ],
+      ""owners"": [
+        ""Microsoft"",
+        ""azure-sdk""
+      ],
       ""totalDownloads"": 1001,
       ""verified"": true,
       ""packageTypes"": [
@@ -1058,6 +1064,10 @@ public void ProducesExpectedResponse(bool useNewtonsoftJson)
       ""authors"": [
         ""Microsoft""
       ],
+      ""owners"": [
+        ""Microsoft"",
+        ""azure-sdk""
+      ],
       ""totalDownloads"": 1001,
       ""verified"": true,
       ""packageTypes"": [