Skip to content

Commit d7aaa8d

Browse files
lyndaidaiilyndaidaii
authored
Merge pull request #8273 from NuGet/dev
[ReleasePrep][10.16.2020] NuGetGallery of dev into master
2 parents 6d45769 + e56ad75 commit d7aaa8d

38 files changed

Lines changed: 312 additions & 118 deletions

File tree

‎.editorconfig‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[*.cs]
2+
3+
# Suppress performance, usage, naming, maintainability, style diagnostics.
4+
dotnet_analyzer_diagnostic.category-design.severity = none
5+
dotnet_analyzer_diagnostic.category-globalization.severity = none
6+
dotnet_analyzer_diagnostic.category-naming.severity = none
7+
dotnet_analyzer_diagnostic.category-performance.severity = none
8+
dotnet_analyzer_diagnostic.category-reliability.severity = none
9+
dotnet_analyzer_diagnostic.category-security.severity = warning
10+
dotnet_analyzer_diagnostic.category-usage.severity = none
11+
dotnet_analyzer_diagnostic.category-Maintainability.severity = none
12+
dotnet_analyzer_diagnostic.category-Style.severity = none
13+
14+
# Addtional suppress to be compatible with different version among VS2019
15+
16+
# CA1001: Types that own disposable fields should be disposable
17+
dotnet_diagnostic.CA1001.severity = none
18+
19+
# CA1063: Implement IDisposable Correctly
20+
dotnet_diagnostic.CA1063.severity = none
21+
22+
# CA1033: Interface methods should be callable by child types
23+
dotnet_diagnostic.CA1033.severity = none
24+
25+
# CA2229: Implement serialization constructors
26+
dotnet_diagnostic.CA2229.severity = none
27+
28+
# CA2200: Rethrow to preserve stack details.
29+
dotnet_diagnostic.CA2200.severity = none
30+
31+
# CA1065: Do not raise exceptions in unexpected locations
32+
dotnet_diagnostic.CA1065.severity = none
33+
34+
# CA2214: Do not call overridable methods in constructors
35+
dotnet_diagnostic.CA2214.severity = none

‎.eslintignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
#
44
# Prepend each file with a globbing '**/' because our official builds run in a complex way that makes it hard to depend
55
# on specific relative paths.
6-
**/src/NuGetGallery/Scripts/gallery/jquery-3.4.1.js
7-
**/src/NuGetGallery/Scripts/gallery/knockout-3.5.1.js
8-
**/src/NuGetGallery/Scripts/gallery/moment-2.18.1.js
6+
**/Scripts/gallery/jquery-3.4.1.js
7+
**/Scripts/gallery/knockout-3.5.1.js
8+
**/Scripts/gallery/moment-2.18.1.js

‎Directory.Build.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
4+
<Version>3.3.0</Version>
5+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6+
<PrivateAssets>all</PrivateAssets>
7+
</PackageReference>
8+
</ItemGroup>
9+
</Project>

‎NuGetGallery.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVulnerabilities2Db.Fa
5252
EndProject
5353
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VerifyGitHubVulnerabilities", "src\VerifyGitHubVulnerabilities\VerifyGitHubVulnerabilities.csproj", "{C0B764D2-D376-439E-A5C4-1AC41B11E9DE}"
5454
EndProject
55+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C643C106-D245-4F00-A486-146357812D8D}"
56+
ProjectSection(SolutionItems) = preProject
57+
.editorconfig = .editorconfig
58+
EndProjectSection
59+
EndProject
5560
Global
5661
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5762
Debug|Any CPU = Debug|Any CPU

‎src/AccountDeleter/AccountDeleter.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
<Compile Include="AccountDeleteUserService.cs" />
8383
<Compile Include="Program.cs" />
8484
<Compile Include="Properties\AssemblyInfo.cs" />
85+
<Compile Include="Properties\AssemblyInfo.*.cs" />
8586
<Compile Include="Telemetry\IAccountDeleteTelemetryService.cs" />
8687
<Compile Include="Telemetry\AccountDeleteTelemetryService.cs" />
8788
</ItemGroup>

‎src/AccountDeleter/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,7 @@
2121
// The following GUID is for the ID of the typelib if this project is exposed to COM
2222
[assembly: Guid("8ee102b9-da4e-4fdf-b6fd-fb12e6584dd7")]
2323

24-
// Version information for an assembly consists of the following four values:
25-
//
26-
// Major Version
27-
// Minor Version
28-
// Build Number
29-
// Revision
30-
//
31-
// You can specify all the values or you can default the Build and Revision Numbers
32-
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.0.0")]
35-
[assembly: AssemblyFileVersion("1.0.0.0")]
24+
// The build will automatically inject the following attributes:
25+
// AssemblyVersion, AssemblyFileVersion, AssemblyInformationalVersion, AssemblyMetadata (for Branch, CommitId, and BuildDateUtc)
26+
27+
[assembly: AssemblyMetadata("RepositoryUrl", "https://www.github.com/NuGet/NuGetGallery")]

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

Lines changed: 67 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: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Bootstrap/less/theme/base.less‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ body {
213213

214214
a {
215215
color: @link-hover-color;
216+
text-decoration: underline;
216217
}
217218

218219
a:hover, a:focus {

‎src/Bootstrap/less/theme/page-api-keys.less‎

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,56 @@
4141

4242
.available-packages {
4343
.panel-body {
44-
overflow: auto;
45-
height: 204px;
4644
padding-top: 0;
4745
padding-bottom: 0;
46+
@media (max-width: @screen-sm-min) {
47+
height: 200px;
48+
overflow: auto;
49+
}
50+
@media (min-width: @screen-sm-min) {
51+
height: auto;
52+
}
4853
}
4954
}
5055

5156
.glob-pattern-hint {
52-
.panel-body {
53-
height: 282px;
57+
table {
58+
margin-bottom: 0;
59+
}
60+
}
61+
62+
.select-packages-form {
63+
@media (min-width: @screen-sm-min) {
64+
display: flex;
65+
}
66+
}
67+
68+
.select-packages-inputs {
69+
@media (min-width: @screen-sm-min) {
70+
position: relative;
71+
72+
> div {
73+
position: absolute;
74+
top: 0;
75+
left: 0;
76+
bottom: 0;
77+
right: 0;
78+
display: flex;
79+
flex-direction: column;
80+
margin-right: 15px;
81+
margin-left: 15px;
82+
83+
.available-packages-container {
84+
flex: 1 1 0;
85+
display: flex;
86+
flex-direction: column;
87+
88+
.available-packages {
89+
flex: 1 1 0;
90+
overflow-y: auto;
91+
}
92+
}
93+
}
5494
}
5595
}
5696

0 commit comments

Comments
 (0)