Skip to content

Commit 84d2914

Browse files
committed
Update ServerCommon version to pull in latest validation DB migration (#7219)
The new DB migration in validation DB adds a status column to validation sets Polish the validation admin page a little bit Progress on #7185
1 parent ed41e86 commit 84d2914

7 files changed

Lines changed: 33 additions & 19 deletions

File tree

src/DatabaseMigrationTools/DatabaseMigrationTools.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@
9696
<Version>4.1.0-master-2602271</Version>
9797
</PackageReference>
9898
<PackageReference Include="NuGet.Services.Configuration">
99-
<Version>2.48.0</Version>
99+
<Version>2.49.0</Version>
100100
</PackageReference>
101101
<PackageReference Include="NuGet.Services.Validation">
102-
<Version>2.48.0</Version>
102+
<Version>2.49.0</Version>
103103
</PackageReference>
104104
</ItemGroup>
105105
<ItemGroup>

src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<Version>4.1.0-master-2602271</Version>
110110
</PackageReference>
111111
<PackageReference Include="NuGet.Services.Configuration">
112-
<Version>2.48.0</Version>
112+
<Version>2.49.0</Version>
113113
</PackageReference>
114114
</ItemGroup>
115115
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/NuGetGallery.Core/NuGetGallery.Core.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,19 +223,19 @@
223223
</ItemGroup>
224224
<ItemGroup>
225225
<PackageReference Include="NuGet.Services.Entities">
226-
<Version>2.48.0</Version>
226+
<Version>2.49.0</Version>
227227
</PackageReference>
228228
<PackageReference Include="NuGet.Services.FeatureFlags">
229-
<Version>2.48.0</Version>
229+
<Version>2.49.0</Version>
230230
</PackageReference>
231231
<PackageReference Include="NuGet.Services.Messaging.Email">
232-
<Version>2.48.0</Version>
232+
<Version>2.49.0</Version>
233233
</PackageReference>
234234
<PackageReference Include="NuGet.Services.Validation">
235-
<Version>2.48.0</Version>
235+
<Version>2.49.0</Version>
236236
</PackageReference>
237237
<PackageReference Include="NuGet.Services.Validation.Issues">
238-
<Version>2.48.0</Version>
238+
<Version>2.49.0</Version>
239239
</PackageReference>
240240
<PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
241241
<Version>1.2.0</Version>

src/NuGetGallery.Services/NuGetGallery.Services.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<Version>5.0.0-preview1.5665</Version>
126126
</PackageReference>
127127
<PackageReference Include="NuGet.Services.Logging">
128-
<Version>2.46.0</Version>
128+
<Version>2.49.0</Version>
129129
</PackageReference>
130130
<PackageReference Include="System.Runtime">
131131
<Version>4.3.1</Version>

src/NuGetGallery/Areas/Admin/Controllers/ValidationController.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private void AppendValidatedPackages(List<ValidatedPackageViewModel> validatedPa
4242
{
4343
var groups = validationSets
4444
.Where(x => x.ValidatingType == validatingType)
45-
.OrderBy(x => x.PackageId)
45+
.OrderBy(x => x.PackageId, StringComparer.OrdinalIgnoreCase)
4646
.ThenByDescending(x => NuGetVersion.Parse(x.PackageNormalizedVersion))
4747
.ThenByDescending(x => x.PackageKey)
4848
.ThenByDescending(x => x.Created)
@@ -53,10 +53,8 @@ private void AppendValidatedPackages(List<ValidatedPackageViewModel> validatedPa
5353
{
5454
foreach (var set in group)
5555
{
56-
// Put completed validations first then put new validations on top.
5756
set.PackageValidations = set.PackageValidations
58-
.OrderByDescending(x => x.ValidationStatus)
59-
.ThenByDescending(x => x.ValidationStatusTimestamp)
57+
.OrderBy(x => x.Started)
6058
.ToList();
6159
}
6260
var deletedStatus = _validationAdminService.GetDeletedStatus(group.Key, validatingType);

src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,23 @@
8787
<b>Created:</b> @ShowTimestamp(set.Created)<br />
8888
@if (set.Created != set.Updated)
8989
{
90-
<b>Updated:</b> @ShowTimestamp(set.Updated)
90+
<b>Updated:</b> @ShowTimestamp(set.Updated)<br />
91+
}
92+
<b>Status:</b>
93+
@switch (set.ValidationSetStatus)
94+
{
95+
case ValidationSetStatus.Unknown:
96+
@:Unknown
97+
break;
98+
case ValidationSetStatus.InProgress:
99+
@:In progress
100+
break;
101+
case ValidationSetStatus.Completed:
102+
@:Complete
103+
break;
104+
default:
105+
@(set.ValidationSetStatus)
106+
break;
91107
}
92108
</p>
93109

src/NuGetGallery/NuGetGallery.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,7 +2123,7 @@
21232123
<Version>2.2.0</Version>
21242124
</PackageReference>
21252125
<PackageReference Include="NuGet.Services.Licenses">
2126-
<Version>2.48.0</Version>
2126+
<Version>2.49.0</Version>
21272127
</PackageReference>
21282128
<PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
21292129
<Version>1.2.0</Version>
@@ -2347,16 +2347,16 @@
23472347
<Version>5.0.0-preview1.5665</Version>
23482348
</PackageReference>
23492349
<PackageReference Include="NuGet.Services.KeyVault">
2350-
<Version>2.48.0</Version>
2350+
<Version>2.49.0</Version>
23512351
</PackageReference>
23522352
<PackageReference Include="NuGet.Services.Logging">
2353-
<Version>2.48.0</Version>
2353+
<Version>2.49.0</Version>
23542354
</PackageReference>
23552355
<PackageReference Include="NuGet.Services.Owin">
2356-
<Version>2.48.0</Version>
2356+
<Version>2.49.0</Version>
23572357
</PackageReference>
23582358
<PackageReference Include="NuGet.Services.Sql">
2359-
<Version>2.48.0</Version>
2359+
<Version>2.49.0</Version>
23602360
</PackageReference>
23612361
<PackageReference Include="Owin">
23622362
<Version>1.0.0</Version>

0 commit comments

Comments
 (0)