Skip to content

Commit 86af07d

Browse files
authored
[NuGet Symbol Server] Gallery upload for Symbols package (#6503)
1 parent 6f8fe55 commit 86af07d

12 files changed

Lines changed: 1070 additions & 259 deletions

File tree

src/NuGetGallery.Core/PackageMetadataExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static class PackageMetadataExtensions
2121
/// </summary>
2222
/// <param name="metadata"><see cref="PackageMetadata"/> for package</param>
2323
/// <returns>True if the package is a symbols package</returns>
24-
public static bool IsSymbolPackage(this PackageMetadata metadata)
24+
public static bool IsSymbolsPackage(this PackageMetadata metadata)
2525
{
2626
var packageTypes = metadata.GetPackageTypes();
2727
return packageTypes.Any()

src/NuGetGallery/Controllers/PackagesController.cs

Lines changed: 504 additions & 226 deletions
Large diffs are not rendered by default.

src/NuGetGallery/RequestModels/VerifyPackageRequest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public VerifyPackageRequest(PackageMetadata packageMetadata, IEnumerable<User> p
116116
public string Summary { get; set; }
117117
public string Tags { get; set; }
118118
public string Title { get; set; }
119+
public bool IsSymbolsPackage { get; set; }
119120

120121
public List<string> Warnings { get; set; } = new List<string>();
121122

src/NuGetGallery/Scripts/gallery/async-file-upload.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
};
8585

8686
function resetFileSelectFeedback() {
87-
$('#file-select-feedback').attr('value', 'Browse or Drop files to select a package...');
87+
$('#file-select-feedback').attr('value', 'Browse or Drop files to select a package or symbols package...');
8888
}
8989

9090
function prepareUploadFormData() {
@@ -290,7 +290,9 @@
290290
window.nuget.configureExpanderHeading("submit-package-form");
291291
}
292292

293-
bindReadMeData(model);
293+
if (model === null || !model.IsSymbolsPackage) {
294+
bindReadMeData(model);
295+
}
294296

295297
document.getElementById("validation-failure-container").scrollIntoView();
296298
}

src/NuGetGallery/Scripts/gallery/page-edit-readme.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@
155155
submitAsync(navigateToPage);
156156
});
157157

158-
bindReadMeData(model);
158+
if (model === null || !model.IsSymbolsPackage) {
159+
bindReadMeData(model);
160+
}
159161
}
160162
};
161163
}());

src/NuGetGallery/Services/SymbolPackageService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public async Task EnsureValidAsync(PackageArchiveReader symbolPackageArchiveRead
5959
symbolPackageArchiveReader.GetNuspecReader(),
6060
strict: true);
6161

62-
if (!packageMetadata.IsSymbolPackage())
62+
if (!packageMetadata.IsSymbolsPackage())
6363
{
6464
throw new InvalidPackageException(Strings.SymbolsPackage_NotSymbolPackage);
6565
}

src/NuGetGallery/Strings.Designer.cs

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

src/NuGetGallery/Strings.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -990,4 +990,7 @@ Policy violations: {0}</value>
990990
<value>The uploaded package's id is too similar to the already existing packages: {0} </value>
991991
<comment>{0} is the existing collision Ids compared with the uploaded package Id.</comment>
992992
</data>
993+
<data name="SymbolsPackage_UploadSuccessful" xml:space="preserve">
994+
<value>Successfully uploaded the symbols package for package with ID {0} and version {1}.</value>
995+
</data>
993996
</root>

src/NuGetGallery/Views/Packages/UploadPackage.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@Html.AntiForgeryToken()
2828

2929
<div class="input-group">
30-
<input type="text" class="form-control" id="file-select-feedback" value="Browse or Drop files to select a package..." aria-label="Upload Your Package" readonly />
30+
<input type="text" class="form-control" id="file-select-feedback" value="Browse or Drop files to select a package or symbols package..." aria-label="Upload Your Package" readonly />
3131
<label for="input-select-file" id="PackageFileLabel" class="input-group-btn">
3232
<span id="browse-for-package-button" class="btn btn-primary form-control" tabindex="0" aria-label="Browse for package" role="button">
3333
Browse&hellip;<input type="file" name="UploadFile" accept=".nupkg,.snupkg" aria-labelledby="PackageFileLabel" id="input-select-file" style="display:none;" />

src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<li><span data-bind="text: $data"></span></li>
5353
</ul>
5454
We recommend that you fix these issues and upload a new package.
55-
<a href="https://docs.microsoft.com/en-us/nuget/policies/nuget-faq#managing-packages-on-nugetorg" alt="Read more">Read more</a><br />
55+
<a href="https://docs.microsoft.com/en-us/nuget/policies/nuget-faq#managing-packages-on-nugetorg" alt="Read more">Read more</a><br />
5656
</span>)
5757
<!-- /ko -->
5858

@@ -89,6 +89,7 @@
8989
</div>
9090
<!-- /ko -->
9191

92+
<!-- ko ifnot: $data.IsSymbolsPackage -->
9293
<div class="verify-package-field">
9394
<label class="verify-package-field-heading">Minimum NuGet Client Version</label>
9495
<div data-bind="template: { name: 'display-data-or-default', data: { DisplayText: $data.MinClientVersionDisplay }}"></div>
@@ -118,6 +119,7 @@
118119
<p><i>(none specified)</i></p>
119120
<!-- /ko -->
120121
</div>
122+
<!-- /ko -->
121123

122124
<div class="verify-package-field">
123125
<label class="verify-package-field-heading">Title</label>
@@ -134,6 +136,7 @@
134136
<div data-bind="template: { name: 'display-data-or-default', data: { DisplayText: $data.Summary }}"></div>
135137
</div>
136138

139+
<!-- ko ifnot: $data.IsSymbolsPackage -->
137140
<div class="verify-package-field">
138141
<div class="verify-package-field-heading"><label>Release Notes</label> (for this version)</div>
139142
<div data-bind="template: { name: 'display-data-or-default', data: { DisplayText: $data.ReleaseNotes }}"></div>
@@ -202,6 +205,7 @@
202205
</div>
203206
</div>
204207
<!-- /ko -->
208+
<!-- /ko -->
205209
</div>
206210

207211
<!-- ko if: $data.IsSemVer2 -->

0 commit comments

Comments
 (0)