Skip to content

Commit 576938d

Browse files
authored
Added asp.net blog URIs to microsoft URIs list (#6834)
1 parent 2c78f80 commit 576938d

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

src/NuGetGallery/Helpers/UriExtensions.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,28 @@ public static bool IsGitHubUri(this Uri uri)
3535
string.Equals(uri.Host, "github.com", StringComparison.OrdinalIgnoreCase);
3636
}
3737

38-
public static bool IsGitHubPagerUri(this Uri uri)
38+
private static bool IsGitHubPagerUri(this Uri uri)
3939
{
4040
return uri.Authority.EndsWith(".github.com", StringComparison.OrdinalIgnoreCase) ||
4141
uri.Authority.EndsWith(".github.io", StringComparison.OrdinalIgnoreCase);
4242
}
4343

4444
private static bool IsCodeplexUri(this Uri uri)
4545
{
46-
return uri.Authority.EndsWith(".codeplex.com", StringComparison.OrdinalIgnoreCase) ||
47-
string.Equals(uri.Authority, "codeplex.com", StringComparison.OrdinalIgnoreCase);
46+
return uri.IsInDomain("codeplex.com");
4847
}
4948

5049
private static bool IsMicrosoftUri(this Uri uri)
5150
{
52-
return uri.Authority.EndsWith(".microsoft.com", StringComparison.OrdinalIgnoreCase) ||
53-
string.Equals(uri.Authority, "microsoft.com", StringComparison.OrdinalIgnoreCase) ||
54-
string.Equals(uri.Authority, "www.asp.net", StringComparison.OrdinalIgnoreCase) ||
55-
string.Equals(uri.Authority, "asp.net", StringComparison.OrdinalIgnoreCase) ||
56-
uri.Authority.EndsWith(".msdn.com", StringComparison.OrdinalIgnoreCase) ||
57-
string.Equals(uri.Authority, "msdn.com", StringComparison.OrdinalIgnoreCase);
51+
return uri.IsInDomain("microsoft.com") ||
52+
uri.IsInDomain("asp.net") ||
53+
uri.IsInDomain("msdn.com");
54+
}
55+
56+
private static bool IsInDomain(this Uri uri, string domain)
57+
{
58+
return uri.Authority.EndsWith("." + domain, StringComparison.OrdinalIgnoreCase) ||
59+
string.Equals(uri.Authority, domain, StringComparison.OrdinalIgnoreCase);
5860
}
5961

6062
public static Uri ToHttps(this Uri uri)

tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public void ItDeterminesRepositoryKind(string repoUrl, string repoType, Reposito
8080
[InlineData("http://microsoft.com:80/", "https://microsoft.com/")]
8181
[InlineData("http://githubpages.github.io/my.page", "https://githubpages.github.io/my.page")]
8282
[InlineData("http://githubpages.github.com", "https://githubpages.github.com/")]
83+
[InlineData("http://weblogs.asp.net/j/fontawesome-portable", "https://weblogs.asp.net/j/fontawesome-portable")]
8384
public void ItInitializesProjectUrl(string projectUrl, string expected)
8485
{
8586
var package = new Package

0 commit comments

Comments
 (0)