Skip to content

Commit 8f9cbcb

Browse files
maartenbamaartenba
committed
Merge remote-tracking branch 'refs/remotes/origin/dev'
2 parents 9d34c91 + 10bd5d5 commit 8f9cbcb

9 files changed

Lines changed: 85 additions & 57 deletions

File tree

‎src/CommonAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
[assembly: ComVisible(false)]
1515

16-
[assembly: AssemblyVersion("2.11.1.0")]
17-
[assembly: AssemblyFileVersion("2.11.1.0")]
16+
[assembly: AssemblyVersion("2.11.2.0")]
17+
[assembly: AssemblyFileVersion("2.11.2.0")]
1818

1919
[assembly: NeutralResourcesLanguage("en-US")]

‎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) + "nuget";
17+
return GetBaseUrl(currentUrl, applicationPath) + "api/v2/package";
1818
}
1919

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

‎src/NuGet.Server/Default.aspx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
<strong><%= Helpers.GetRepositoryUrl(Request.Url, Request.ApplicationPath) %></strong>
2525
</blockquote>
2626
<% if (string.IsNullOrEmpty(ConfigurationManager.AppSettings["apiKey"])) { %>
27-
To enable pushing packages to this feed using the nuget command line tool (nuget.exe). Set the api key appSetting in web.config.
27+
To enable pushing packages to this feed using the <a href="https://www.nuget.org/downloads">NuGet command line tool</a> (nuget.exe), set the api key appSetting in web.config.
2828
<% } else { %>
29-
Use the command below to push packages to this feed using the nuget command line tool (nuget.exe).
29+
Use the command below to push packages to this feed using the <a href="https://www.nuget.org/downloads">NuGet command line tool</a> (nuget.exe).
3030
<% } %>
3131
<blockquote>
32-
<strong>nuget push {package file} -s <%= Helpers.GetPushUrl(Request.Url, Request.ApplicationPath) %> {apikey}</strong>
32+
<strong>nuget.exe push {package file} {apikey} -Source <%= Helpers.GetPushUrl(Request.Url, Request.ApplicationPath) %></strong>
3333
</blockquote>
3434
</fieldset>
3535

‎src/NuGet.Server/NuGet.Server.csproj‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<Import Project="..\..\NuGet.Settings.targets" />
55
<PropertyGroup>
@@ -15,6 +15,8 @@
1515
<UseGlobalApplicationHostFile />
1616
<NuGetPackageImportStamp>
1717
</NuGetPackageImportStamp>
18+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
19+
<TargetFrameworkProfile />
1820
</PropertyGroup>
1921
<PropertyGroup>
2022
<ProjectGuid>{793B20A9-E263-4B54-BB31-305B602087CE}</ProjectGuid>
@@ -29,10 +31,12 @@
2931
<ItemGroup>
3032
<Reference Include="Microsoft.CSharp" />
3133
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
32-
<Private>True</Private>
34+
<SpecificVersion>False</SpecificVersion>
3335
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
36+
<Private>True</Private>
3437
</Reference>
3538
<Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
39+
<SpecificVersion>False</SpecificVersion>
3640
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
3741
<Private>True</Private>
3842
</Reference>
@@ -47,21 +51,25 @@
4751
<Private>True</Private>
4852
</Reference>
4953
<Reference Include="RouteMagic, Version=1.3.0.0, Culture=neutral, PublicKeyToken=84b59be021aa4cee, processorArchitecture=MSIL">
54+
<SpecificVersion>False</SpecificVersion>
5055
<HintPath>..\..\packages\RouteMagic.1.3\lib\net40\RouteMagic.dll</HintPath>
5156
<Private>True</Private>
5257
</Reference>
5358
<Reference Include="System" />
5459
<Reference Include="System.ComponentModel.DataAnnotations" />
60+
<Reference Include="System.Data.DataSetExtensions" />
5561
<Reference Include="System.Data.Services" />
5662
<Reference Include="System.Data.Services.Client" />
5763
<Reference Include="System.ServiceModel" />
5864
<Reference Include="System.ServiceModel.Activation" />
5965
<Reference Include="System.ServiceModel.Web" />
60-
<Reference Include="System.Core">
61-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
62-
</Reference>
6366
<Reference Include="System.Web" />
6467
<Reference Include="System.Configuration" />
68+
<Reference Include="System.Web.ApplicationServices" />
69+
<Reference Include="System.Web.DynamicData" />
70+
<Reference Include="System.Web.Entity" />
71+
<Reference Include="System.Web.Extensions" />
72+
<Reference Include="System.Xml.Linq" />
6573
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
6674
<SpecificVersion>False</SpecificVersion>
6775
<HintPath>..\..\packages\WebActivatorEx.2.1.0\lib\net40\WebActivatorEx.dll</HintPath>
@@ -141,11 +149,7 @@
141149
<Content Include="web.config.install.xdt">
142150
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
143151
</Content>
144-
</ItemGroup>
145-
<ItemGroup>
146-
<Content Include="packages.config">
147-
<SubType>Designer</SubType>
148-
</Content>
152+
<Content Include="packages.config" />
149153
</ItemGroup>
150154
<ItemGroup>
151155
<EmbeddedResource Include="Strings.resx">

‎src/NuGet.Server/Strings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/NuGet.Server/Web.config‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0"?>
22
<!--
33
For more information on how to configure your ASP.NET application, please visit
44
http://go.microsoft.com/fwlink/?LinkId=169433
@@ -8,33 +8,28 @@
88
<!--
99
Determines if an Api Key is required to push\delete packages from the server.
1010
-->
11-
<add key="requireApiKey" value="true" />
12-
11+
<add key="requireApiKey" value="true"/>
1312
<!--
1413
Set the value here to allow people to push/delete packages from the server.
1514
NOTE: This is a shared key (password) for all users.
1615
-->
17-
<add key="apiKey" value="" />
18-
16+
<add key="apiKey" value=""/>
1917
<!--
2018
Change the path to the packages folder. Default is ~/Packages.
2119
This can be a virtual or physical path.
2220
-->
23-
<add key="packagesPath" value="" />
24-
21+
<add key="packagesPath" value=""/>
2522
<!--
2623
Set allowOverrideExistingPackageOnPush to false to mimic NuGet.org's behaviour (do not allow overwriting packages with same id + version).
2724
-->
28-
<add key="allowOverrideExistingPackageOnPush" value="false" />
29-
25+
<add key="allowOverrideExistingPackageOnPush" value="false"/>
3026
<!--
3127
Set ignoreSymbolsPackages to true to filter out symbols packages. Since NuGet.Server does not come with a symbol server,
3228
it makes sense to ignore this type of packages. When enabled, files named `.symbols.nupkg` or packages containing a `/src` folder will be ignored.
3329
3430
If you only push .symbols.nupkg packages, set this to false so that packages can be uploaded.
3531
-->
36-
<add key="ignoreSymbolsPackages" value="true" />
37-
32+
<add key="ignoreSymbolsPackages" value="true"/>
3833
<!--
3934
Set enableDelisting to true to enable delist instead of delete as a result of a "nuget delete" command.
4035
- delete: package is deleted from the repository's local filesystem.
@@ -44,31 +39,48 @@
4439
- "nuget install packageid -version version" command will succeed for both listed and delisted packages.
4540
e.g. delisted packages can still be downloaded by clients that explicitly specify their version.
4641
-->
47-
<add key="enableDelisting" value="false" />
48-
42+
<add key="enableDelisting" value="false"/>
4943
<!--
5044
Set enableFrameworkFiltering to true to enable filtering packages by their supported frameworks during search.
5145
-->
52-
<add key="enableFrameworkFiltering" value="false" />
53-
46+
<add key="enableFrameworkFiltering" value="false"/>
5447
<!--
5548
When running NuGet.Server in a NAT network, ASP.NET may embed the erver's internal IP address in the V2 feed.
5649
Uncomment the following configuration entry to enable NAT support.
5750
-->
5851
<!-- <add key="aspnet:UseHostHeaderForRequestUrl" value="true" /> -->
5952
</appSettings>
53+
<!--
54+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
55+
56+
The following attributes can be set on the <httpRuntime> tag.
57+
<system.Web>
58+
<httpRuntime targetFramework="4.6" />
59+
</system.Web>
60+
-->
6061
<system.web>
61-
<httpRuntime maxRequestLength="31457280" />
62-
<compilation debug="true" />
62+
<httpRuntime maxRequestLength="31457280"/>
63+
<compilation debug="true" targetFramework="4.6"/>
6364
</system.web>
6465
<system.serviceModel>
65-
<serviceHostingEnvironment aspNetCompatibilityEnabled="true" />
66+
<serviceHostingEnvironment aspNetCompatibilityEnabled="true"/>
6667
</system.serviceModel>
6768
<system.webServer>
6869
<staticContent>
69-
<mimeMap fileExtension=".nupkg" mimeType="application/zip" />
70+
<mimeMap fileExtension=".nupkg" mimeType="application/zip"/>
7071
</staticContent>
7172
<modules runAllManagedModulesForAllRequests="true">
73+
<remove name="WebDAVModule"/>
7274
</modules>
75+
<handlers>
76+
<remove name="WebDAV"/>
77+
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
78+
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,PUT,DEBUG" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
79+
</handlers>
80+
<security>
81+
<requestFiltering>
82+
<requestLimits maxAllowedContentLength="31457280"/>
83+
</requestFiltering>
84+
</security>
7385
</system.webServer>
7486
</configuration>

‎src/NuGet.Server/packages.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
4-
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
5-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
6-
<package id="NuGet.Core" version="2.11.1" targetFramework="net45" />
7-
<package id="RouteMagic" version="1.3" targetFramework="net40" />
8-
<package id="WebActivatorEx" version="2.1.0" targetFramework="net45" />
3+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
4+
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
5+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
6+
<package id="NuGet.Core" version="2.11.1" targetFramework="net46" />
7+
<package id="RouteMagic" version="1.3" targetFramework="net46" />
8+
<package id="WebActivatorEx" version="2.1.0" targetFramework="net46" />
99
</packages>

‎test/NuGet.Server.Tests/NuGet.Server.Tests.csproj‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\NuGet.Settings.targets" />
44
<PropertyGroup>
55
<ProjectGuid>{92D18050-3867-4E39-B305-9F9870F66F5E}</ProjectGuid>
@@ -8,6 +8,8 @@
88
<RootNamespace>NuGet.Server.Tests</RootNamespace>
99
<AssemblyName>NuGet.Server.Tests</AssemblyName>
1010
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
11+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
12+
<TargetFrameworkProfile />
1113
</PropertyGroup>
1214
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
1315
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -19,13 +21,18 @@
1921
<PlatformTarget>AnyCPU</PlatformTarget>
2022
</PropertyGroup>
2123
<ItemGroup>
24+
<Reference Include="Castle.Core">
25+
<HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
26+
<Private>True</Private>
27+
</Reference>
2228
<Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
29+
<SpecificVersion>False</SpecificVersion>
2330
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
2431
<Private>True</Private>
2532
</Reference>
26-
<Reference Include="Moq, Version=4.5.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
33+
<Reference Include="Moq, Version=4.5.8.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
2734
<SpecificVersion>False</SpecificVersion>
28-
<HintPath>..\..\packages\Moq.4.5.0\lib\net45\Moq.dll</HintPath>
35+
<HintPath>..\..\packages\Moq.4.5.8\lib\net45\Moq.dll</HintPath>
2936
<Private>True</Private>
3037
</Reference>
3138
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -46,18 +53,22 @@
4653
<Reference Include="System.ServiceModel" />
4754
<Reference Include="System.ServiceModel.Web" />
4855
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
56+
<SpecificVersion>False</SpecificVersion>
4957
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
5058
<Private>True</Private>
5159
</Reference>
5260
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
61+
<SpecificVersion>False</SpecificVersion>
5362
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
5463
<Private>True</Private>
5564
</Reference>
5665
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
66+
<SpecificVersion>False</SpecificVersion>
5767
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
5868
<Private>True</Private>
5969
</Reference>
6070
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
6172
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
6273
<Private>True</Private>
6374
</Reference>
@@ -87,10 +98,10 @@
8798
</ProjectReference>
8899
</ItemGroup>
89100
<ItemGroup>
90-
<None Include="packages.config" />
101+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
91102
</ItemGroup>
92103
<ItemGroup>
93-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
104+
<None Include="packages.config" />
94105
</ItemGroup>
95106
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
96107
</Project>

‎test/NuGet.Server.Tests/packages.config‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
4-
<package id="Moq" version="4.5.0" targetFramework="net45" />
5-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
6-
<package id="NuGet.Core" version="2.11.1" targetFramework="net45" />
7-
<package id="xunit" version="2.1.0" targetFramework="net45" />
8-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
9-
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
10-
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
11-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
12-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
3+
<package id="Castle.Core" version="3.3.3" targetFramework="net46" />
4+
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
5+
<package id="Moq" version="4.5.8" targetFramework="net46" />
6+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
7+
<package id="NuGet.Core" version="2.11.1" targetFramework="net46" />
8+
<package id="xunit" version="2.1.0" targetFramework="net46" />
9+
<package id="xunit.abstractions" version="2.0.0" targetFramework="net46" />
10+
<package id="xunit.assert" version="2.1.0" targetFramework="net46" />
11+
<package id="xunit.core" version="2.1.0" targetFramework="net46" />
12+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net46" />
13+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net46" />
1314
</packages>

0 commit comments

Comments
 (0)