Skip to content

Commit bf7bf61

Browse files
maartenbamaartenba
committed
NuGet.Server - Update to NuGet 2.11.1 to support newer TFM's
NuGet/NuGetGallery#3043
1 parent 8c1f17e commit bf7bf61

6 files changed

Lines changed: 19 additions & 16 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.10.3.0")]
17-
[assembly: AssemblyFileVersion("2.10.3.0")]
16+
[assembly: AssemblyVersion("2.11.1.0")]
17+
[assembly: AssemblyFileVersion("2.11.1.0")]
1818

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

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@
3838
</Reference>
3939
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
41+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="NuGet.Core, Version=2.10.1.766, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\NuGet.Core.2.10.1\lib\net40-Client\NuGet.Core.dll</HintPath>
44+
<Reference Include="NuGet.Core, Version=2.11.1.812, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\..\packages\NuGet.Core.2.11.1\lib\net40-Client\NuGet.Core.dll</HintPath>
4647
<Private>True</Private>
4748
</Reference>
4849
<Reference Include="RouteMagic, Version=1.3.0.0, Culture=neutral, PublicKeyToken=84b59be021aa4cee, processorArchitecture=MSIL">

‎src/NuGet.Server/NuGet.Server.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<frameworkAssembly assemblyName="System.Data.Services" />
1717
</frameworkAssemblies>
1818
<dependencies>
19-
<dependency id="NuGet.Core" version="[2.10.1,)" />
19+
<dependency id="NuGet.Core" version="[2.11.1,)" />
2020
<dependency id="Microsoft.Web.Xdt" version="[2.1.1,)" />
2121
</dependencies>
2222
</metadata>

‎src/NuGet.Server/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<packages>
33
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
44
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
5-
<package id="Newtonsoft.Json" version="8.0.1" targetFramework="net45" />
6-
<package id="NuGet.Core" version="2.10.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" />
77
<package id="RouteMagic" version="1.3" targetFramework="net40" />
88
<package id="WebActivatorEx" version="2.1.0" targetFramework="net45" />
99
</packages>

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,19 @@
2323
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
2424
<Private>True</Private>
2525
</Reference>
26-
<Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
27-
<HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
26+
<Reference Include="Moq, Version=4.5.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
27+
<SpecificVersion>False</SpecificVersion>
28+
<HintPath>..\..\packages\Moq.4.5.0\lib\net45\Moq.dll</HintPath>
2829
<Private>True</Private>
2930
</Reference>
3031
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3132
<SpecificVersion>False</SpecificVersion>
32-
<HintPath>..\..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
33+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
3334
<Private>True</Private>
3435
</Reference>
35-
<Reference Include="NuGet.Core, Version=2.10.1.766, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
36-
<HintPath>..\..\packages\NuGet.Core.2.10.1\lib\net40-Client\NuGet.Core.dll</HintPath>
36+
<Reference Include="NuGet.Core, Version=2.11.1.812, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
37+
<SpecificVersion>False</SpecificVersion>
38+
<HintPath>..\..\packages\NuGet.Core.2.11.1\lib\net40-Client\NuGet.Core.dll</HintPath>
3739
<Private>True</Private>
3840
</Reference>
3941
<Reference Include="System" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
4-
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
5-
<package id="Newtonsoft.Json" version="8.0.1" targetFramework="net45" />
6-
<package id="NuGet.Core" version="2.10.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" />
77
<package id="xunit" version="2.1.0" targetFramework="net45" />
88
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
99
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

0 commit comments

Comments
 (0)