Skip to content

Commit f338ed5

Browse files
authored
Merge pull request #9192 from NuGet/dev
[ReleasePrep] RI of dev to main NuGetGallery
2 parents 6e465b4 + 945b658 commit f338ed5

5 files changed

Lines changed: 14 additions & 2 deletions

File tree

src/NuGetGallery/App_Start/AppActivator.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,10 @@ private static void BundlingPostStart()
215215
.Include("~/Scripts/gallery/md5.js");
216216
BundleTable.Bundles.Add(addOrganizationScriptBundle);
217217

218+
var syntaxhighlightScriptBundle = new ScriptBundle("~/Scripts/gallery/syntaxhighlight.min.js")
219+
.Include("~/Scripts/gallery/syntaxhighlight.js");
220+
BundleTable.Bundles.Add(syntaxhighlightScriptBundle);
221+
218222
// This is needed for the Admin database viewer.
219223
ScriptManager.ScriptResourceMapping.AddDefinition("jquery",
220224
new ScriptResourceDefinition { Path = scriptBundle.Path });

src/NuGetGallery/NuGetGallery.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,6 +1707,7 @@
17071707
<Content Include="Scripts\gallery\instrumentation.js" />
17081708
<Content Include="Scripts\gallery\knockout-3.5.1.js" />
17091709
<Content Include="Scripts\gallery\page-list-packages.js" />
1710+
<Content Include="Scripts\gallery\syntaxhighlight.js" />
17101711
<Content Include="Views\Shared\SiteMenu.cshtml">
17111712
<SubType>Code</SubType>
17121713
</Content>

src/NuGetGallery/Views/Packages/Manage.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,5 @@
148148
@Scripts.Render("~/Scripts/gallery/page-manage-deprecation.min.js")
149149
@Scripts.Render("~/Scripts/gallery/page-delete-package.min.js")
150150
@Scripts.Render("~/Scripts/gallery/page-edit-readme.min.js")
151-
@Scripts.Render("~/Scripts/gallery/syntaxhighlight.js")
151+
@Scripts.Render("~/Scripts/gallery/syntaxhighlight.min.js")
152152
}

src/NuGetGallery/Views/Packages/UploadPackage.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
@* 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 *@
9191
@Scripts.Render("~/Scripts/gallery/page-edit-readme.min.js")
9292
@Scripts.Render("~/Scripts/gallery/async-file-upload.min.js")
93-
@Scripts.Render("~/Scripts/gallery/syntaxhighlight.js")
93+
@Scripts.Render("~/Scripts/gallery/syntaxhighlight.min.js")
9494
<script type="text/javascript">
9595
var InProgressPackage = @Html.Raw(Json.Encode(Model.InProgressUpload));
9696
window.nuget.configureExpanderHeading("upload-package-form");

tests/NuGetGallery.FunctionalTests/StaticAssets/StaticAssetsTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,13 @@ public StaticAssetsTests(ITestOutputHelper testOutputHelper) : base(testOutputHe
106106
"Scripts/gallery/page-support-requests.js",
107107
}
108108
},
109+
{
110+
"Scripts/gallery/syntaxhighlight.min.js",
111+
new[]
112+
{
113+
"Scripts/gallery/syntaxhighlight.js",
114+
}
115+
},
109116
};
110117

111118
private static readonly HashSet<string> BundleInputPaths = new HashSet<string>(Bundles.SelectMany(x => x.Value));

0 commit comments

Comments
 (0)