Merge branch 'dev' (#64)

Author: joelverhagen

build.ps1

@@ -24,6 +24,10 @@ trap {
 if (-not (Test-Path "$PSScriptRoot/build")) {
     New-Item -Path "$PSScriptRoot/build" -ItemType "directory"
 }
+
+# Enable TLS 1.2 since GitHub requires it.
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+
 wget -UseBasicParsing -Uri "https://raw.githubusercontent.com/NuGet/ServerCommon/$BuildBranch/build/init.ps1" -OutFile "$PSScriptRoot/build/init.ps1"
 . "$PSScriptRoot/build/init.ps1" -BuildBranch "$BuildBranch"
 

src/NuGet.Server.Core/NuGet.Server.Core.nuspec

@@ -9,6 +9,7 @@
     <licenseUrl>https://raw.githubusercontent.com/NuGet/NuGet.Server/dev/LICENSE.txt</licenseUrl>
     <projectUrl>https://github.com/NuGet/NuGet.Server</projectUrl>
     <copyright>$copyright$</copyright>
+    <repository type="git" url="https://github.com/NuGet/NuGet.Server" />
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.Data.Services" targetFramework="net46" />
     </frameworkAssemblies>

src/NuGet.Server.V2/NuGet.Server.V2.nuspec

@@ -9,6 +9,7 @@
     <licenseUrl>https://raw.githubusercontent.com/NuGet/NuGet.Server/dev/LICENSE.txt</licenseUrl>
     <projectUrl>https://github.com/NuGet/NuGet.Server</projectUrl>
     <copyright>$copyright$</copyright>
+    <repository type="git" url="https://github.com/NuGet/NuGet.Server" />
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.Data.Services" targetFramework="net46" />
     </frameworkAssemblies>

src/NuGet.Server.V2/NuGetV2WebApiEnabler.cs

@@ -53,6 +53,13 @@ public static HttpConfiguration UseNuGetV2WebApiFeed(this HttpConfiguration conf
                  constraints: new { httpMethod = new HttpMethodConstraint(HttpMethod.Delete) }
              );
 
+            config.Routes.MapHttpRoute(
+                 name: "apiv2package_upload",
+                 routeTemplate: "api/v2/package",
+                 defaults: new { controller = oDatacontrollerName, action = "UploadPackage" },
+                 constraints: new { httpMethod = new HttpMethodConstraint(HttpMethod.Put) }
+             );
+
             config.Routes.MapODataServiceRoute(routeName, routeUrlRoot, oDataModel, new CountODataPathHandler(), conventions);
             return config;
         }

src/NuGet.Server/Controllers/PackagesODataController.cs

@@ -29,7 +29,7 @@ protected PackagesODataController(IServiceResolver serviceResolver)
         // Exposed through ordinary Web API route. Bypasses OData pipeline.
         public async Task<HttpResponseMessage> ClearCache(CancellationToken token)
         {
-            if (RequestContext.IsLocal)
+            if (RequestContext.IsLocal || ServiceResolver.Current.Resolve<ISettingsProvider>().GetBoolSetting("allowRemoteCacheManagement", false))
             {
                 await _serverRepository.ClearCacheAsync(token);
                 return CreateStringResponse(HttpStatusCode.OK, "Server cache has been cleared.");

src/NuGet.Server/Core/DefaultServiceResolver.cs

@@ -53,6 +53,11 @@ public object Resolve(Type type)
                 return _packageAuthenticationService;
             }
 
+            if (type == typeof(ISettingsProvider))
+            {
+                return _settingsProvider;
+            }
+
             return null;
         }
 

src/NuGet.Server/Default.aspx

@@ -34,7 +34,7 @@
             <% } %> 
         </fieldset>
 
-        <% if (Request.IsLocal) { %>
+        <% if (Request.IsLocal || ServiceResolver.Current.Resolve<NuGet.Server.Core.Infrastructure.ISettingsProvider>().GetBoolSetting("allowRemoteCacheManagement", false)) { %>
         <fieldset style="width:800px">
             <legend><strong>Adding packages</strong></legend>
 

src/NuGet.Server/NuGet.Server.csproj

@@ -174,16 +174,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>1425</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:40221/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+          <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>

src/NuGet.Server/NuGet.Server.nuspec

@@ -9,6 +9,7 @@
     <licenseUrl>https://raw.githubusercontent.com/NuGet/NuGet.Server/dev/LICENSE.txt</licenseUrl>
     <projectUrl>https://github.com/NuGet/NuGet.Server</projectUrl>
     <copyright>© .NET Foundation. All rights reserved.</copyright>
+    <repository type="git" url="https://github.com/NuGet/NuGet.Server" />
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.ServiceModel" targetFramework="net46" />
       <frameworkAssembly assemblyName="System.ServiceModel.Web" targetFramework="net46" />

src/NuGet.Server/Web.config

@@ -69,6 +69,8 @@
     on a fixed 1-hour interval.
     -->
     <add key="enableFileSystemMonitoring" value="true" />
+    <!--Set allowRemoteCacheManagement to true to enable the "clear cache" and other cache operations initiated via requests originating from remote hosts.-->
+    <add key="allowRemoteCacheManagement" value="false" />
   </appSettings>
   <!--
     For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -137,4 +139,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>