Skip to content

Commit bd5dbd7

Browse files
authored
Merge pull request #9864 from NuGet/dev
[ReleasePrep][2024.03.19]RI of dev into main
2 parents 5e6d6ac + 660f90a commit bd5dbd7

5 files changed

Lines changed: 37 additions & 6 deletions

File tree

CredScanSuppressions.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"tool": "Credential Scanner",
3+
"suppressions": [
4+
{
5+
"file": "tests/NuGetGallery.Facts/Infrastructure/Authentication/ApiKeyV4Facts.cs",
6+
"_justification": "Test file containing fake credentials"
7+
},
8+
{
9+
"file": "tests/NuGetGallery.Facts/Infrastructure/Authentication/V3HasherTests.cs",
10+
"_justification": "Test file containing fake credentials"
11+
},
12+
{
13+
"file": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
14+
"_justification": "Test file containing fake credentials"
15+
}
16+
]
17+
}

src/NuGetGallery.Core/Frameworks/SupportedFrameworks.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ namespace NuGetGallery.Frameworks
2121
/// </remarks>
2222
public static class SupportedFrameworks
2323
{
24-
public static readonly Version Version8 = new Version(8, 0, 0, 0); // https://github.com/NuGet/Engineering/issues/5112
25-
2624
public static readonly NuGetFramework MonoAndroid = new NuGetFramework(FrameworkIdentifiers.MonoAndroid, EmptyVersion);
2725
public static readonly NuGetFramework MonoTouch = new NuGetFramework(FrameworkIdentifiers.MonoTouch, EmptyVersion);
2826
public static readonly NuGetFramework MonoMac = new NuGetFramework(FrameworkIdentifiers.MonoMac, EmptyVersion);
@@ -42,7 +40,6 @@ public static class SupportedFrameworks
4240
public static readonly NuGetFramework Net70MacCatalyst = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "maccatalyst", EmptyVersion);
4341
public static readonly NuGetFramework Net70TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "tvos", EmptyVersion);
4442
public static readonly NuGetFramework Net70Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "windows", EmptyVersion);
45-
public static readonly NuGetFramework Net80 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8); // https://github.com/NuGet/Engineering/issues/5112
4643
public static readonly NuGetFramework Net80Android = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "android", EmptyVersion);
4744
public static readonly NuGetFramework Net80Browser = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "browser", EmptyVersion);
4845
public static readonly NuGetFramework Net80Ios = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "ios", EmptyVersion);

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
@@ -1278,4 +1278,7 @@ The {1} Team</value>
12781278
<data name="SupportedFrameworks_EmptyVersion_Template_Tooltip" xml:space="preserve">
12791279
<value>This package is compatible with all versions of {0}.</value>
12801280
</data>
1281+
<data name="FrameworkFilters_Tooltip" xml:space="preserve">
1282+
<value>Filters packages based on the target frameworks they are compatible with. Click here to learn more.</value>
1283+
</data>
12811284
</root>

src/NuGetGallery/Views/Shared/ListPackages.cshtml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,11 @@
7474
@if (Model.IsAdvancedSearchFlightEnabled)
7575
{
7676
<div class="toggle-advanced-search-panel">
77-
Advanced search filters <button class ="advanced-search-toggle-button" aria-label="Toggles search filters on narrow screens" aria-expanded="false" aria-controls="advancedSearchToggleButton" tabindex="0" id="advancedSearchToggleButton" type="button">
78-
<i class="ms-Icon ms-Icon--ChevronDown" id="advancedSearchToggleChevron" ></i></button>
77+
Advanced search filters
78+
<button class="advanced-search-toggle-button" aria-label="Toggles search filters on narrow screens" aria-expanded="false"
79+
aria-controls="advancedSearchToggleButton" tabindex="0" id="advancedSearchToggleButton" type="button">
80+
<i class="ms-Icon ms-Icon--ChevronDown" id="advancedSearchToggleChevron"></i>
81+
</button>
7982
</div>
8083
<div class="row clearfix advanced-search-panel" id="advancedSearchPanel">
8184
<input type="text" hidden id="frameworks" name="frameworks" value="@Model.Frameworks">
@@ -86,7 +89,9 @@
8689
<fieldset id="frameworkfilters">
8790
<legend>
8891
Frameworks
89-
<a href="@(Model.FrameworksFilteringInformationLink)" class="frameworkfilters-info" data-content="Filters packages based on the target frameworks they are compatible with. Click here to learn more.">
92+
<a href="@(Model.FrameworksFilteringInformationLink)" class="frameworkfilters-info"
93+
data-content="@NuGetGallery.Strings.FrameworkFilters_Tooltip"
94+
aria-label="@NuGetGallery.Strings.FrameworkFilters_Tooltip">
9095
<i class="framework-filter-info-icon ms-Icon ms-Icon--Info"></i>
9196
</a>
9297
</legend>

0 commit comments

Comments
 (0)