Skip to content

Commit a14b029

Browse files
v-sulagnapalv-sulagnapal
authored
Merge pull request #10428 from NuGet/dev
[ReleasePrep][2025.04.28]RI of dev into main
2 parents 6d81efd + bf87dbf commit a14b029

69 files changed

Lines changed: 1425 additions & 477 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<PackageVersion Include="LibGit2Sharp" Version="0.26.0" />
3434
<PackageVersion Include="Lucene.Net.Contrib" Version="3.0.3" />
3535
<PackageVersion Include="Lucene.Net" Version="3.0.3" />
36-
<PackageVersion Include="Markdig.Signed" Version="0.30.2" />
36+
<PackageVersion Include="Markdig.Signed" Version="0.37.0" />
3737
<PackageVersion Include="MicroBuild.Core" Version="0.3.0" />
3838
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
3939
<PackageVersion Include="Microsoft.ApplicationInsights.TraceListener" Version="2.21.0" />

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Does it happen when you switch browsers. And so on.
110110
111111
## Submit a patch
112112
Before starting work on an issue, either create an issue or comment on an existing issue to ensure that we're all
113-
communicating. We have a list of items that are [up for grabs](https://github.com/NuGet/NuGetGallery/issues?q=is%3Aopen+is%3Aissue+label%3A%22Up+for+Grabs%22) and you can start working on (but always ping us beforehand).
113+
communicating. We have a list of items that are [good first issue](https://github.com/NuGet/NuGetGallery/labels/good%20first%20issue) and you can start working on (but always ping us beforehand).
114114
115115
To contribute to the gallery, make sure to create a fork first. Make your changes in the fork following
116116
the Git Workflow. When you are done with your changes, send us a pull request.

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

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

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

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

‎src/Bootstrap/dist/js/bootstrap.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* Bootstrap v3.4.1 (https://getbootstrap.com/)
3-
* Copyright 2011-2024 Twitter, Inc.
3+
* Copyright 2011-2025 Twitter, Inc.
44
* Licensed under the MIT license
55
*/
66

‎src/Bootstrap/less/alerts.less‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
.alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
7373
}
7474

75+
.alert-primary {
76+
.alert-variant(@alert-primary-bg; @alert-primary-border; @alert-primary-text);
77+
}
7578

7679
.alert-brand-a {
7780
a {

‎src/Bootstrap/less/theme/page-list-packages.less‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
margin: 0 !important;
1212
}
1313

14-
.frameworkfilters-info {
15-
color: var(--neutralForeground1Rest);
16-
text-decoration: none;
17-
}
18-
1914
@media (max-width: @screen-md) {
2015
.btn-filter {
2116
text-align: left;
@@ -56,22 +51,22 @@
5651
.framework-filter-info-icon {
5752
margin-bottom: -6px;
5853
overflow: hidden;
54+
font-size: small;
5955
}
6056

61-
.frameworkGroup{
57+
.frameworkGroup {
6258
display: flex;
6359
flex-direction: column;
6460
align-items: center;
6561
}
6662

67-
.frameworkGroupRow{
63+
.frameworkGroupRow {
6864
display: flex;
6965
width: 100%;
7066
}
7167

7268
.advanced-search-panel {
7369
border-radius: var(--X-Large, 8px);
74-
7570
box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.12), 0px 2px 4px 0px rgba(0, 0, 0, 0.14);
7671
background-color: var(--neutralBackground1Rest);
7772
margin-right: 0px;
@@ -93,6 +88,11 @@
9388
font-weight: 500;
9489
font-size: medium;
9590
white-space: nowrap;
91+
92+
.frameworkfilters-info {
93+
font-weight: normal;
94+
font-size: small;
95+
}
9696
}
9797

9898
.btn {
@@ -112,7 +112,7 @@
112112
margin-right: 10px;
113113
}
114114

115-
label{
115+
label {
116116
margin: auto 0
117117
}
118118

@@ -190,7 +190,7 @@
190190
width: 0px;
191191
margin: 0px;
192192
}
193-
193+
194194
input:not(:checked):hover + label {
195195
border-color: var(--brandBackground1Hover);
196196
}
@@ -244,7 +244,7 @@
244244
}
245245
}
246246

247-
.prerel-option{
247+
.prerel-option {
248248
display: flex;
249249
}
250250
}
@@ -280,13 +280,13 @@
280280
border: none;
281281
padding-left: 19px;
282282

283-
span{
283+
span {
284284
margin: auto 0;
285285
}
286286
}
287287

288288
@media (max-width: 992px) {
289-
.toggle-advanced-search-panel{
289+
.toggle-advanced-search-panel {
290290
display: flex;
291291
justify-content: space-between;
292292
}
@@ -296,4 +296,3 @@
296296
}
297297
}
298298
}
299-

‎src/Bootstrap/less/theme/page-upload.less‎

Lines changed: 80 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,83 @@
11
.page-upload {
2-
#browse-for-package-button {
3-
margin: 0;
2+
#browse-for-package-button {
3+
margin: 0;
4+
}
5+
6+
#input-select-file {
7+
display: none;
8+
}
9+
10+
.readme-tabs {
11+
margin-top: 0.5em;
12+
13+
.nav-tabs > li {
14+
padding-right: 2px;
415
}
5-
6-
.readme-tabs {
7-
margin-top: 0.5em;
8-
9-
.nav-tabs > li {
10-
padding-right: 2px;
11-
}
12-
13-
.nav-tabs > li.active > a {
14-
border-bottom-color: var(--brandStrokeCompoundRest);
15-
border-bottom-width: 2px;
16-
-webkit-text-stroke-width: calc(0.5 * 0.04ex);
17-
text-shadow: calc(0.5 * -0.03ex) 0 0 currentColor,
18-
calc(0.5 * 0.03ex) 0 0 currentColor;
19-
margin-bottom: -1px;
20-
background-color: transparent;
21-
22-
&:hover {
23-
border-bottom-color: var(--brandStrokeCompoundHover);
24-
border-bottom-width: 2px;
25-
}
26-
27-
&:active {
28-
border-bottom-color: var(--brandStrokeCompoundPressed);
29-
border-bottom-width: 2px;
30-
}
31-
32-
&:focus {
33-
border-radius: 2px;
34-
outline: 3px solid var(--neutralStrokeFocus2Rest);
35-
outline-offset: 1px;
36-
}
37-
}
38-
39-
.nav-tabs > li.active > a.body-warning-tab > {
40-
background-color: var(--statusWarningBackground1Rest);
41-
border-bottom-color: var(--statusWarningStroke1Rest);
42-
border-bottom-width: 2px;
43-
}
44-
45-
.nav-tabs > li > a {
46-
border-left: 0px;
47-
border-right: 0px;
48-
border-top: 0px;
49-
border-bottom-width: 2px;
50-
font-size: 14px;
51-
font-family: @font-family-base;
52-
color: var(--neutralForeground1Rest);
53-
background-color: transparent;
54-
55-
&:hover {
56-
border-bottom-color: var(--neutralStroke1Hover);
57-
border-bottom-width: 2px;
58-
background-color: var(--neutralBackgroundSubtleHover);
59-
border-radius: 2px 2px 0px 0px;
60-
}
61-
62-
&:active {
63-
border-bottom-color: var(--neutralStroke1Pressed);
64-
border-bottom-width: 2px;
65-
background-color: var(--neutralBackgroundSubtlePressed);
66-
}
67-
68-
&:focus {
69-
border-radius: 2px;
70-
outline: 3px solid var(--neutralStrokeFocus2Rest);
71-
outline-offset: 1px;
72-
}
73-
74-
.ms-Icon {
75-
position: relative;
76-
top: 2px;
77-
}
78-
}
16+
17+
.nav-tabs > li.active > a {
18+
border-bottom-color: var(--brandStrokeCompoundRest);
19+
border-bottom-width: 2px;
20+
-webkit-text-stroke-width: calc(0.5 * 0.04ex);
21+
text-shadow: calc(0.5 * -0.03ex) 0 0 currentColor, calc(0.5 * 0.03ex) 0 0 currentColor;
22+
margin-bottom: -1px;
23+
background-color: transparent;
24+
25+
&:hover {
26+
border-bottom-color: var(--brandStrokeCompoundHover);
27+
border-bottom-width: 2px;
7928
}
80-
}
29+
30+
&:active {
31+
border-bottom-color: var(--brandStrokeCompoundPressed);
32+
border-bottom-width: 2px;
33+
}
34+
35+
&:focus {
36+
border-radius: 2px;
37+
outline: 3px solid var(--neutralStrokeFocus2Rest);
38+
outline-offset: 1px;
39+
}
40+
}
41+
42+
.nav-tabs > li.active > a.body-warning-tab > {
43+
background-color: var(--statusWarningBackground1Rest);
44+
border-bottom-color: var(--statusWarningStroke1Rest);
45+
border-bottom-width: 2px;
46+
}
47+
48+
.nav-tabs > li > a {
49+
border-left: 0px;
50+
border-right: 0px;
51+
border-top: 0px;
52+
border-bottom-width: 2px;
53+
font-size: 14px;
54+
font-family: @font-family-base;
55+
color: var(--neutralForeground1Rest);
56+
background-color: transparent;
57+
58+
&:hover {
59+
border-bottom-color: var(--neutralStroke1Hover);
60+
border-bottom-width: 2px;
61+
background-color: var(--neutralBackgroundSubtleHover);
62+
border-radius: 2px 2px 0px 0px;
63+
}
64+
65+
&:active {
66+
border-bottom-color: var(--neutralStroke1Pressed);
67+
border-bottom-width: 2px;
68+
background-color: var(--neutralBackgroundSubtlePressed);
69+
}
70+
71+
&:focus {
72+
border-radius: 2px;
73+
outline: 3px solid var(--neutralStrokeFocus2Rest);
74+
outline-offset: 1px;
75+
}
76+
77+
.ms-Icon {
78+
position: relative;
79+
top: 2px;
80+
}
81+
}
82+
}
83+
}

‎src/Bootstrap/less/variables.less‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,9 @@
648648
@alert-danger-text: #000;
649649
@alert-danger-border: #fde7e9;
650650

651+
@alert-primary-bg: #EFD9FD;
652+
@alert-primary-text: #000;
653+
@alert-primary-border: #EFD9FD;
651654

652655
//== Progress bars
653656
//

‎src/NuGet.Services.AzureSearch/AzureSearchTelemetryService.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -31,7 +31,7 @@ public IDisposable TrackVersionListsUpdated(int versionListCount, int workerCoun
3131
});
3232
}
3333

34-
public void TrackIndexPushSuccess(string indexName, int documentCount, TimeSpan elapsed)
34+
public void TrackIndexPushSuccess(string indexName, int documentCount, TimeSpan elapsed, string requestId)
3535
{
3636
_telemetryClient.TrackMetric(
3737
Prefix + "IndexPushSuccessSeconds",
@@ -40,6 +40,7 @@ public void TrackIndexPushSuccess(string indexName, int documentCount, TimeSpan
4040
{
4141
{ "IndexName", indexName },
4242
{ "DocumentCount", documentCount.ToString() },
43+
{ "RequestId", requestId ?? "(missing)" },
4344
});
4445
}
4546

0 commit comments

Comments
 (0)