Skip to content

Commit 0400627

Browse files
v-manil2v-manil2
authored
Merge pull request #10571 from NuGet/dev
[ReleasePrep][2026.09.12]RI of dev into main
2 parents 94d9f26 + a439041 commit 0400627

33 files changed

Lines changed: 563 additions & 74 deletions

‎NuGet.Jobs.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "Stats.Warehouse", "src\Stat
5454
EndProject
5555
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statistics", "Statistics", "{B9D03824-A9CA-43AC-86D6-8BB399B9A228}"
5656
EndProject
57+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stats.CreateAzureCdnWarehouseReports", "src\Stats.CreateAzureCdnWarehouseReports\Stats.CreateAzureCdnWarehouseReports.csproj", "{E9D937CE-7D3D-4B4A-8FD1-AF721F362948}"
58+
EndProject
5759
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stats.AggregateCdnDownloadsInGallery", "src\Stats.AggregateCdnDownloadsInGallery\Stats.AggregateCdnDownloadsInGallery.csproj", "{6E27275F-0A0B-BB64-4C28-8F3E894B8C9E}"
5860
EndProject
5961
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Validation", "Validation", "{678D7B14-F8BC-4193-99AF-2EE8AA390A02}"
@@ -333,6 +335,10 @@ Global
333335
{21846E0D-0E79-4E43-9D92-E78854370994}.Release|Any CPU.ActiveCfg = Release|Any CPU
334336
{21846E0D-0E79-4E43-9D92-E78854370994}.Release|Any CPU.Build.0 = Release|Any CPU
335337
{21846E0D-0E79-4E43-9D92-E78854370994}.Release|Any CPU.Deploy.0 = Release|Any CPU
338+
{E9D937CE-7D3D-4B4A-8FD1-AF721F362948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
339+
{E9D937CE-7D3D-4B4A-8FD1-AF721F362948}.Debug|Any CPU.Build.0 = Debug|Any CPU
340+
{E9D937CE-7D3D-4B4A-8FD1-AF721F362948}.Release|Any CPU.ActiveCfg = Release|Any CPU
341+
{E9D937CE-7D3D-4B4A-8FD1-AF721F362948}.Release|Any CPU.Build.0 = Release|Any CPU
336342
{6E27275F-0A0B-BB64-4C28-8F3E894B8C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
337343
{6E27275F-0A0B-BB64-4C28-8F3E894B8C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
338344
{6E27275F-0A0B-BB64-4C28-8F3E894B8C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -653,6 +659,7 @@ Global
653659
{CCB4D5EF-AC84-449D-AC6E-0A0AD295483A} = {6A776396-02B1-475D-A104-26940ADB04AB}
654660
{F72C31A7-424D-48C6-924C-EBFD4BE0918B} = {B9D03824-A9CA-43AC-86D6-8BB399B9A228}
655661
{21846E0D-0E79-4E43-9D92-E78854370994} = {B9D03824-A9CA-43AC-86D6-8BB399B9A228}
662+
{E9D937CE-7D3D-4B4A-8FD1-AF721F362948} = {B9D03824-A9CA-43AC-86D6-8BB399B9A228}
656663
{6E27275F-0A0B-BB64-4C28-8F3E894B8C9E} = {B9D03824-A9CA-43AC-86D6-8BB399B9A228}
657664
{FA8C7905-985F-4919-AAA9-4B9A252F4977} = {88725659-D5F8-49F9-9B7E-D87C5B9917D7}
658665
{12719498-B87E-4E92-8C2B-30046393CF85} = {88725659-D5F8-49F9-9B7E-D87C5B9917D7}

‎build.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ Invoke-BuildStep 'Creating job packages from jobs solution' {
150150
"src\Stats.AggregateCdnDownloadsInGallery\Stats.AggregateCdnDownloadsInGallery.nuspec",
151151
"src\Stats.CDNLogsSanitizer\Stats.CDNLogsSanitizer.nuspec",
152152
"src\Stats.CollectAzureChinaCDNLogs\Stats.CollectAzureChinaCDNLogs.nuspec",
153+
"src\Stats.CreateAzureCdnWarehouseReports\Stats.CreateAzureCdnWarehouseReports.nuspec",
153154
"src\Stats.PostProcessReports\Stats.PostProcessReports.nuspec",
154155
"src\StatusAggregator\StatusAggregator.nuspec",
155156
"src\Validation.PackageSigning.ProcessSignature\Validation.PackageSigning.ProcessSignature.nuspec",

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

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

‎src/Bootstrap/less/theme/page-statistics-overview.less‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
overflow: auto;
6868
}
6969

70+
.chart.table-wrapper {
71+
overflow: visible;
72+
}
73+
7074
svg:not(:root) {
7175
overflow: visible;
7276
}

‎src/NuGetGallery.Services/Authentication/AuthenticationService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ private async Task<Claim[]> GetUserLoginClaims(AuthenticatedUser user, bool wasM
379379
return claims.ToArray();
380380
}
381381

382-
public virtual async Task<AuthenticatedUser> Register(string username, string emailAddress, Credential credential, bool autoConfirm = false, bool enableMultiFactorAuthentication = false)
382+
public virtual async Task<AuthenticatedUser> Register(string username, string emailAddress, Credential credential, bool enableMultiFactorAuthentication = false)
383383
{
384384
if (_config.FeedOnlyMode)
385385
{
@@ -413,7 +413,7 @@ public virtual async Task<AuthenticatedUser> Register(string username, string em
413413
// Add a credential for the password
414414
newUser.Credentials.Add(credential);
415415

416-
if (!_config.ConfirmEmailAddresses || autoConfirm)
416+
if (!_config.ConfirmEmailAddresses)
417417
{
418418
newUser.ConfirmEmailAddress();
419419
}

‎src/NuGetGallery/App_Data/Files/Content/Trusted-Image-Domains.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77
"api.dependabot.com",
88
"api.travis-ci.com",
99
"api.reuse.software",
10-
"app.fossa.io",
11-
"app.fossa.com",
12-
"badge.fury.io",
1310
"badgen.net",
1411
"badges.gitter.im",
15-
"buildstats.info",
1612
"caniuse.bitsofco.de",
1713
"cdn.jsdelivr.net",
1814
"cdn.syncfusion.com",
@@ -35,7 +31,6 @@
3531
"sonarcloud.io",
3632
"travis-ci.com",
3733
"travis-ci.org",
38-
"wakatime.com",
3934
"avatars.githubusercontent.com",
4035
"raw.github.com",
4136
"raw.githubusercontent.com",

‎src/NuGetGallery/Content/gallery/css/bootstrap.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/NuGetGallery/Controllers/AuthenticationController.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ public virtual async Task<ActionResult> Register(LogOnViewModel model, string re
312312
model.Register.Username,
313313
model.Register.EmailAddress,
314314
result.Credential,
315-
autoConfirm: (result.Credential.IsExternal() && string.Equals(result.UserInfo?.Email, model.Register.EmailAddress)),
316315
enableMultiFactorAuthentication: enableMultiFactorAuthentication);
317316
}
318317
else if (_featureFlagService.IsNewAccount2FAEnforcementEnabled())

‎src/NuGetGallery/Views/Packages/DisplayPackage.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1600,5 +1600,5 @@
16001600
</script>
16011601
}
16021602

1603-
@Scripts.RenderFormat("<script src=\"{0}\" nonce='" + @Html.GetCSPNonce().ToString() + "'></script>", "~/Scripts/gallery/page-display-package.min.js");
1603+
@Scripts.RenderFormat("<script src=\"{0}\" nonce='" + @Html.GetCSPNonce().ToString() + "'></script>", "~/Scripts/gallery/page-display-package.min.js")
16041604
}

‎src/NuGetGallery/Views/Packages/UploadPackage.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@
8989
@section BottomScripts
9090
{
9191
@* Right now this is the only page that uses this script. If we increase our usage of it, we should put it in our bundles *@
92-
@Scripts.RenderFormat("<script src=\"{0}\" nonce='" + @Html.GetCSPNonce().ToString() + "'></script>", "~/Scripts/gallery/page-edit-readme.min.js");
93-
@Scripts.RenderFormat("<script src=\"{0}\" nonce='" + @Html.GetCSPNonce().ToString() + "'></script>", "~/Scripts/gallery/async-file-upload.min.js");
94-
@Scripts.RenderFormat("<script src=\"{0}\" nonce='" + @Html.GetCSPNonce().ToString() + "'></script>", "~/Scripts/gallery/syntaxhighlight.min.js");
92+
@Scripts.RenderFormat("<script src=\"{0}\" nonce='" + @Html.GetCSPNonce().ToString() + "'></script>", "~/Scripts/gallery/page-edit-readme.min.js")
93+
@Scripts.RenderFormat("<script src=\"{0}\" nonce='" + @Html.GetCSPNonce().ToString() + "'></script>", "~/Scripts/gallery/async-file-upload.min.js")
94+
@Scripts.RenderFormat("<script src=\"{0}\" nonce='" + @Html.GetCSPNonce().ToString() + "'></script>", "~/Scripts/gallery/syntaxhighlight.min.js")
9595
<script type="text/javascript" nonce="@Html.GetCSPNonce()">
9696
var InProgressPackage = @Html.Raw(Json.Encode(Model.InProgressUpload));
9797
window.nuget.configureExpanderHeading("upload-package-form");

0 commit comments

Comments
 (0)