Skip to content

Commit 7322a06

Browse files
committed
Fix minification failures and delete unused assets (#7963)
Address NuGet/Engineering#3107
1 parent e927718 commit 7322a06

98 files changed

Lines changed: 279 additions & 6536 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.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ tools/
2929
.nuget/.marker.v*
3030
nuget.exe
3131
AssemblyInfo.g.cs
32+
*.g.txt
3233
tests/Scripts/Config-*.json
3334

3435
# MSTest test Results

sign.thirdparty.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<ThirdPartyBinaries Include="AnglicanGeek.MarkdownMailer.dll" />
5+
<ThirdPartyBinaries Include="Antlr3.Runtime.dll" />
56
<ThirdPartyBinaries Include="Autofac.dll" />
67
<ThirdPartyBinaries Include="Autofac.Extensions.DependencyInjection.dll" />
78
<ThirdPartyBinaries Include="Autofac.Integration.Mvc.dll" />

src/NuGetGallery/App_Start/AppActivator.cs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private static RazorViewEngine CreateViewEngine()
100100
private static void BundlingPostStart()
101101
{
102102
// Add primary style bundle
103-
Bundle stylesBundle = new StyleBundle("~/Content/css");
103+
Bundle stylesBundle = new StyleBundle("~/Content/css.min.css");
104104
foreach (string filename in new[] {
105105
"Site.css",
106106
"Layout.css",
@@ -145,6 +145,14 @@ private static void BundlingPostStart()
145145
.Include("~/Scripts/gallery/common-multi-select-dropdown.js");
146146
BundleTable.Bundles.Add(multiSelectDropdownBundle);
147147

148+
var asyncFileUploadScriptBundle = new ScriptBundle("~/Scripts/gallery/async-file-upload.min.js")
149+
.Include("~/Scripts/gallery/async-file-upload.js");
150+
BundleTable.Bundles.Add(asyncFileUploadScriptBundle);
151+
152+
var certificatesScriptBundle = new ScriptBundle("~/Scripts/gallery/certificates.min.js")
153+
.Include("~/Scripts/gallery/certificates.js");
154+
BundleTable.Bundles.Add(certificatesScriptBundle);
155+
148156
var homeScriptBundle = new ScriptBundle("~/Scripts/gallery/page-home.min.js")
149157
.Include("~/Scripts/gallery/page-home.js");
150158
BundleTable.Bundles.Add(homeScriptBundle);
@@ -204,16 +212,13 @@ private static void BundlingPostStart()
204212
new ScriptResourceDefinition { Path = scriptBundle.Path });
205213

206214
// Add support requests bundles
207-
var jQueryUiStylesBundle = new StyleBundle("~/Content/themes/custom/jqueryui")
208-
.Include("~/Content/themes/custom/jquery-ui-1.10.3.custom.css");
209-
BundleTable.Bundles.Add(jQueryUiStylesBundle);
210-
211-
var supportRequestStylesBundle = new StyleBundle("~/Content/page-support-requests")
215+
var supportRequestStylesBundle = new StyleBundle("~/Content/themes/custom/page-support-requests.min.css")
216+
.Include("~/Content/themes/custom/jquery-ui-1.10.3.custom.css")
212217
.Include("~/Content/admin/SupportRequestStyles.css");
213218
BundleTable.Bundles.Add(supportRequestStylesBundle);
214219

215-
var supportRequestsBundle = new ScriptBundle("~/Scripts/page-support-requests")
216-
.Include("~/Scripts/gallery/jquery-ui-{version}.js")
220+
var supportRequestsBundle = new ScriptBundle("~/Scripts/page-support-requests.min.js")
221+
.Include("~/Scripts/gallery/jquery-ui-1.10.3.js")
217222
.Include("~/Scripts/gallery/knockout-projections.js")
218223
.Include("~/Scripts/gallery/page-support-requests.js");
219224
BundleTable.Bundles.Add(supportRequestsBundle);

src/NuGetGallery/Areas/Admin/Views/SupportRequest/Admins.cshtml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
}
77

88
@section TopScripts{
9-
@Styles.Render("~/Content/themes/custom/jqueryui")
10-
@Styles.Render("~/Content/page-support-requests")
9+
@Styles.Render("~/Content/themes/custom/page-support-requests.min.css")
1110
}
1211

1312
@ViewHelpers.AjaxAntiForgeryToken(Html)
@@ -87,7 +86,7 @@
8786
</section>
8887

8988
@section BottomScripts{
90-
@Scripts.Render("~/Scripts/page-support-requests")
89+
@Scripts.Render("~/Scripts/page-support-requests.min.js")
9190

9291
<script type="text/javascript">
9392
$(function () {

src/NuGetGallery/Areas/Admin/Views/SupportRequest/Index.cshtml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
}
77

88
@section TopStyles{
9-
@Styles.Render("~/Content/themes/custom/jqueryui")
10-
@Styles.Render("~/Content/page-support-requests")
9+
@Styles.Render("~/Content/themes/custom/page-support-requests.min.css")
1110
}
1211

1312
@ViewHelpers.AjaxAntiForgeryToken(Html)
@@ -177,7 +176,7 @@
177176
@section BottomScripts {
178177
@if (Model != null)
179178
{
180-
@Scripts.Render("~/Scripts/page-support-requests")
179+
@Scripts.Render("~/Scripts/page-support-requests.min.js")
181180

182181
<script type="text/javascript">
183182
$(function () {

src/NuGetGallery/Content/SyntaxHighlighter/shCore.css

Lines changed: 0 additions & 225 deletions
This file was deleted.

0 commit comments

Comments
 (0)