Merge remote-tracking branch 'refs/remotes/origin/dev'

Author: maartenba

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,6 @@
+Make sure to check the following when opening a pull request:
+
+* If it's a large contribution, please open a regular issue first and discuss with the team
+* Make sure the PR targets the `dev` branch
+
+Having that said: thank you for your contribution already!

src/NuGet.Server/Core/Helpers.cs

@@ -22,7 +22,7 @@ public static string GetBaseUrl(Uri currentUrl, string applicationPath)
             var uriBuilder = new UriBuilder(currentUrl);
 
             var repositoryUrl = uriBuilder.Scheme + "://" + uriBuilder.Host;
-            if (uriBuilder.Port != 80)
+            if (uriBuilder.Port != 80 && uriBuilder.Port != 443)
             {
                 repositoryUrl += ":" + uriBuilder.Port;
             }

src/NuGet.Server/Infrastructure/ServerPackageRepository.cs

@@ -639,7 +639,7 @@ private void FileSystemChanged(object sender, FileSystemEventArgs e)
 
             // 1) If a .nupkg is dropped in the root, add it as a package
             if (String.Equals(Path.GetDirectoryName(e.FullPath), _fileSystemWatcher.Path, StringComparison.OrdinalIgnoreCase)
-                && String.Equals(Path.GetExtension(e.Name), "nupkg", StringComparison.OrdinalIgnoreCase))
+                && String.Equals(Path.GetExtension(e.Name), ".nupkg", StringComparison.OrdinalIgnoreCase))
             {
                 // When a package is dropped into the server packages root folder, add it to the repository.
                 AddPackagesFromDropFolder();

src/NuGet.Server/Web.config

@@ -50,6 +50,12 @@
     Set enableFrameworkFiltering to true to enable filtering packages by their supported frameworks during search.
     -->
     <add key="enableFrameworkFiltering" value="false" />
+    
+    <!--
+    When running NuGet.Server in a NAT network, ASP.NET may embed the erver's internal IP address in the V2 feed.
+    Uncomment the following configuration entry to enable NAT support.
+    -->
+    <!-- <add key="aspnet:UseHostHeaderForRequestUrl" value="true" /> -->
   </appSettings>
   <system.web>
     <httpRuntime maxRequestLength="31457280" />