Skip to content

Commit 603bc0c

Browse files
committed
Cleanup. Fixed paths displayed on frontpage.
1 parent 6ade06a commit 603bc0c

6 files changed

Lines changed: 7 additions & 49 deletions

File tree

NuGet.Server.sln

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Server.V2.Samples.Owi
3030
EndProject
3131
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Server.V2.Tests", "test\NuGet.Server.V2.Tests\NuGet.Server.V2.Tests.csproj", "{BE64E341-7D99-43D9-A0D2-A38E977B7D97}"
3232
EndProject
33-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleIISHost", "SampleIISHost\SampleIISHost.csproj", "{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}"
34-
EndProject
3533
Global
3634
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3735
Coverage|Any CPU = Coverage|Any CPU
@@ -186,26 +184,6 @@ Global
186184
{BE64E341-7D99-43D9-A0D2-A38E977B7D97}.Release|Any CPU.Build.0 = Release|Any CPU
187185
{BE64E341-7D99-43D9-A0D2-A38E977B7D97}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
188186
{BE64E341-7D99-43D9-A0D2-A38E977B7D97}.Release|Mixed Platforms.Build.0 = Release|Any CPU
189-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
190-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Coverage|Any CPU.Build.0 = Release|Any CPU
191-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Coverage|Mixed Platforms.ActiveCfg = Release|Any CPU
192-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Coverage|Mixed Platforms.Build.0 = Release|Any CPU
193-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
194-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
195-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
196-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
197-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Mono Debug|Any CPU.ActiveCfg = Debug|Any CPU
198-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Mono Debug|Any CPU.Build.0 = Debug|Any CPU
199-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Mono Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
200-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Mono Debug|Mixed Platforms.Build.0 = Debug|Any CPU
201-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Mono Release|Any CPU.ActiveCfg = Release|Any CPU
202-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Mono Release|Any CPU.Build.0 = Release|Any CPU
203-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Mono Release|Mixed Platforms.ActiveCfg = Release|Any CPU
204-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Mono Release|Mixed Platforms.Build.0 = Release|Any CPU
205-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
206-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Release|Any CPU.Build.0 = Release|Any CPU
207-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
208-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
209187
EndGlobalSection
210188
GlobalSection(SolutionProperties) = preSolution
211189
HideSolutionNode = FALSE
@@ -218,6 +196,5 @@ Global
218196
{273E4575-4054-4578-9D14-8D4E640A365F} = {0F277539-E9D7-4A06-A731-D525D9AFCE54}
219197
{5CF9DB92-53DE-488E-82F9-4C3F867516B2} = {D54BB20B-57E8-4D4F-BD9D-CF284CBFAB3B}
220198
{BE64E341-7D99-43D9-A0D2-A38E977B7D97} = {E7B39EAD-EA32-4011-845A-C949A336389A}
221-
{AF935BDD-673A-4928-9CBD-0BF0889DE1AC} = {0F277539-E9D7-4A06-A731-D525D9AFCE54}
222199
EndGlobalSection
223200
EndGlobal

src/NuGet.Server/App_Start/NuGetODataConfig.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Net.Http;
1+
using System.Net.Http;
52
using System.Web.Http;
63
using NuGet.Server.V2;
74
using System.Web.Http.Routing;

src/NuGet.Server/App_Start/NuGetODataConfig.cs.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55

66
[assembly: WebActivatorEx.PreApplicationStartMethod(typeof($rootnamespace$.App_Start.NuGetODataConfig), "Start")]
77

8-
namespace $rootnamespace$.App_Start {
9-
public static class NuGetODataConfig {
8+
namespace $rootnamespace$.App_Start
9+
{
10+
public static class NuGetODataConfig
11+
{
1012
public static void Start()
1113
{
1214
ServiceResolver.SetServiceResolver(new DefaultServiceResolver());

src/NuGet.Server/Core/Helpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static string GetRepositoryUrl(Uri currentUrl, string applicationPath)
1414

1515
public static string GetPushUrl(Uri currentUrl, string applicationPath)
1616
{
17-
return GetBaseUrl(currentUrl, applicationPath) + "api/v2/package";
17+
return GetBaseUrl(currentUrl, applicationPath) + "nuget";
1818
}
1919

2020
public static string GetBaseUrl(Uri currentUrl, string applicationPath)

src/NuGet.Server/Default.aspx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
To add packages to the feed put package files (.nupkg files) in the folder
4242
<code><% = PackageUtility.PackagePhysicalPath %></code><br/><br/>
4343

44-
Click <a href="<%= VirtualPathUtility.ToAbsolute("~/nugetserver/api/clear-cache") %>">here</a> to clear the package cache.
44+
Click <a href="<%= VirtualPathUtility.ToAbsolute("~/nuget/clear-cache") %>">here</a> to clear the package cache.
4545
</fieldset>
4646
<% } %>
4747
</div>

src/NuGet.Server/Infrastructure/PackageUtility.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,6 @@ public static string PackagePhysicalPath
2222
}
2323
}
2424

25-
public static string GetPackageDownloadUrl(ODataPackage package)
26-
{
27-
var routesValues = new RouteValueDictionary {
28-
{ "packageId", package.Id },
29-
{ "version", package.Version }
30-
};
31-
32-
var context = HttpContext.Current;
33-
34-
var route = RouteTable.Routes["DownloadPackage"];
35-
36-
var vpd = route.GetVirtualPath(context.Request.RequestContext, routesValues);
37-
38-
var applicationPath = Helpers.EnsureTrailingSlash(context.Request.ApplicationPath);
39-
40-
return applicationPath + vpd.VirtualPath;
41-
}
42-
4325
private static string ResolvePackagePath()
4426
{
4527
// The packagesPath could be an absolute path (rooted and use as is)

0 commit comments

Comments
 (0)