Skip to content

Commit 73c5d8a

Browse files
authored
Merge pull request #8804 from NuGet/dev
[2021-09-14]RI of dev to main
2 parents f08f9af + cd383ec commit 73c5d8a

30 files changed

Lines changed: 1093 additions & 375 deletions

src/AccountDeleter/AccountDeleter.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<Compile Include="Program.cs" />
8585
<Compile Include="Properties\AssemblyInfo.cs" />
8686
<Compile Include="Properties\AssemblyInfo.*.cs" />
87+
<Compile Include="Providers\AccountDeleteUrlHelper.cs" />
8788
<Compile Include="Telemetry\IAccountDeleteTelemetryService.cs" />
8889
<Compile Include="Telemetry\AccountDeleteTelemetryService.cs" />
8990
</ItemGroup>

src/AccountDeleter/Job.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ protected void ConfigureGalleryServices(IServiceCollection services)
140140
services.AddScoped<ICoreFileStorageService, CloudBlobFileStorageService>();
141141
services.AddScoped<ICloudBlobContainerInformationProvider, GalleryCloudBlobContainerInformationProvider>();
142142

143+
services.AddScoped<IUrlHelper, AccountDeleteUrlHelper>();
144+
143145
services.AddScoped<IIndexingService, EmptyIndexingService>();
144146
services.AddScoped<ICredentialBuilder, CredentialBuilder>();
145147
services.AddScoped<ICredentialValidator, CredentialValidator>();
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using System;
5+
6+
namespace NuGetGallery.AccountDeleter
7+
{
8+
public class AccountDeleteUrlHelper : IUrlHelper
9+
{
10+
public string ConfirmPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl)
11+
{
12+
throw new NotImplementedException();
13+
}
14+
15+
public string ManagePackageOwnership(string id, bool relativeUrl)
16+
{
17+
throw new NotImplementedException();
18+
}
19+
20+
public string Package(string id, string version, bool relativeUrl)
21+
{
22+
throw new NotImplementedException();
23+
}
24+
25+
public string RejectPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl)
26+
{
27+
throw new NotImplementedException();
28+
}
29+
}
30+
}

src/Bootstrap/dist/css/bootstrap-theme.css

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Bootstrap/less/theme/page-display-package-v2.less

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -274,25 +274,14 @@
274274
font-size: 14px;
275275
color: #333333;
276276
margin: 4px 0 0 0;
277-
width: auto;
278-
overflow: hidden;
279-
text-overflow: ellipsis;
280-
display: -webkit-box;
281277
line-height: 16px;
282-
/* fallback */
283-
max-height: 32px;
284-
/* fallback */
285-
-webkit-line-clamp: 2;
286-
/* number of lines to show */
287-
-webkit-box-orient: vertical;
288278
}
289279

290280
.used-by-link {
291281
font-family: @font-family-base;
292282
font-size: 16px;
293283
line-height: 19px;
294284
color: @brand-primary;
295-
width: auto;
296285
}
297286

298287
.gh-link, .ngp-link {

src/NuGetGallery.Core/Services/ICorePackageService.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ public interface ICorePackageService
2929
Task UpdatePackageStatusAsync(Package package, PackageStatus newPackageStatus, bool commitChanges = true);
3030

3131
/// <summary>
32-
/// Gets the package with the given ID and version when exists; otherwise <c>null</c>.
32+
/// Gets the package with the given ID and version when exists; otherwise <c>null</c>. Note that this method
33+
/// can return a soft deleted package. This will be indicated by <see cref="PackageStatus.Deleted"/> on the
34+
/// <see cref="Package.PackageStatusKey"/> property. Hard deleted packages will be returned as null because no
35+
/// record of the package exists. Consider checking for a null package and a soft deleted depending on your
36+
/// desired behavior for non-existent and deleted packages.
3337
/// </summary>
3438
/// <param name="id">The package ID.</param>
3539
/// <param name="version">The package version.</param>

src/NuGetGallery/Infrastructure/Mail/GalleryEmailRecipientsUtility.cs renamed to src/NuGetGallery.Services/Mail/GalleryEmailRecipientsUtility.cs

File renamed without changes.

src/NuGetGallery/Infrastructure/Mail/Messages/PackageOwnerAddedMessage.cs renamed to src/NuGetGallery.Services/Mail/Messages/PackageOwnerAddedMessage.cs

File renamed without changes.

src/NuGetGallery/Infrastructure/Mail/Messages/PackageOwnerRemovedMessage.cs renamed to src/NuGetGallery.Services/Mail/Messages/PackageOwnerRemovedMessage.cs

File renamed without changes.

src/NuGetGallery/Infrastructure/Mail/Messages/PackageOwnershipRequestCanceledMessage.cs renamed to src/NuGetGallery.Services/Mail/Messages/PackageOwnershipRequestCanceledMessage.cs

File renamed without changes.

0 commit comments

Comments
 (0)